X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fconfigure;h=5c6124bf0d7b13484d365eb71adea60cb308aa74;hb=f0cc257109c57980e43cf462e5e6838fd6e26d0b;hp=ac2a1f4ebdfd4b29800b0d2a0519250a62009102;hpb=a925e6f9c2c512ba85862e990a051c86cd04abc4;p=bacula%2Fbacula diff --git a/bacula/configure b/bacula/configure index ac2a1f4ebd..5c6124bf0d 100755 --- a/bacula/configure +++ b/bacula/configure @@ -6736,6 +6736,10 @@ cat >>confdefs.h <<_ACEOF #define LOCALEDIR "$localedir" _ACEOF +cat >>confdefs.h <<_ACEOF +#define SYSCONFDIR "$sysconfdir" +_ACEOF + # ------------------------------------------------------------------------- # If the user has not set --exec-prefix, we default to ${prefix} @@ -10750,7 +10754,6 @@ fi - for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ stdlib.h string.h unistd.h sys/param.h do @@ -10920,9 +10923,6 @@ done - - - @@ -12887,7 +12887,7 @@ if test x$support_tray_monitor = xyes; then abc=`$PKGCONFIG --atleast-version=2.4 gtk+-2.0` pkg=$? if test $pkg = 0; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_GTK_2_4 1 _ACEOF @@ -14958,40 +14958,26 @@ if test "${with_python+set}" = set; then if test "$withval" != "no"; then if test "$withval" = "yes"; then for python_root in /usr /usr/local /usr/sfw; do - if test -f $python_root/include/python2.2/Python.h; then - PYTHON_INCDIR=-I$python_root/include/python2.2 - if test -d $python_root/lib64/python2.2/config; then - PYTHON_LIBS="-L$python_root/lib64/python2.2/config -lpython2.2" - else - PYTHON_LIBS="-L$python_root/lib/python2.2/config -lpython2.2" - fi - break - elif test -f $python_root/include/python2.3/Python.h; then - PYTHON_INCDIR=-I$python_root/include/python2.3 - if test -d $python_root/lib64/python2.3/config; then - PYTHON_LIBS="-L$python_root/lib64/python2.3/config -lpython2.3" - else - PYTHON_LIBS="-L$python_root/lib/python2.3/config -lpython2.3" - fi - break - elif test -f $python_root/include/python2.4/Python.h; then - PYTHON_INCDIR=-I$python_root/include/python2.4 - if test -d $python_root/lib64/python2.4/config; then - PYTHON_LIBS="-L$python_root/lib64/python2.4/config -lpython2.4" - else - PYTHON_LIBS="-L$python_root/lib/python2.4/config -lpython2.4" - fi - break - fi + for ver in python2.2 python2.3 python2.4 python2.5; do + if test -f $python_root/include/${ver}/Python.h; then + PYTHON_INCDIR=-I$python_root/include/${ver} + if test -d $python_root/lib64/${ver}/config; then + PYTHON_LIBS="-L$python_root/lib64/${ver}/config -l${ver}" + else + PYTHON_LIBS="-L$python_root/lib/${ver}/config -l${ver}" + fi + break + fi + done done if test x$PYTHON_INCDIR = x; then if test -f $prefix/include/Python.h; then PYTHON_INCDIR=-I$prefix/include if test -d $prefix/lib64/config; then - PYTHON_LIBS="-L$prefix/lib64/config -lpython" - else - PYTHON_LIBS="-L$prefix/lib/config -lpython" - fi + PYTHON_LIBS="-L$prefix/lib64/config -lpython" + else + PYTHON_LIBS="-L$prefix/lib/config -lpython" + fi else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 @@ -15871,10 +15857,10 @@ if test "x$with_openssl_directory" != "x"; then OPENSSL_INC="-I$with_openssl_directory/include $OPENSSL_INC" fi - saved_LIBS="$LIBS" - saved_CFLAGS="$CFLAGS" - LIBS="$saved_LIBS $OPENSSL_LIBS" - CFLAGS="$saved_CFLAGS $OPENSSL_INC" + saved_LIBS="${LIBS}" + saved_CFLAGS="${CFLAGS}" + LIBS="${saved_LIBS} ${OPENSSL_LIBS}" + CFLAGS="${saved_CFLAGS} ${OPENSSL_INC}" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -15975,8 +15961,8 @@ fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LIBS="$saved_LIBS" - CFLAGS="$saved_CFLAGS" + LIBS="${saved_LIBS}" + CFLAGS="${saved_CFLAGS}" if test "$support_tls" = "yes"; then @@ -16634,10 +16620,10 @@ echo "$as_me: error: Unable to find libpq-fe.h in standard locations" >&2;} POSTGRESQL_BINDIR=$withval/bin elif test -f $withval/include/postgresql/libpq-fe.h; then POSTGRESQL_INCDIR=$withval/include/postgresql - if test -d $withval/lib64/postgresql; then - POSTGRESQL_LIBDIR=$withval/lib64/postgresql + if test -d $withval/lib64; then + POSTGRESQL_LIBDIR=$withval/lib64 else - POSTGRESQL_LIBDIR=$withval/lib/postgresql + POSTGRESQL_LIBDIR=$withval/lib fi POSTGRESQL_BINDIR=$withval/bin else @@ -16852,80 +16838,84 @@ if test "${with_mysql+set}" = set; then if test "$withval" != "no"; then if test "$withval" = "yes"; then - if test -f /usr/local/mysql/include/mysql/mysql.h; then - MYSQL_INCDIR=/usr/local/mysql/include/mysql - if test -f /usr/local/mysql/lib64/mysql/libmysqlclient.a; then - MYSQL_LIBDIR=/usr/local/mysql/lib64/mysql - else - MYSQL_LIBDIR=/usr/local/mysql/lib/mysql - fi - MYSQL_BINDIR=/usr/local/mysql/bin - elif test -f /usr/include/mysql/mysql.h; then - MYSQL_INCDIR=/usr/include/mysql - if test -f /usr/lib64/mysql/libmysqlclient.a; then - MYSQL_LIBDIR=/usr/lib64/mysql - else - MYSQL_LIBDIR=/usr/lib/mysql - fi - MYSQL_BINDIR=/usr/bin - elif test -f /usr/include/mysql.h; then - MYSQL_INCDIR=/usr/include - if test -f /usr/lib64/libmysqlclient.a; then - MYSQL_LIBDIR=/usr/lib64 - else - MYSQL_LIBDIR=/usr/lib - fi - MYSQL_BINDIR=/usr/bin - elif test -f /usr/local/include/mysql/mysql.h; then - MYSQL_INCDIR=/usr/local/include/mysql - if test -f /usr/local/lib64/mysql/libmysqlclient.a; then - MYSQL_LIBDIR=/usr/local/lib64/mysql - else - MYSQL_LIBDIR=/usr/local/lib/mysql - fi - MYSQL_BINDIR=/usr/local/bin - elif test -f /usr/local/include/mysql.h; then - MYSQL_INCDIR=/usr/local/include - if test -f /usr/local/lib64/libmysqlclient.a; then - MYSQL_LIBDIR=/usr/local/lib64 - else - MYSQL_LIBDIR=/usr/local/lib - fi - MYSQL_BINDIR=/usr/local/bin - else - echo "$as_me:$LINENO: result: no" >&5 + if test -f /usr/local/mysql/include/mysql/mysql.h; then + MYSQL_INCDIR=/usr/local/mysql/include/mysql + if test -f /usr/local/mysql/lib64/mysql/libmysqlclient.a; then + MYSQL_LIBDIR=/usr/local/mysql/lib64/mysql + else + MYSQL_LIBDIR=/usr/local/mysql/lib/mysql + fi + MYSQL_BINDIR=/usr/local/mysql/bin + elif test -f /usr/include/mysql/mysql.h; then + MYSQL_INCDIR=/usr/include/mysql + if test -f /usr/lib64/mysql/libmysqlclient.a; then + MYSQL_LIBDIR=/usr/lib64/mysql + else + MYSQL_LIBDIR=/usr/lib/mysql + fi + MYSQL_BINDIR=/usr/bin + elif test -f /usr/include/mysql.h; then + MYSQL_INCDIR=/usr/include + if test -f /usr/lib64/libmysqlclient.a; then + MYSQL_LIBDIR=/usr/lib64 + else + MYSQL_LIBDIR=/usr/lib + fi + MYSQL_BINDIR=/usr/bin + elif test -f /usr/local/include/mysql/mysql.h; then + MYSQL_INCDIR=/usr/local/include/mysql + if test -f /usr/local/lib64/mysql/libmysqlclient.a; then + MYSQL_LIBDIR=/usr/local/lib64/mysql + else + MYSQL_LIBDIR=/usr/local/lib/mysql + fi + MYSQL_BINDIR=/usr/local/bin + elif test -f /usr/local/include/mysql.h; then + MYSQL_INCDIR=/usr/local/include + if test -f /usr/local/lib64/libmysqlclient.a; then + MYSQL_LIBDIR=/usr/local/lib64 + else + MYSQL_LIBDIR=/usr/local/lib + fi + MYSQL_BINDIR=/usr/local/bin + else + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 - { { echo "$as_me:$LINENO: error: Unable to find mysql.h in standard locations" >&5 + { { echo "$as_me:$LINENO: error: Unable to find mysql.h in standard locations" >&5 echo "$as_me: error: Unable to find mysql.h in standard locations" >&2;} { (exit 1); exit 1; }; } - fi + fi else - if test -f $withval/include/mysql/mysql.h; then - MYSQL_INCDIR=$withval/include/mysql - if test -f $withval/lib64/mysql/libmysqlclient.a; then - MYSQL_LIBDIR=$withval/lib64/mysql - else - MYSQL_LIBDIR=$withval/lib/mysql - fi - MYSQL_BINDIR=$withval/bin - elif test -f $withval/include/mysql.h; then - MYSQL_INCDIR=$withval/include - if test -f "$withval/lib64/libmysqlclient.a"; then - MYSQL_LIBDIR=$withval/lib64 - else - MYSQL_LIBDIR=$withval/lib - fi - MYSQL_BINDIR=$withval/bin - else - echo "$as_me:$LINENO: result: no" >&5 + if test -f $withval/include/mysql/mysql.h; then + MYSQL_INCDIR=$withval/include/mysql + if test -f $withval/lib64/mysql/libmysqlclient.a; then + MYSQL_LIBDIR=$withval/lib64/mysql + else + MYSQL_LIBDIR=$withval/lib/mysql + # Solaris ... + if test -f $withval/lib/libmysqlclient.so; then + MYSQL_LIBDIR=$withval/lib + fi + fi + MYSQL_BINDIR=$withval/bin + elif test -f $withval/include/mysql.h; then + MYSQL_INCDIR=$withval/include + if test -f "$withval/lib64/libmysqlclient.a"; then + MYSQL_LIBDIR=$withval/lib64 + else + MYSQL_LIBDIR=$withval/lib + fi + MYSQL_BINDIR=$withval/bin + else + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 - { { echo "$as_me:$LINENO: error: Invalid MySQL directory $withval - unable to find mysql.h under $withval" >&5 + { { echo "$as_me:$LINENO: error: Invalid MySQL directory $withval - unable to find mysql.h under $withval" >&5 echo "$as_me: error: Invalid MySQL directory $withval - unable to find mysql.h under $withval" >&2;} { (exit 1); exit 1; }; } - fi + fi fi SQL_INCLUDE=-I$MYSQL_INCDIR - if test -f $MYSQL_LIBDIR/libmysqlclient_r.a; then + if test -f "$MYSQL_LIBDIR/libmysqlclient_r.a"; then SQL_LFLAGS="-L$MYSQL_LIBDIR -lmysqlclient_r -lz" cat >>confdefs.h <<\_ACEOF #define HAVE_THREAD_SAFE_MYSQL 1 @@ -17674,7 +17664,7 @@ ac_x_header_dirs=' /usr/openwin/share/include' if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Xlib.h. + # Guess where to find include files, by looking for Intrinsic.h. # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -17682,7 +17672,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -17709,7 +17699,7 @@ else sed 's/^/| /' conftest.$ac_ext >&5 for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Xlib.h"; then + if test -r "$ac_dir/X11/Intrinsic.h"; then ac_x_includes=$ac_dir break fi @@ -17730,11 +17720,11 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include int main () { -XrmInitialize () +XtMalloc (0) ; return 0; } @@ -29773,8 +29763,8 @@ freebsd) DISTVER=`uname -a |awk '{print $3}'` VER=`echo $DISTVER | cut -c 1` if test x$VER = x4 ; then - PTHREAD_LIB="${PTHREAD_LIBS}" - CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" + PTHREAD_LIB="${PTHREAD_LIBS:--pthread}" + CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS:--pthread}" fi lld="qd" llu="qu" @@ -29789,7 +29779,7 @@ freebsd) ;; hpux) PSCMD="UNIX95=1 ps -e -o pid,comm" - CFLAGS="$(CFLAGS) -D_XOPEN_SOURCE_EXTENDED=1" + CFLAGS="${CFLAGS} -D_XOPEN_SOURCE_EXTENDED=1" DISTVER=`uname -r` TAPEDRIVE="/dev/rmt/0hnb" PTHREAD_LIB="-lpthread" @@ -29975,7 +29965,7 @@ if test "x${subsysdir}" = "x${sbindir}" ; then exit 1 fi - ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/bacula-ctl-dir scripts/bacula-ctl-fd scripts/bacula-ctl-sd scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/bacula.desktop.gnome1.consolehelper scripts/bacula.desktop.gnome2.consolehelper scripts/bacula.desktop.gnome1.xsu scripts/bacula.desktop.gnome2.xsu scripts/gnome-console.console_apps scripts/mtx-changer scripts/disk-changer scripts/dvd-handler scripts/bacula-tray-monitor.desktop scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf scripts/wxconsole.console_apps scripts/wxconsole.desktop.consolehelper scripts/wxconsole.desktop.xsu src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/gnome2-console/Makefile src/gnome2-console/gnome-console.conf src/wx-console/Makefile src/wx-console/wx-console.conf src/tray-monitor/Makefile src/tray-monitor/tray-monitor.conf src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/cats/Makefile src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite_database src/cats/update_sqlite_tables src/cats/make_sqlite_tables src/cats/grant_sqlite_privileges src/cats/drop_sqlite_tables src/cats/drop_sqlite_database src/cats/create_sqlite3_database src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables src/cats/drop_sqlite3_database src/cats/sqlite src/cats/mysql src/cats/create_bdb_database src/cats/update_bdb_tables src/cats/make_bdb_tables src/cats/grant_bdb_privileges src/cats/drop_bdb_tables src/cats/drop_bdb_database src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/findlib/Makefile src/pygtk-console/Makefile src/tools/Makefile po/Makefile.in $PFILES" + ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/bacula-ctl-dir scripts/bacula-ctl-fd scripts/bacula-ctl-sd scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/bacula.desktop.gnome1.consolehelper scripts/bacula.desktop.gnome2.consolehelper scripts/bacula.desktop.gnome1.xsu scripts/bacula.desktop.gnome2.xsu scripts/gnome-console.console_apps scripts/mtx-changer scripts/disk-changer scripts/dvd-handler scripts/dvd-simulator scripts/bacula-tray-monitor.desktop scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf scripts/wxconsole.console_apps scripts/wxconsole.desktop.consolehelper scripts/wxconsole.desktop.xsu src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/gnome2-console/Makefile src/gnome2-console/gnome-console.conf src/wx-console/Makefile src/wx-console/wx-console.conf src/tray-monitor/Makefile src/tray-monitor/tray-monitor.conf src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/cats/Makefile src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite_database src/cats/update_sqlite_tables src/cats/make_sqlite_tables src/cats/grant_sqlite_privileges src/cats/drop_sqlite_tables src/cats/drop_sqlite_database src/cats/create_sqlite3_database src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables src/cats/drop_sqlite3_database src/cats/sqlite src/cats/mysql src/cats/create_bdb_database src/cats/update_bdb_tables src/cats/make_bdb_tables src/cats/grant_bdb_privileges src/cats/drop_bdb_tables src/cats/drop_bdb_database src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/findlib/Makefile src/pygtk-console/Makefile src/tools/Makefile po/Makefile.in $PFILES" ac_config_commands="$ac_config_commands default" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -30545,6 +30535,7 @@ do "scripts/mtx-changer" ) CONFIG_FILES="$CONFIG_FILES scripts/mtx-changer" ;; "scripts/disk-changer" ) CONFIG_FILES="$CONFIG_FILES scripts/disk-changer" ;; "scripts/dvd-handler" ) CONFIG_FILES="$CONFIG_FILES scripts/dvd-handler" ;; + "scripts/dvd-simulator" ) CONFIG_FILES="$CONFIG_FILES scripts/dvd-simulator" ;; "scripts/bacula-tray-monitor.desktop" ) CONFIG_FILES="$CONFIG_FILES scripts/bacula-tray-monitor.desktop" ;; "scripts/logwatch/Makefile" ) CONFIG_FILES="$CONFIG_FILES scripts/logwatch/Makefile" ;; "scripts/logwatch/logfile.bacula.conf" ) CONFIG_FILES="$CONFIG_FILES scripts/logwatch/logfile.bacula.conf" ;; @@ -30568,7 +30559,6 @@ do "src/stored/bacula-sd.conf" ) CONFIG_FILES="$CONFIG_FILES src/stored/bacula-sd.conf" ;; "src/filed/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/filed/Makefile" ;; "src/filed/bacula-fd.conf" ) CONFIG_FILES="$CONFIG_FILES src/filed/bacula-fd.conf" ;; - "src/filed/win32/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/filed/win32/Makefile" ;; "src/cats/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/cats/Makefile" ;; "src/cats/make_catalog_backup" ) CONFIG_FILES="$CONFIG_FILES src/cats/make_catalog_backup" ;; "src/cats/delete_catalog_backup" ) CONFIG_FILES="$CONFIG_FILES src/cats/delete_catalog_backup" ;; @@ -30613,13 +30603,6 @@ do "src/findlib/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/findlib/Makefile" ;; "src/pygtk-console/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/pygtk-console/Makefile" ;; "src/tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/tools/Makefile" ;; - "src/win32/winbacula.nsi" ) CONFIG_FILES="$CONFIG_FILES src/win32/winbacula.nsi" ;; - "src/win32/baculafd/bacula-fd.conf" ) CONFIG_FILES="$CONFIG_FILES src/win32/baculafd/bacula-fd.conf" ;; - "src/win32/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/win32/Makefile" ;; - "src/win32/Makefile.vcpp" ) CONFIG_FILES="$CONFIG_FILES src/win32/Makefile.vcpp" ;; - "src/win32/console/bconsole.conf" ) CONFIG_FILES="$CONFIG_FILES src/win32/console/bconsole.conf" ;; - "src/win32/wx-console/wx-console.conf" ) CONFIG_FILES="$CONFIG_FILES src/win32/wx-console/wx-console.conf" ;; - "src/win32/pebuilder/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/win32/pebuilder/Makefile" ;; "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "$PFILES" ) CONFIG_FILES="$CONFIG_FILES $PFILES" ;; "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; @@ -31636,7 +31619,7 @@ fi cd scripts chmod 755 startmysql stopmysql bacula startit stopit btraceback mtx-changer -chmod 755 dvd-handler +chmod 755 dvd-handler dvd-simulator chmod 755 bconsole gconsole mtx-changer devel_bacula logrotate cd ..