From 917e8eaf1d2fcbac1f78a7041e5916ad046464c5 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Mon, 28 Dec 2009 09:05:47 +0100 Subject: [PATCH] Rebuild configure to handle Marco's changes --- bacula/configure | 52 ++++++++++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/bacula/configure b/bacula/configure index 7fe19bda47..98449f09fa 100755 --- a/bacula/configure +++ b/bacula/configure @@ -890,6 +890,7 @@ LIBTOOL_INSTALL_TARGET LIBTOOL_UNINSTALL_TARGET LIBTOOL_CLEAN_TARGET QMAKE_LIBTOOL +FD_PLUGIN_DIR INCLUDE_INSTALL_TARGET INCLUDE_UNINSTALL_TARGET HAVE_SUN_OS_TRUE @@ -5989,13 +5990,13 @@ if test "${lt_cv_nm_interface+set}" = set; then else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5992: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5993: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5995: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5996: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5998: output\"" >&5) + (eval echo "\"\$as_me:5999: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -7216,7 +7217,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7219 "configure"' > conftest.$ac_ext + echo '#line 7220 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9431,11 +9432,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9434: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9435: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9438: \$? = $ac_status" >&5 + echo "$as_me:9439: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9770,11 +9771,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9773: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9774: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9777: \$? = $ac_status" >&5 + echo "$as_me:9778: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9875,11 +9876,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9878: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9879: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9882: \$? = $ac_status" >&5 + echo "$as_me:9883: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9930,11 +9931,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9933: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9934: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9937: \$? = $ac_status" >&5 + echo "$as_me:9938: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12686,7 +12687,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12689 "configure" +#line 12690 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12782,7 +12783,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12785 "configure" +#line 12786 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14794,11 +14795,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14797: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14798: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14801: \$? = $ac_status" >&5 + echo "$as_me:14802: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14893,11 +14894,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14896: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14897: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14900: \$? = $ac_status" >&5 + echo "$as_me:14901: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14945,11 +14946,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14948: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14949: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14952: \$? = $ac_status" >&5 + echo "$as_me:14953: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15936,6 +15937,8 @@ if test x$use_libtool != xno; then LIBTOOL_UNINSTALL_TARGET="libtool-uninstall" LIBTOOL_CLEAN_TARGET="libtool-clean" QMAKE_LIBTOOL="${BUILD_DIR}/libtool" + FD_PLUGIN_DIR="src/plugins/fd" + have_plugins=yes else DEFAULT_OBJECT_TYPE=".o" DEFAULT_ARCHIVE_TYPE=".a" @@ -15945,6 +15948,8 @@ else LIBTOOL_UNINSTALL_TARGET="" LIBTOOL_CLEAN_TARGET="" QMAKE_LIBTOOL="# ${BUILD_DIR}/libtool" + FD_PLUGIN_DIR="" + have_plugins=no fi @@ -15956,6 +15961,7 @@ fi + # Check whether --enable-includes was given. if test "${enable_includes+set}" = set; then enableval=$enable_includes; @@ -45341,6 +45347,7 @@ LIBTOOL_INSTALL_TARGET!$LIBTOOL_INSTALL_TARGET$ac_delim LIBTOOL_UNINSTALL_TARGET!$LIBTOOL_UNINSTALL_TARGET$ac_delim LIBTOOL_CLEAN_TARGET!$LIBTOOL_CLEAN_TARGET$ac_delim QMAKE_LIBTOOL!$QMAKE_LIBTOOL$ac_delim +FD_PLUGIN_DIR!$FD_PLUGIN_DIR$ac_delim INCLUDE_INSTALL_TARGET!$INCLUDE_INSTALL_TARGET$ac_delim INCLUDE_UNINSTALL_TARGET!$INCLUDE_UNINSTALL_TARGET$ac_delim HAVE_SUN_OS_TRUE!$HAVE_SUN_OS_TRUE$ac_delim @@ -45403,7 +45410,6 @@ QWT_LDFLAGS!$QWT_LDFLAGS$ac_delim QWT_LIB!$QWT_LIB$ac_delim QWT!$QWT$ac_delim WXCONS_CPPFLAGS!$WXCONS_CPPFLAGS$ac_delim -WXCONS_LDFLAGS!$WXCONS_LDFLAGS$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -45445,6 +45451,7 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +WXCONS_LDFLAGS!$WXCONS_LDFLAGS$ac_delim WX_DIR!$WX_DIR$ac_delim TRAY_MONITOR_CPPFLAGS!$TRAY_MONITOR_CPPFLAGS$ac_delim TRAY_MONITOR_LDFLAGS!$TRAY_MONITOR_LDFLAGS$ac_delim @@ -45539,7 +45546,7 @@ DISTVER!$DISTVER$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 92; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 93; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -47055,6 +47062,7 @@ Configuration on `date`: client-only: ${build_client_only} build-dird: ${build_dird} build-stored: ${build_stored} + Plugin support: ${have_plugins} ACL support: ${have_acl} XATTR support: ${have_xattr} Python support: ${support_python} ${PYTHON_LIBS} -- 2.39.5