X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fconfigure;h=a73913e7129a948c484a64088cac7c057c580598;hb=0c4c4ce55844125ac6b079b254636f69a76e742b;hp=9d85ea7ab17b6cd9b39aeeb3ebd7c2971010597b;hpb=242336d7ede85de7e33e51f295412bea0cf4b0ea;p=bacula%2Fbacula diff --git a/bacula/configure b/bacula/configure index 9d85ea7ab1..a73913e712 100755 --- a/bacula/configure +++ b/bacula/configure @@ -309,7 +309,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS BUILD_DIR TRUEPRG FALSEPRG VERSION DATE LSMDATE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB MV RM CP SED ECHO CMP TBL AR OPENSSL MTX DD MKISOFS PYTHON GROWISOFS DVDRWMEDIAINFO DVDRWFORMAT PKGCONFIG WXCONFIG WXFLAGS CDRECORD PIDOF AWK ARFLAGS MAKE_SHELL LOCAL_LIBS LOCAL_CFLAGS LOCAL_LDFLAGS LOCAL_DEFS build build_cpu build_vendor build_os host host_cpu host_vendor host_os HAVE_SUN_OS_TRUE HAVE_SUN_OS_FALSE HAVE_OSF1_OS_TRUE HAVE_OSF1_OS_FALSE HAVE_AIX_OS_TRUE HAVE_AIX_OS_FALSE HAVE_HPUX_OS_TRUE HAVE_HPUX_OS_FALSE HAVE_LINUX_OS_TRUE HAVE_LINUX_OS_FALSE HAVE_FREEBSD_OS_TRUE HAVE_FREEBSD_OS_FALSE HAVE_NETBSD_OS_TRUE HAVE_NETBSD_OS_FALSE HAVE_OPENBSD_OS_TRUE HAVE_OPENBSD_OS_FALSE HAVE_BSDI_OS_TRUE HAVE_BSDI_OS_FALSE HAVE_SGI_OS_TRUE HAVE_SGI_OS_FALSE HAVE_IRIX_OS_TRUE HAVE_IRIX_OS_FALSE HAVE_DARWIN_OS_TRUE HAVE_DARWIN_OS_FALSE SET_MAKE MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE INTL_MACOSX_LIBS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB GLIBC2 ALLOCA GLIBC21 HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX GNOME_INCLUDEDIR GNOMEUI_LIBS GNOME_LIBDIR GNOME_LIBS GNOME_DIR WXCONS_CPPFLAGS WXCONS_LDFLAGS WX_DIR TRAY_MONITOR_CPPFLAGS TRAY_MONITOR_LDFLAGS TRAY_MONITOR_DIR TTOOL_LDFLAGS STATIC_FD STATIC_SD STATIC_DIR STATIC_CONS STATIC_GNOME_CONS STATIC_WX_CONS ALL_DIRS DIRD_DIR DIR_TOOLS STORED_DIR CONS_INC CONS_OBJ CONS_SRC CONS_LIBS CONS_LDFLAGS READLINE_SRC PYTHON_LIBS PYTHON_INCDIR OPENSSL_LIBS OPENSSL_INC working_dir scriptdir dump_email job_email smtp_host piddir subsysdir baseport dir_port fd_port sd_port dir_password fd_password sd_password mon_dir_password mon_fd_password mon_sd_password dir_user dir_group sd_user sd_group fd_user fd_group SBINPERM SQL_LFLAGS SQL_INCLUDE SQL_BINDIR cats DB_NAME GETCONF ac_ct_GETCONF X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LIBOBJS FDLIBS DEBUG DINCLUDE DLIB DB_LIBS WCFLAGS WLDFLAGS WRAPLIBS OBJLIST hostname TAPEDRIVE PSCMD WIN32 MACOSX DISTNAME DISTVER LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS BUILD_DIR TOP_DIR TRUEPRG FALSEPRG VERSION DATE LSMDATE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB MV RM CP SED ECHO CMP TBL AR OPENSSL MTX DD MKISOFS PYTHON GROWISOFS DVDRWMEDIAINFO DVDRWFORMAT PKGCONFIG WXCONFIG WXFLAGS CDRECORD PIDOF AWK ARFLAGS MAKE_SHELL LOCAL_LIBS LOCAL_CFLAGS LOCAL_LDFLAGS LOCAL_DEFS build build_cpu build_vendor build_os host host_cpu host_vendor host_os HAVE_SUN_OS_TRUE HAVE_SUN_OS_FALSE HAVE_OSF1_OS_TRUE HAVE_OSF1_OS_FALSE HAVE_AIX_OS_TRUE HAVE_AIX_OS_FALSE HAVE_HPUX_OS_TRUE HAVE_HPUX_OS_FALSE HAVE_LINUX_OS_TRUE HAVE_LINUX_OS_FALSE HAVE_FREEBSD_OS_TRUE HAVE_FREEBSD_OS_FALSE HAVE_NETBSD_OS_TRUE HAVE_NETBSD_OS_FALSE HAVE_OPENBSD_OS_TRUE HAVE_OPENBSD_OS_FALSE HAVE_BSDI_OS_TRUE HAVE_BSDI_OS_FALSE HAVE_SGI_OS_TRUE HAVE_SGI_OS_FALSE HAVE_IRIX_OS_TRUE HAVE_IRIX_OS_FALSE HAVE_DARWIN_OS_TRUE HAVE_DARWIN_OS_FALSE SET_MAKE MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE INTL_MACOSX_LIBS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB GLIBC2 ALLOCA GLIBC21 HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX GNOME_INCLUDEDIR GNOMEUI_LIBS GNOME_LIBDIR GNOME_LIBS GNOME_DIR WXCONS_CPPFLAGS WXCONS_LDFLAGS WX_DIR TRAY_MONITOR_CPPFLAGS TRAY_MONITOR_LDFLAGS TRAY_MONITOR_DIR TTOOL_LDFLAGS STATIC_FD STATIC_SD STATIC_DIR STATIC_CONS STATIC_GNOME_CONS STATIC_WX_CONS ALL_DIRS DIRD_DIR DIR_TOOLS STORED_DIR CONS_INC CONS_OBJ CONS_SRC CONS_LIBS CONS_LDFLAGS READLINE_SRC PYTHON_LIBS PYTHON_INCDIR OPENSSL_LIBS OPENSSL_INC working_dir scriptdir dump_email job_email smtp_host piddir subsysdir baseport dir_port fd_port sd_port dir_password fd_password sd_password mon_dir_password mon_fd_password mon_sd_password dir_user dir_group sd_user sd_group fd_user fd_group SBINPERM SQL_LFLAGS SQL_INCLUDE SQL_BINDIR cats DB_NAME GETCONF ac_ct_GETCONF X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LIBOBJS FDLIBS DEBUG DINCLUDE DLIB DB_LIBS WCFLAGS WLDFLAGS WRAPLIBS OBJLIST hostname TAPEDRIVE PSCMD WIN32 MACOSX DISTNAME DISTVER LTLIBOBJS' ac_subst_files='MCOMMON' # Initialize some variables set by options. @@ -1399,6 +1399,7 @@ cd .. TOP_DIR=`pwd` cd ${BUILD_DIR} + ac_aux_dir= for ac_dir in ${BUILD_DIR}/autoconf $srcdir/${BUILD_DIR}/autoconf; do if test -f $ac_dir/install-sh; then @@ -3205,11 +3206,14 @@ echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6 fi fi -if test "x$CC" = xgcc; then +BASECC=`basename $CC` +have_gcc=no +if test "x$BASECC" = xgcc; then cat >>confdefs.h <<\_ACEOF #define HAVE_GCC 1 _ACEOF + have_gcc=yes fi # Extract the first word of "$CXX", so it can be a program name with args. set dummy $CXX; ac_word=$2 @@ -4401,7 +4405,7 @@ else HAVE_SUN_OS_TRUE='#' HAVE_SUN_OS_FALSE= fi - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_SUN_OS 1 _ACEOF @@ -4428,7 +4432,7 @@ else HAVE_OSF1_OS_TRUE='#' HAVE_OSF1_OS_FALSE= fi - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_OSF1_OS 1 _ACEOF @@ -4455,7 +4459,7 @@ else HAVE_AIX_OS_TRUE='#' HAVE_AIX_OS_FALSE= fi - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_AIX_OS 1 _ACEOF @@ -4482,7 +4486,7 @@ else HAVE_HPUX_OS_TRUE='#' HAVE_HPUX_OS_FALSE= fi - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_HPUX_OS 1 _ACEOF @@ -4509,7 +4513,7 @@ else HAVE_LINUX_OS_TRUE='#' HAVE_LINUX_OS_FALSE= fi - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_LINUX_OS 1 _ACEOF @@ -4536,7 +4540,7 @@ else HAVE_FREEBSD_OS_TRUE='#' HAVE_FREEBSD_OS_FALSE= fi - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_FREEBSD_OS 1 _ACEOF @@ -4563,7 +4567,7 @@ else HAVE_NETBSD_OS_TRUE='#' HAVE_NETBSD_OS_FALSE= fi - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_NETBSD_OS 1 _ACEOF @@ -4590,7 +4594,7 @@ else HAVE_OPENBSD_OS_TRUE='#' HAVE_OPENBSD_OS_FALSE= fi - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_OPENBSD_OS 1 _ACEOF @@ -4617,7 +4621,7 @@ else HAVE_BSDI_OS_TRUE='#' HAVE_BSDI_OS_FALSE= fi - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_BSDI_OS 1 _ACEOF @@ -4644,7 +4648,7 @@ else HAVE_SGI_OS_TRUE='#' HAVE_SGI_OS_FALSE= fi - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_SGI_OS 1 _ACEOF @@ -4660,7 +4664,7 @@ else fi fi -if test $HAVE_UNAME=yes -a x`uname -s` = xIRIX +if test $HAVE_UNAME=yes -a x`uname -s` = xIRIX -o x`uname -s` = xIRIX64 then @@ -4671,7 +4675,7 @@ else HAVE_IRIX_OS_TRUE='#' HAVE_IRIX_OS_FALSE= fi - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_IRIX_OS 1 _ACEOF @@ -4724,70 +4728,70 @@ then echo "distname set to $DISTNAME" elif test $HAVE_UNAME=yes -a x`uname -s` = xOSF1 then - DISTNAME=alpha + DISTNAME=alpha elif test $HAVE_UNAME=yes -a x`uname -s` = xAIX then - DISTNAME=aix + DISTNAME=aix elif test $HAVE_UNAME=yes -a x`uname -s` = xHP-UX then - DISTNAME=hpux + DISTNAME=hpux elif test $HAVE_UNAME=yes -a x`uname -s` = xSunOS then - DISTNAME=solaris + DISTNAME=solaris elif test $HAVE_UNAME=yes -a x`uname -s` = xFreeBSD then - DISTNAME=freebsd + DISTNAME=freebsd elif test $HAVE_UNAME=yes -a x`uname -s` = xNetBSD then - DISTNAME=netbsd + DISTNAME=netbsd elif test $HAVE_UNAME=yes -a x`uname -s` = xOpenBSD then - DISTNAME=openbsd + DISTNAME=openbsd elif test $HAVE_UNAME=yes -a x`uname -s` = xIRIX then - DISTNAME=irix + DISTNAME=irix elif test $HAVE_UNAME=yes -a x`uname -s` = xBSD/OS then - DISTNAME=bsdi + DISTNAME=bsdi elif test -f /etc/SuSE-release then - DISTNAME=suse + DISTNAME=suse elif test -d /etc/SuSEconfig then - DISTNAME=suse5 + DISTNAME=suse5 elif test -f /etc/mandrake-release then - DISTNAME=mandrake + DISTNAME=mandrake elif test -f /etc/whitebox-release then DISTNAME=redhat elif test -f /etc/redhat-release then - DISTNAME=redhat + DISTNAME=redhat elif test -f /etc/gentoo-release then - DISTNAME=gentoo + DISTNAME=gentoo elif test -f /etc/debian_version then - DISTNAME=debian + DISTNAME=debian elif test -f /etc/slackware-version then - DISTNAME=slackware + DISTNAME=slackware elif test $HAVE_UNAME=yes -a x`uname -s` = xDarwin then DISTNAME=darwin elif test -f /etc/engarde-version then - DISTNAME=engarde + DISTNAME=engarde elif test "$CYGWIN" = yes then - DISTNAME=cygwin - cat >>confdefs.h <<\_ACEOF + DISTNAME=cygwin + cat >>confdefs.h <<\_ACEOF #define HAVE_CYGWIN 1 _ACEOF else - DISTNAME=unknown + DISTNAME=unknown fi echo "$as_me:$LINENO: result: done" >&5 echo "${ECHO_T}done" >&6 @@ -6732,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} @@ -12879,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 @@ -14952,22 +14960,38 @@ if test "${with_python+set}" = set; 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 - PYTHON_LIBS="-L$python_root/lib/python2.2/config -lpython2.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 - PYTHON_LIBS="-L$python_root/lib/python2.3/config -lpython2.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 - PYTHON_LIBS="-L$python_root/lib/python2.4/config -lpython2.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 done if test x$PYTHON_INCDIR = x; then if test -f $prefix/include/Python.h; then PYTHON_INCDIR=-I$prefix/include - PYTHON_LIBS="-L$prefix/lib/config -lpython" + if test -d $prefix/lib64/config; then + 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 @@ -14982,10 +15006,18 @@ echo "$as_me: error: Unable to find Python.h in standard locations" >&2;} PYTHON_LIBS="-L$withval/config -lpython" elif test -f $withval/include/Python.h; then PYTHON_INCDIR=-I$withval/include - PYTHON_LIBS="-L$withval/lib/config -lpython" + if test -d $withval/lib64/config; then + PYTHON_LIBS="-L$withval/lib64/config -lpython" + else + PYTHON_LIBS="-L$withval/lib/config -lpython" + fi elif test -f $withval/include/python/Python.h; then PYTHON_INCDIR=-I$withval/include/python - PYTHON_LIBS="-L$withval/lib/python/config -lpython" + if test -d $withval/lib64/python/config; then + PYTHON_LIBS="-L$withval/lib64/python/config -lpython" + else + PYTHON_LIBS="-L$withval/lib/python/config -lpython" + fi else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 @@ -15839,10 +15871,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. */ @@ -15943,8 +15975,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 @@ -16552,21 +16584,42 @@ echo "$as_me: error: \"You can configure for only one database.\"" >&2;} { (exit 1); exit 1; }; }; fi if test "$withval" = "yes"; then - if test -f /usr/local/include/libpq-fe.h; then + PG_CONFIG=`which pg_config` + if test -n "$PG_CONFIG";then + POSTGRESQL_INCDIR=`"$PG_CONFIG" --includedir` + POSTGRESQL_LIBDIR=`"$PG_CONFIG" --libdir` + POSTGRESQL_BINDIR=`"$PG_CONFIG" --bindir` + elif test -f /usr/local/include/libpq-fe.h; then POSTGRESQL_INCDIR=/usr/local/include - POSTGRESQL_LIBDIR=/usr/local/lib + if test -d /usr/local/lib64; then + POSTGRESQL_LIBDIR=/usr/local/lib64 + else + POSTGRESQL_LIBDIR=/usr/local/lib + fi POSTGRESQL_BINDIR=/usr/local/bin elif test -f /usr/include/libpq-fe.h; then POSTGRESQL_INCDIR=/usr/include - POSTGRESQL_LIBDIR=/usr/lib + if test -d /usr/lib64; then + POSTGRESQL_LIBDIR=/usr/lib64 + else + POSTGRESQL_LIBDIR=/usr/lib + fi POSTGRESQL_BINDIR=/usr/bin elif test -f /usr/include/pgsql/libpq-fe.h; then POSTGRESQL_INCDIR=/usr/include/pgsql - POSTGRESQL_LIBDIR=/usr/lib/pgsql + if test -d /usr/lib64/pgsql; then + POSTGRESQL_LIBDIR=/usr/lib64/pgsql + else + POSTGRESQL_LIBDIR=/usr/lib/pgsql + fi POSTGRESQL_BINDIR=/usr/bin elif test -f /usr/include/postgresql/libpq-fe.h; then POSTGRESQL_INCDIR=/usr/include/postgresql - POSTGRESQL_LIBDIR=/usr/lib/postgresql + if test -d /usr/lib64/postgresql; then + POSTGRESQL_LIBDIR=/usr/lib64/postgresql + else + POSTGRESQL_LIBDIR=/usr/lib/postgresql + fi POSTGRESQL_BINDIR=/usr/bin else echo "$as_me:$LINENO: result: no" >&5 @@ -16581,7 +16634,11 @@ 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 - POSTGRESQL_LIBDIR=$withval/lib + if test -d $withval/lib64; then + POSTGRESQL_LIBDIR=$withval/lib64 + else + POSTGRESQL_LIBDIR=$withval/lib + fi POSTGRESQL_BINDIR=$withval/bin else echo "$as_me:$LINENO: result: no" >&5 @@ -16795,52 +16852,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 - MYSQL_LIBDIR=/usr/local/mysql/lib/mysql - MYSQL_BINDIR=/usr/local/mysql/bin - elif test -f /usr/include/mysql/mysql.h; then - MYSQL_INCDIR=/usr/include/mysql - MYSQL_LIBDIR=/usr/lib/mysql - MYSQL_BINDIR=/usr/bin - elif test -f /usr/include/mysql.h; then - MYSQL_INCDIR=/usr/include - MYSQL_LIBDIR=/usr/lib - MYSQL_BINDIR=/usr/bin - elif test -f /usr/local/include/mysql/mysql.h; then - MYSQL_INCDIR=/usr/local/include/mysql - MYSQL_LIBDIR=/usr/local/lib/mysql - MYSQL_BINDIR=/usr/local/bin - elif test -f /usr/local/include/mysql.h; then - MYSQL_INCDIR=/usr/local/include - MYSQL_LIBDIR=/usr/local/lib - 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 - MYSQL_LIBDIR=$withval/lib/mysql - MYSQL_BINDIR=$withval/bin - elif test -f $withval/include/mysql.h; then - MYSQL_INCDIR=$withval/include - MYSQL_LIBDIR=$withval/lib - 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 @@ -16879,23 +16968,43 @@ if test "${with_embedded_mysql+set}" = set; then if test "$withval" = "yes"; then if test -f /usr/local/mysql/include/mysql/mysql.h; then MYSQL_INCDIR=/usr/local/mysql/include/mysql - MYSQL_LIBDIR=/usr/local/mysql/lib/mysql + if test -d /usr/local/mysql/lib64/mysql; 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 - MYSQL_LIBDIR=/usr/lib/mysql + if test -d /usr/lib64/mysql; 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 - MYSQL_LIBDIR=/usr/lib + if test -d /usr/lib64; 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 - MYSQL_LIBDIR=/usr/local/lib/mysql + if test -d /usr/local/lib64/mysql; 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 - MYSQL_LIBDIR=/usr/local/lib + if test -d /usr/local/lib64; 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 @@ -16907,11 +17016,19 @@ echo "$as_me: error: Unable to find mysql.h in standard locations" >&2;} else if test -f $withval/include/mysql/mysql.h; then MYSQL_INCDIR=$withval/include/mysql - MYSQL_LIBDIR=$withval/lib/mysql + if test -d $withval/lib64/mysql; 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 - MYSQL_LIBDIR=$withval/lib + if test -d $withval/lib64; then + MYSQL_LIBDIR=$withval/lib64 + else + MYSQL_LIBDIR=$withval/lib + fi MYSQL_BINDIR=$withval/bin else echo "$as_me:$LINENO: result: no" >&5 @@ -16968,15 +17085,27 @@ if test "${with_sqlite3+set}" = set; then if test "$withval" = "yes"; then if test -f /usr/local/include/sqlite3.h; then SQLITE_INCDIR=/usr/local/include - SQLITE_LIBDIR=/usr/local/lib + if test -d /usr/local/lib64; then + SQLITE_LIBDIR=/usr/local/lib64 + else + SQLITE_LIBDIR=/usr/local/lib + fi SQLITE_BINDIR=/usr/local/bin elif test -f /usr/include/sqlite3.h; then SQLITE_INCDIR=/usr/include - SQLITE_LIBDIR=/usr/lib + if test -d /usr/lib64; then + SQLITE_LIBDIR=/usr/lib64 + else + SQLITE_LIBDIR=/usr/lib + fi SQLITE_BINDIR=/usr/bin elif test -f $prefix/include/sqlite3.h; then SQLITE_INCDIR=$prefix/include - SQLITE_LIBDIR=$prefix/lib + if test -d $prefix/lib64; then + SQLITE_LIBDIR=$prefix/lib64 + else + SQLITE_LIBDIR=$prefix/lib + fi SQLITE_BINDIR=$prefix/bin else echo "$as_me:$LINENO: result: no" >&5 @@ -16992,7 +17121,11 @@ echo "$as_me: error: Unable to find sqlite3.h in standard locations" >&2;} SQLITE_BINDIR=$withval elif test -f $withval/include/sqlite3.h; then SQLITE_INCDIR=$withval/include - SQLITE_LIBDIR=$withval/lib + if test -d $withval/lib64; then + SQLITE_LIBDIR=$withval/lib64 + else + SQLITE_LIBDIR=$withval/lib + fi SQLITE_BINDIR=$withval/bin else echo "$as_me:$LINENO: result: no" >&5 @@ -17047,15 +17180,27 @@ if test "${with_sqlite+set}" = set; then if test "$withval" = "yes"; then if test -f /usr/local/include/sqlite.h; then SQLITE_INCDIR=/usr/local/include - SQLITE_LIBDIR=/usr/local/lib + if test -d /usr/local/lib64; then + SQLITE_LIBDIR=/usr/local/lib64 + else + SQLITE_LIBDIR=/usr/local/lib + fi SQLITE_BINDIR=/usr/local/bin elif test -f /usr/include/sqlite.h; then SQLITE_INCDIR=/usr/include - SQLITE_LIBDIR=/usr/lib + if test -d /usr/lib64; then + SQLITE_LIBDIR=/usr/lib64 + else + SQLITE_LIBDIR=/usr/lib + fi SQLITE_BINDIR=/usr/bin elif test -f $prefix/include/sqlite.h; then SQLITE_INCDIR=$prefix/include - SQLITE_LIBDIR=$prefix/lib + if test -d $prefix/lib64; then + SQLITE_LIBDIR=$prefix/lib64 + else + SQLITE_LIBDIR=$prefix/lib + fi SQLITE_BINDIR=$prefix/bin else echo "$as_me:$LINENO: result: no" >&5 @@ -17071,7 +17216,11 @@ echo "$as_me: error: Unable to find sqlite.h in standard locations" >&2;} SQLITE_BINDIR=$withval elif test -f $withval/include/sqlite.h; then SQLITE_INCDIR=$withval/include - SQLITE_LIBDIR=$withval/lib + if test -d $withval/lib64; then + SQLITE_LIBDIR=$withval/lib64 + else + SQLITE_LIBDIR=$withval/lib + fi SQLITE_BINDIR=$withval/bin else echo "$as_me:$LINENO: result: no" >&5 @@ -20731,6 +20880,65 @@ test $ba_cv_bigendian = yes && cat >>confdefs.h <<\_ACEOF _ACEOF +ac_ext=cc +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + +echo "$as_me:$LINENO: checking for typeof" >&5 +echo $ECHO_N "checking for typeof... $ECHO_C" >&6 +if test "${ba_cv_have_typeof+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then + ba_cv_have_typeof=no +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +main(){char *a = 0; a = (typeof a)a;} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ba_cv_have_typeof=yes +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +ba_cv_have_typeof=no +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +echo "$as_me:$LINENO: result: $ba_cv_have_typeof" >&5 +echo "${ECHO_T}$ba_cv_have_typeof" >&6 +test $ba_cv_have_typeof = yes && +cat >>confdefs.h <<\_ACEOF +#define HAVE_TYPEOF 1 +_ACEOF + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 @@ -21282,13 +21490,13 @@ _ACEOF -echo "$as_me:$LINENO: checking for type of signal functions" >&5 + echo "$as_me:$LINENO: checking for type of signal functions" >&5 echo $ECHO_N "checking for type of signal functions... $ECHO_C" >&6 -if test "${bash_cv_signal_vintage+set}" = set; then + if test "${bash_cv_signal_vintage+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -21299,11 +21507,11 @@ int main () { - sigset_t ss; - struct sigaction sa; - sigemptyset(&ss); sigsuspend(&ss); - sigaction(SIGINT, &sa, (struct sigaction *) 0); - sigprocmask(SIG_BLOCK, &ss, (sigset_t *) 0); + sigset_t ss; + struct sigaction sa; + sigemptyset(&ss); sigsuspend(&ss); + sigaction(SIGINT, &sa, (struct sigaction *) 0); + sigprocmask(SIG_BLOCK, &ss, (sigset_t *) 0); ; return 0; @@ -21331,13 +21539,13 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - bash_cv_signal_vintage=posix + bash_cv_signal_vintage="posix" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -21348,8 +21556,8 @@ int main () { - int mask = sigmask(SIGINT); - sigsetmask(mask); sigblock(mask); sigpause(mask); + int mask = sigmask(SIGINT); + sigsetmask(mask); sigblock(mask); sigpause(mask); ; return 0; @@ -21377,28 +21585,28 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - bash_cv_signal_vintage=4.2bsd + bash_cv_signal_vintage="4.2bsd" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - RETSIGTYPE foo() { } + #include + RETSIGTYPE foo() { } int main () { - int mask = sigmask(SIGINT); - sigset(SIGINT, foo); sigrelse(SIGINT); - sighold(SIGINT); sigpause(SIGINT); + int mask = sigmask(SIGINT); + sigset(SIGINT, foo); sigrelse(SIGINT); + sighold(SIGINT); sigpause(SIGINT); ; return 0; @@ -21426,12 +21634,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - bash_cv_signal_vintage=svr3 + bash_cv_signal_vintage="svr3" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -bash_cv_signal_vintage=v7 +bash_cv_signal_vintage="v7" fi rm -f conftest.err conftest.$ac_objext \ @@ -21447,24 +21655,24 @@ rm -f conftest.err conftest.$ac_objext \ fi -echo "$as_me:$LINENO: result: $bash_cv_signal_vintage" >&5 + echo "$as_me:$LINENO: result: $bash_cv_signal_vintage" >&5 echo "${ECHO_T}$bash_cv_signal_vintage" >&6 -if test "$bash_cv_signal_vintage" = posix; then -cat >>confdefs.h <<\_ACEOF + if test "$bash_cv_signal_vintage" = "posix"; then + cat >>confdefs.h <<\_ACEOF #define HAVE_POSIX_SIGNALS 1 _ACEOF -elif test "$bash_cv_signal_vintage" = "4.2bsd"; then -cat >>confdefs.h <<\_ACEOF + elif test "$bash_cv_signal_vintage" = "4.2bsd"; then + cat >>confdefs.h <<\_ACEOF #define HAVE_BSD_SIGNALS 1 _ACEOF -elif test "$bash_cv_signal_vintage" = svr3; then -cat >>confdefs.h <<\_ACEOF + elif test "$bash_cv_signal_vintage" = "svr3"; then + cat >>confdefs.h <<\_ACEOF #define HAVE_USG_SIGHOLD 1 _ACEOF -fi + fi echo "$as_me:$LINENO: checking for mode_t" >&5 echo $ECHO_N "checking for mode_t... $ECHO_C" >&6 @@ -28396,74 +28604,6 @@ fi # AC_FUNC_FNMATCH dnl use local version -echo "$as_me:$LINENO: checking for setlocale in -lxpg4" >&5 -echo $ECHO_N "checking for setlocale in -lxpg4... $ECHO_C" >&6 -if test "${ac_cv_lib_xpg4_setlocale+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lxpg4 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char setlocale (); -int -main () -{ -setlocale (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_xpg4_setlocale=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_xpg4_setlocale=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_xpg4_setlocale" >&5 -echo "${ECHO_T}$ac_cv_lib_xpg4_setlocale" >&6 -if test $ac_cv_lib_xpg4_setlocale = yes; then - LIBS="$LIBS -lxpg4" -fi - echo "$as_me:$LINENO: checking for gettext in -lintl" >&5 echo $ECHO_N "checking for gettext in -lintl... $ECHO_C" >&6 if test "${ac_cv_lib_intl_gettext+set}" = set; then @@ -29531,10 +29671,15 @@ _ACEOF CFLAGS=${CFLAGS--O} + +if test x$have_gcc = xyes ; then + CPPFLAGS="$CPPFLAGS -fno-strict-aliasing -fno-exceptions -fno-rtti" + CFLAGS="$CFLAGS -fno-strict-aliasing -fno-exceptions -fno-rtti" +fi LDFLAGS=${LDFLAGS--O} DB_LIBS="${SQL_LFLAGS}" - CPPFLAGS="$CPPFLAGS" +CFLAGS="$CFLAGS" @@ -29632,8 +29777,8 @@ freebsd) DISTVER=`uname -a |awk '{print $3}'` VER=`echo $DISTVER | cut -c 1` if test x$VER = x4 ; then - PTHREAD_LIB="-pthread" - CFLAGS="${CFLAGS} -pthread" + PTHREAD_LIB="${PTHREAD_LIBS:--pthread}" + CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS:--pthread}" fi lld="qd" llu="qu" @@ -29648,7 +29793,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" @@ -29834,7 +29979,7 @@ if test "x${subsysdir}" = "x${sbindir}" ; then exit 1 fi - ac_config_files="$ac_config_files autoconf/Make.common Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula 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/dvd-handler scripts/bacula-tray-monitor.desktop scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf 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/filed/win32/Makefile 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 src/win32/winbacula.nsi src/win32/baculafd/bacula-fd.conf src/win32/Makefile src/win32/console/bconsole.conf src/win32/wx-console/wx-console.conf src/win32/pebuilder/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 @@ -30379,6 +30524,7 @@ do # Handling of arguments. "autoconf/Make.common" ) CONFIG_FILES="$CONFIG_FILES autoconf/Make.common" ;; "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "manpages/Makefile" ) CONFIG_FILES="$CONFIG_FILES manpages/Makefile" ;; "scripts/startmysql" ) CONFIG_FILES="$CONFIG_FILES scripts/startmysql" ;; "scripts/stopmysql" ) CONFIG_FILES="$CONFIG_FILES scripts/stopmysql" ;; "scripts/btraceback" ) CONFIG_FILES="$CONFIG_FILES scripts/btraceback" ;; @@ -30387,6 +30533,9 @@ do "scripts/bconsole" ) CONFIG_FILES="$CONFIG_FILES scripts/bconsole" ;; "scripts/gconsole" ) CONFIG_FILES="$CONFIG_FILES scripts/gconsole" ;; "scripts/bacula" ) CONFIG_FILES="$CONFIG_FILES scripts/bacula" ;; + "scripts/bacula-ctl-dir" ) CONFIG_FILES="$CONFIG_FILES scripts/bacula-ctl-dir" ;; + "scripts/bacula-ctl-fd" ) CONFIG_FILES="$CONFIG_FILES scripts/bacula-ctl-fd" ;; + "scripts/bacula-ctl-sd" ) CONFIG_FILES="$CONFIG_FILES scripts/bacula-ctl-sd" ;; "scripts/devel_bacula" ) CONFIG_FILES="$CONFIG_FILES scripts/devel_bacula" ;; "scripts/Makefile" ) CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;; "scripts/logrotate" ) CONFIG_FILES="$CONFIG_FILES scripts/logrotate" ;; @@ -30398,10 +30547,15 @@ do "scripts/bacula.desktop.gnome2.xsu" ) CONFIG_FILES="$CONFIG_FILES scripts/bacula.desktop.gnome2.xsu" ;; "scripts/gnome-console.console_apps" ) CONFIG_FILES="$CONFIG_FILES scripts/gnome-console.console_apps" ;; "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" ;; + "scripts/wxconsole.console_apps" ) CONFIG_FILES="$CONFIG_FILES scripts/wxconsole.console_apps" ;; + "scripts/wxconsole.desktop.consolehelper" ) CONFIG_FILES="$CONFIG_FILES scripts/wxconsole.desktop.consolehelper" ;; + "scripts/wxconsole.desktop.xsu" ) CONFIG_FILES="$CONFIG_FILES scripts/wxconsole.desktop.xsu" ;; "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "src/host.h" ) CONFIG_FILES="$CONFIG_FILES src/host.h" ;; "src/console/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/console/Makefile" ;; @@ -30419,7 +30573,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" ;; @@ -30464,12 +30617,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/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" ;; @@ -30561,6 +30708,7 @@ s,@ECHO_N@,$ECHO_N,;t t s,@ECHO_T@,$ECHO_T,;t t s,@LIBS@,$LIBS,;t t s,@BUILD_DIR@,$BUILD_DIR,;t t +s,@TOP_DIR@,$TOP_DIR,;t t s,@TRUEPRG@,$TRUEPRG,;t t s,@FALSEPRG@,$FALSEPRG,;t t s,@VERSION@,$VERSION,;t t @@ -31485,7 +31633,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 ..