From 3c15f064d295813de7fe9b98c834735278c8fe91 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Thu, 31 Dec 2009 18:03:36 +0100 Subject: [PATCH] Remove QWT from configure -- not used --- bacula/autoconf/config.h.in | 3 - bacula/autoconf/configure.in | 110 +++++++++++++++++------------------ bacula/configure | 102 +++++++------------------------- 3 files changed, 76 insertions(+), 139 deletions(-) diff --git a/bacula/autoconf/config.h.in b/bacula/autoconf/config.h.in index 6054d8cf33..7c44bd7710 100644 --- a/bacula/autoconf/config.h.in +++ b/bacula/autoconf/config.h.in @@ -615,9 +615,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_PWD_H -/* Set if bat QWT library found */ -#undef HAVE_QWT - /* Define to 1 if you have the `readdir_r' function. */ #undef HAVE_READDIR_R diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in index ff7e8ecd5c..0c620c5a9d 100644 --- a/bacula/autoconf/configure.in +++ b/bacula/autoconf/configure.in @@ -401,7 +401,7 @@ if test x$support_bat = xyes; then fi dnl -dnl If bat is enabled, we need the qwt library +dnl The qwt library was used with bat, but that is no longer the case dnl got_qwt=no QWT_INC= @@ -409,59 +409,59 @@ QWT_LDFLAGS= QWT_LIB= QWT= no_qwt=no -if test x$support_bat = xyes; then - AC_MSG_CHECKING(for qwt support) - AC_ARG_WITH(qwt, - AC_HELP_STRING([--with-qwt@<:@=DIR@:>@], [specify qwt library directory]), - [ - case "$with_qwt" in - no) - no_qwt=yes - ;; - yes|*) - if test -f ${with_qwt}/include/qwt.h; then - QWT_INC="${with_qwt}/include" - QWT_LDFLAGS="-L${with_qwt}/lib" - QWT_LIB="-lqwt" - QWT="qwt" - fi - ;; - esac - ] - ) - - dnl - dnl Search in standard places, or --with-qwt not specified - dnl - if test $no_qwt = no; then - if test x$QWT_INC = x; then - for root in /usr /usr/local; do - for ver in qwt qwt5 qwt-qt4; do - if test -f ${root}/include/${ver}/qwt.h; then - QWT_INC="${root}/include/${ver}" - if test -d ${root}/lib64/; then - QWT_LDFLAGS="-L${root}/lib64" - elif test -d ${root}/lib/64/; then - QWT_LDFLAGS="-L${root}/64" - else - QWT_LDFLAGS="-L${root}/lib" - fi - QWT_LIB="-lqwt" - QWT="qwt" - got_qwt=yes - break; - fi - done - done - fi - fi - if test x$QWT_INC = x; then - AC_MSG_RESULT(no) - else - AC_DEFINE(HAVE_QWT, 1, [Set if bat QWT library found]) - AC_MSG_RESULT(yes) - fi -fi +dnl if test x$support_bat = xyes; then +dnl AC_MSG_CHECKING(for qwt support) +dnl AC_ARG_WITH(qwt, +dnl AC_HELP_STRING([--with-qwt@<:@=DIR@:>@], [specify qwt library directory]), +dnl [ +dnl case "$with_qwt" in +dnl no) +dnl no_qwt=yes +dnl ;; +dnl yes|*) +dnl if test -f ${with_qwt}/include/qwt.h; then +dnl QWT_INC="${with_qwt}/include" +dnl QWT_LDFLAGS="-L${with_qwt}/lib" +dnl QWT_LIB="-lqwt" +dnl QWT="qwt" +dnl fi +dnl ;; +dnl esac +dnl ] +dnl ) + +dnl dnl +dnl dnl Search in standard places, or --with-qwt not specified +dnl dnl +dnl if test $no_qwt = no; then +dnl if test x$QWT_INC = x; then +dnl for root in /usr /usr/local; do +dnl for ver in qwt qwt5 qwt-qt4; do +dnl if test -f ${root}/include/${ver}/qwt.h; then +dnl QWT_INC="${root}/include/${ver}" +dnl if test -d ${root}/lib64/; then +dnl QWT_LDFLAGS="-L${root}/lib64" +dnl elif test -d ${root}/lib/64/; then +dnl QWT_LDFLAGS="-L${root}/64" +dnl else +dnl QWT_LDFLAGS="-L${root}/lib" +dnl fi +dnl QWT_LIB="-lqwt" +dnl QWT="qwt" +dnl got_qwt=yes +dnl break; +dnl fi +dnl done +dnl done +dnl fi +dnl fi +dnl if test x$QWT_INC = x; then +dnl AC_MSG_RESULT(no) +dnl else +dnl AC_DEFINE(HAVE_QWT, 1, [Set if bat QWT library found]) +dnl AC_MSG_RESULT(yes) +dnl fi +dnl fi AC_SUBST(BAT_DIR) AC_SUBST(QWT_INC) @@ -3211,7 +3211,7 @@ Configuration on `date`: ZLIB support: ${have_zlib} enable-smartalloc: ${support_smartalloc} enable-lockmgr: ${support_lockmgr} - bat support: ${support_bat} ${QWT_LDFLAGS} + bat support: ${support_bat} enable-gnome: ${support_gnome} ${gnome_version} enable-bwx-console: ${support_wx_console} ${wx_version} enable-tray-monitor: ${support_tray_monitor} diff --git a/bacula/configure b/bacula/configure index 40006a1b21..2422889a6e 100755 --- a/bacula/configure +++ b/bacula/configure @@ -1684,7 +1684,6 @@ Optional Packages: --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib --without-libintl-prefix don't search for libintl in includedir and libdir --with-included-gettext use the GNU gettext library included here - --with-qwt[=DIR] specify qwt library directory --with-readline[=DIR] specify readline library directory --with-python[=DIR] Include Python support. DIR is the Python base install directory, default is to search through a @@ -5990,13 +5989,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:5993: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5992: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5996: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5995: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5999: output\"" >&5) + (eval echo "\"\$as_me:5998: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -7217,7 +7216,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7220 "configure"' > conftest.$ac_ext + echo '#line 7219 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9432,11 +9431,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:9435: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9434: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9439: \$? = $ac_status" >&5 + echo "$as_me:9438: \$? = $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. @@ -9771,11 +9770,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:9774: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9773: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9778: \$? = $ac_status" >&5 + echo "$as_me:9777: \$? = $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. @@ -9876,11 +9875,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:9879: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9878: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9883: \$? = $ac_status" >&5 + echo "$as_me:9882: \$? = $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 @@ -9931,11 +9930,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:9934: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9933: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9938: \$? = $ac_status" >&5 + echo "$as_me:9937: \$? = $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 @@ -12687,7 +12686,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12690 "configure" +#line 12689 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12783,7 +12782,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12786 "configure" +#line 12785 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14795,11 +14794,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:14798: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14797: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14802: \$? = $ac_status" >&5 + echo "$as_me:14801: \$? = $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. @@ -14894,11 +14893,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:14897: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14896: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14901: \$? = $ac_status" >&5 + echo "$as_me:14900: \$? = $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 @@ -14946,11 +14945,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:14949: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14948: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14953: \$? = $ac_status" >&5 + echo "$as_me:14952: \$? = $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 @@ -24105,66 +24104,7 @@ QWT_LDFLAGS= QWT_LIB= QWT= no_qwt=no -if test x$support_bat = xyes; then - { echo "$as_me:$LINENO: checking for qwt support" >&5 -echo $ECHO_N "checking for qwt support... $ECHO_C" >&6; } - -# Check whether --with-qwt was given. -if test "${with_qwt+set}" = set; then - withval=$with_qwt; - case "$with_qwt" in - no) - no_qwt=yes - ;; - yes|*) - if test -f ${with_qwt}/include/qwt.h; then - QWT_INC="${with_qwt}/include" - QWT_LDFLAGS="-L${with_qwt}/lib" - QWT_LIB="-lqwt" - QWT="qwt" - fi - ;; - esac - - -fi - - - if test $no_qwt = no; then - if test x$QWT_INC = x; then - for root in /usr /usr/local; do - for ver in qwt qwt5 qwt-qt4; do - if test -f ${root}/include/${ver}/qwt.h; then - QWT_INC="${root}/include/${ver}" - if test -d ${root}/lib64/; then - QWT_LDFLAGS="-L${root}/lib64" - elif test -d ${root}/lib/64/; then - QWT_LDFLAGS="-L${root}/64" - else - QWT_LDFLAGS="-L${root}/lib" - fi - QWT_LIB="-lqwt" - QWT="qwt" - got_qwt=yes - break; - fi - done - done - fi - fi - if test x$QWT_INC = x; then - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - else -cat >>confdefs.h <<\_ACEOF -#define HAVE_QWT 1 -_ACEOF - - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - fi -fi @@ -47067,7 +47007,7 @@ Configuration on `date`: ZLIB support: ${have_zlib} enable-smartalloc: ${support_smartalloc} enable-lockmgr: ${support_lockmgr} - bat support: ${support_bat} ${QWT_LDFLAGS} + bat support: ${support_bat} enable-gnome: ${support_gnome} ${gnome_version} enable-bwx-console: ${support_wx_console} ${wx_version} enable-tray-monitor: ${support_tray_monitor} -- 2.39.5