From 1e7a949487de4a8f0b4fb88e317f038996180976 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Wed, 30 Apr 2003 16:58:52 +0000 Subject: [PATCH] Fix cancel problem and implement run gnome dialog git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@472 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/Makefile.in | 1 + bacula/ReleaseNotes | 82 +- bacula/autoconf/aclocal.m4 | 1496 +++++++++++++++++----------------- bacula/autoconf/configure.in | 2 +- bacula/configure | 754 ++++++++--------- bacula/src/console.glade | 252 +++--- bacula/src/dird/job.c | 22 +- bacula/src/dird/ua_cmds.c | 71 +- bacula/src/dird/ua_dotcmds.c | 64 ++ bacula/src/dird/ua_status.c | 4 + bacula/src/jcr.h | 1 + bacula/src/lib/jcr.c | 8 + bacula/src/lib/signal.c | 3 +- bacula/src/lib/watchdog.c | 4 +- bacula/src/lib/watchdog.h | 6 +- bacula/src/version.h | 6 +- 16 files changed, 1420 insertions(+), 1356 deletions(-) diff --git a/bacula/Makefile.in b/bacula/Makefile.in index 0c7e2073e8..114c5ddc97 100755 --- a/bacula/Makefile.in +++ b/bacula/Makefile.in @@ -58,6 +58,7 @@ configure: autoconf/configure.in autoconf/aclocal.m4 autoconf/acconfig.h autocon autoconf --localdir=$(srcdir)/autoconf \ autoconf/configure.in > configure chmod 755 configure + @rm -f config.cache config.status: if test -x config.status; then config.status --recheck; \ diff --git a/bacula/ReleaseNotes b/bacula/ReleaseNotes index 2eaf1aa240..48f92623fe 100644 --- a/bacula/ReleaseNotes +++ b/bacula/ReleaseNotes @@ -1,88 +1,12 @@ - Release Notes for Bacula 1.30 + Release Notes for Bacula 1.30a (or 1.31) Bacula code: Total files = 235 Total lines = 67,287 (*.h *.c *.in) Major Changes this Release: -- Support for SHA1 signatures in addition to MD5 (more secure). -- The btape "test" command is much more comprehensive and automatically - tries different options. -- Implemented support for autochanger barcodes ("label barcodes", - "update slots"). -- Make Incremental and Differential saves backup all files changed as - well as all files moved into save path (added st_ctime to check). -- Preliminary support for identifying cleaning tapes in autochangers. -- Restores directory permissions and times correctly. -- Hard linked files are restored even if only one of links is chosen. -- Relabel Purged tapes with the relabel command. -- Support for Win95 systems (I hope). -- RunBeforeJob now checks the return status. If it is non-zero, the job - will be terminated in error. -- The Windows Client now uses Cygwin 1.3.20 and should be - more reliable. -- Implemented save/restore of chflags for FreeBSD systems. -- Support for FreeBSD tape drives. -- Lots more documentation. -- Console "run" command now permits setting a start date/time. -- There is a new "default" configuration file that permits saving and - restoring the Bacula source code immediately on installation. This - is documented in the "Running Bacula" chapter. -- Finer contol of multiple simultaneous Jobs with specifications for - the Director as a whole (previous implementation), Jobs, Clients, - and Storage. Thus if you are careful, you can run multiple simultaneous - jobs and still have only one simultaneous Job per Volume. -- Rpm spec files thanks to Scott Barninger. + Other Changes this Release: -- Tightened up file permissions (additional security) for all created - files. -- Eliminated a lot of strcpy() to prevent possible buffer overruns. -- Added "BSF at EOM = yes/no" for supporting FreeBSD tape drives. -- The | and < options are now available for Excludes. -- Multiple Directors in the GNOME Console now work (thanks Lutz Kttler). -- Gnome console runs on GNOME 2.0 (haven't tried 2.2 yet). -- Installation on Win32 systems with Cygwin is now supported. -- GNOME Console has font support thanks to Phil Stracchino. -- Solaris 2.6 now supported. -- Support for Darwin (at least partially) -- Support connection to MySQL on address:port. -- Partial support for AIX systems (see README.AIX) -- Cycle through tapes with "RecycleOldestVolume=yes" (dangerous). -- Console program now supported on Win32 systems as well as - several other utility programs. -- Full vertical listing of most catalog records (llist command). -- Correct backwards path separators on Win32 systems to - prevent creating files names with mixed conventions. -- Print IP address on failed connections to servers. -- Cancel command works much better (cancels waiting jobs in Dir - and in SD). -- Now have reasonable (but still small) regression script. -- New Console commands for aiding scripting (@input, @output, @tee, - @time, @version and wait). -- logrotate script in scripts/logrotate -- Prevent configuring subsys directory to be the same as sbindir. -- New Cleaning Prefix record in Pool for defining autochanger cleaning - tapes. + Items to note: -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - On WinXP systems, and possibly Win2K, Bacula runs under the - LocalSystem account, so all files that are restored are created with - that account. I have spent an enormous amount of time trying to - resolve this but have not yet succeeded. I have included chown - in the binary release but it will probably not work without a - full cygwin installation. You might also try the CACLS program, - but you will probably need to boot into safemode (F8 during boot) - to get sufficient permissions. It is also possible to run - Bacula under your userid, but the system tray icon will not - be present -- however, this option permits saving and restoring - files with your userid. - !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- Version 1.29 File daemons can be used with version 1.30. However, - there may be an incompatibility if you use Exclude lists. -- RunBeforeJob now checks the return status. If it is non-zero, the job - will be terminated in error. -- If you have an autochanger with barcodes and you wish to use cleaning - tapes and you are using MySQL, you must run: - /src/cats/alter_mysql_tables - this script will add one additional VolStatus (Cleaning). diff --git a/bacula/autoconf/aclocal.m4 b/bacula/autoconf/aclocal.m4 index e9e9376a56..5b69434fda 100644 --- a/bacula/autoconf/aclocal.m4 +++ b/bacula/autoconf/aclocal.m4 @@ -13,21 +13,21 @@ AC_DEFUN(AC_SYS_LARGEFILE_FLAGS, [AC_CACHE_CHECK([for $1 value to request large file support], ac_cv_sys_largefile_$1, [ac_cv_sys_largefile_$1=`($GETCONF LFS_$1) 2>/dev/null` || { - ac_cv_sys_largefile_$1=no - ifelse($1, CFLAGS, - [case "$host_os" in - # IRIX 6.2 and later require cc -n32. + ac_cv_sys_largefile_$1=no + ifelse($1, CFLAGS, + [case "$host_os" in + # IRIX 6.2 and later require cc -n32. changequote(, )dnl - irix6.[2-9]* | irix6.1[0-9]* | irix[7-9].* | irix[1-9][0-9]*) + irix6.[2-9]* | irix6.1[0-9]* | irix[7-9].* | irix[1-9][0-9]*) changequote([, ])dnl - if test "$GCC" != yes; then - ac_cv_sys_largefile_CFLAGS=-n32 - fi - ac_save_CC="$CC" - CC="$CC $ac_cv_sys_largefile_CFLAGS" - AC_TRY_LINK(, , , ac_cv_sys_largefile_CFLAGS=no) - CC="$ac_save_CC" - esac]) + if test "$GCC" != yes; then + ac_cv_sys_largefile_CFLAGS=-n32 + fi + ac_save_CC="$CC" + CC="$CC $ac_cv_sys_largefile_CFLAGS" + AC_TRY_LINK(, , , ac_cv_sys_largefile_CFLAGS=no) + CC="$ac_save_CC" + esac]) }])]) dnl Internal subroutine of AC_SYS_LARGEFILE. @@ -50,12 +50,12 @@ AC_DEFUN(AC_SYS_LARGEFILE_MACRO_VALUE, changequote(, )dnl $4 for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do - case "$ac_flag" in - -D$1) - $2=1 ;; - -D$1=*) - $2=`expr " $ac_flag" : '[^=]*=\(.*\)'` ;; - esac + case "$ac_flag" in + -D$1) + $2=1 ;; + -D$1=*) + $2=`expr " $ac_flag" : '[^=]*=\(.*\)'` ;; + esac done changequote([, ])dnl ]) @@ -63,10 +63,10 @@ changequote([, ])dnl AC_DEFINE_UNQUOTED([$1], [$]$2, [$3]) fi]) -AC_DEFUN(AC_SYS_LARGEFILE, +AC_DEFUN(AC_BAC_LARGEFILE, [AC_REQUIRE([AC_CANONICAL_HOST]) AC_ARG_ENABLE(largefile, - [ --disable-largefile omit support for large files]) + [ --disable-largefile omit support for large files]) if test "$enable_largefile" != no; then AC_CHECK_TOOL(GETCONF, getconf) AC_SYS_LARGEFILE_FLAGS(CFLAGS) @@ -80,9 +80,9 @@ AC_DEFUN(AC_SYS_LARGEFILE, -D_LARGEFILE_SOURCE | -D_LARGEFILE_SOURCE=*) ;; -D_LARGE_FILES | -D_LARGE_FILES=*) ;; -D?* | -I?*) - AC_SYS_LARGEFILE_SPACE_APPEND(CPPFLAGS, "$ac_flag") ;; + AC_SYS_LARGEFILE_SPACE_APPEND(CPPFLAGS, "$ac_flag") ;; *) - AC_SYS_LARGEFILE_SPACE_APPEND(CFLAGS, "$ac_flag") ;; + AC_SYS_LARGEFILE_SPACE_APPEND(CFLAGS, "$ac_flag") ;; esac done AC_SYS_LARGEFILE_SPACE_APPEND(LDFLAGS, "$ac_cv_sys_largefile_LDFLAGS") @@ -91,26 +91,26 @@ AC_DEFUN(AC_SYS_LARGEFILE, ac_cv_sys_file_offset_bits, [Number of bits in a file offset, on hosts where this is settable.], [case "$host_os" in - # HP-UX 10.20 and later - hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*) - ac_cv_sys_file_offset_bits=64 ;; - esac]) + # HP-UX 10.20 and later + hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*) + ac_cv_sys_file_offset_bits=64 ;; + esac]) AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE, ac_cv_sys_largefile_source, [Define to make fseeko etc. visible, on some hosts.], [case "$host_os" in - # HP-UX 10.20 and later - hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*) - ac_cv_sys_largefile_source=1 ;; - esac]) + # HP-UX 10.20 and later + hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*) + ac_cv_sys_largefile_source=1 ;; + esac]) AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, ac_cv_sys_large_files, [Define for large files, on AIX-style hosts.], [case "$host_os" in - # AIX 4.2 and later - aix4.[2-9]* | aix4.1[0-9]* | aix[5-9].* | aix[1-9][0-9]*) - ac_cv_sys_large_files=1 ;; - esac]) + # AIX 4.2 and later + aix4.[2-9]* | aix4.1[0-9]* | aix[5-9].* | aix[1-9][0-9]*) + ac_cv_sys_large_files=1 ;; + esac]) fi ]) dnl ========================================================== @@ -130,17 +130,17 @@ AC_CACHE_VAL(bash_cv_signal_vintage, ], bash_cv_signal_vintage=posix, [ AC_TRY_LINK([#include ], [ - int mask = sigmask(SIGINT); - sigsetmask(mask); sigblock(mask); sigpause(mask); + int mask = sigmask(SIGINT); + sigsetmask(mask); sigblock(mask); sigpause(mask); ], bash_cv_signal_vintage=4.2bsd, [ AC_TRY_LINK([ - #include - RETSIGTYPE foo() { }], [ - int mask = sigmask(SIGINT); - sigset(SIGINT, foo); sigrelse(SIGINT); - sighold(SIGINT); sigpause(SIGINT); - ], bash_cv_signal_vintage=svr3, bash_cv_signal_vintage=v7 + #include + RETSIGTYPE foo() { }], [ + int mask = sigmask(SIGINT); + sigset(SIGINT, foo); sigrelse(SIGINT); + sighold(SIGINT); sigpause(SIGINT); + ], bash_cv_signal_vintage=svr3, bash_cv_signal_vintage=v7 )] )] ) @@ -172,90 +172,90 @@ AC_DEFUN(BA_CHECK_OPSYS, AC_CYGWIN if test $HAVE_UNAME=yes -a x`uname -s` = xSunOS then - BA_CONDITIONAL(HAVE_SUN_OS, $TRUEPRG) - AC_DEFINE(HAVE_SUN_OS) + BA_CONDITIONAL(HAVE_SUN_OS, $TRUEPRG) + AC_DEFINE(HAVE_SUN_OS) else - BA_CONDITIONAL(HAVE_SUN_OS, $FALSEPRG) + BA_CONDITIONAL(HAVE_SUN_OS, $FALSEPRG) fi if test $HAVE_UNAME=yes -a x`uname -s` = xOSF1 then - BA_CONDITIONAL(HAVE_OSF1_OS, $TRUEPRG) - AC_DEFINE(HAVE_OSF1_OS) + BA_CONDITIONAL(HAVE_OSF1_OS, $TRUEPRG) + AC_DEFINE(HAVE_OSF1_OS) else - BA_CONDITIONAL(HAVE_OSF1_OS, $FALSEPRG) + BA_CONDITIONAL(HAVE_OSF1_OS, $FALSEPRG) fi if test $HAVE_UNAME=yes -a x`uname -s` = xAIX then - BA_CONDITIONAL(HAVE_AIX_OS, $TRUEPRG) - AC_DEFINE(HAVE_AIX_OS) + BA_CONDITIONAL(HAVE_AIX_OS, $TRUEPRG) + AC_DEFINE(HAVE_AIX_OS) else - BA_CONDITIONAL(HAVE_AIX_OS, $FALSEPRG) + BA_CONDITIONAL(HAVE_AIX_OS, $FALSEPRG) fi if test $HAVE_UNAME=yes -a x`uname -s` = xHP-UX then - BA_CONDITIONAL(HAVE_HPUX_OS, $TRUEPRG) - AC_DEFINE(HAVE_HPUX_OS) + BA_CONDITIONAL(HAVE_HPUX_OS, $TRUEPRG) + AC_DEFINE(HAVE_HPUX_OS) else - BA_CONDITIONAL(HAVE_HPUX_OS, $FALSEPRG) + BA_CONDITIONAL(HAVE_HPUX_OS, $FALSEPRG) fi if test $HAVE_UNAME=yes -a x`uname -s` = xLinux then - BA_CONDITIONAL(HAVE_LINUX_OS, $TRUEPRG) - AC_DEFINE(HAVE_LINUX_OS) + BA_CONDITIONAL(HAVE_LINUX_OS, $TRUEPRG) + AC_DEFINE(HAVE_LINUX_OS) else - BA_CONDITIONAL(HAVE_LINUX_OS, $FALSEPRG) + BA_CONDITIONAL(HAVE_LINUX_OS, $FALSEPRG) fi if test $HAVE_UNAME=yes -a x`uname -s` = xFreeBSD then - BA_CONDITIONAL(HAVE_FREEBSD_OS, $TRUEPRG) - AC_DEFINE(HAVE_FREEBSD_OS) + BA_CONDITIONAL(HAVE_FREEBSD_OS, $TRUEPRG) + AC_DEFINE(HAVE_FREEBSD_OS) else - BA_CONDITIONAL(HAVE_FREEBSD_OS, $FALSEPRG) + BA_CONDITIONAL(HAVE_FREEBSD_OS, $FALSEPRG) fi if test $HAVE_UNAME=yes -a x`uname -s` = xNetBSD then - BA_CONDITIONAL(HAVE_NETBSD_OS, $TRUEPRG) - AC_DEFINE(HAVE_NETBSD_OS) + BA_CONDITIONAL(HAVE_NETBSD_OS, $TRUEPRG) + AC_DEFINE(HAVE_NETBSD_OS) else - BA_CONDITIONAL(HAVE_NETBSD_OS, $FALSEPRG) + BA_CONDITIONAL(HAVE_NETBSD_OS, $FALSEPRG) fi if test $HAVE_UNAME=yes -a x`uname -s` = xOpenBSD then - BA_CONDITIONAL(HAVE_OPENBSD_OS, $TRUEPRG) - AC_DEFINE(HAVE_OPENBSD_OS) + BA_CONDITIONAL(HAVE_OPENBSD_OS, $TRUEPRG) + AC_DEFINE(HAVE_OPENBSD_OS) else - BA_CONDITIONAL(HAVE_OPENBSD_OS, $FALSEPRG) + BA_CONDITIONAL(HAVE_OPENBSD_OS, $FALSEPRG) fi if test $HAVE_UNAME=yes -a x`uname -s` = xBSD/OS then - BA_CONDITIONAL(HAVE_BSDI_OS, $TRUEPRG) - AC_DEFINE(HAVE_BSDI_OS) + BA_CONDITIONAL(HAVE_BSDI_OS, $TRUEPRG) + AC_DEFINE(HAVE_BSDI_OS) else - BA_CONDITIONAL(HAVE_BSDI_OS, $FALSEPRG) + BA_CONDITIONAL(HAVE_BSDI_OS, $FALSEPRG) fi if test $HAVE_UNAME=yes -a x`uname -s` = xSGI then - BA_CONDITIONAL(HAVE_SGI_OS, $TRUEPRG) - AC_DEFINE(HAVE_SGI_OS) + BA_CONDITIONAL(HAVE_SGI_OS, $TRUEPRG) + AC_DEFINE(HAVE_SGI_OS) else - BA_CONDITIONAL(HAVE_SGI_OS, $FALSEPRG) + BA_CONDITIONAL(HAVE_SGI_OS, $FALSEPRG) fi if test $HAVE_UNAME=yes -a x`uname -s` = xIRIX then - BA_CONDITIONAL(HAVE_IRIX_OS, $TRUEPRG) - AC_DEFINE(HAVE_IRIX_OS) + BA_CONDITIONAL(HAVE_IRIX_OS, $TRUEPRG) + AC_DEFINE(HAVE_IRIX_OS) else - BA_CONDITIONAL(HAVE_IRIX_OS, $FALSEPRG) + BA_CONDITIONAL(HAVE_IRIX_OS, $FALSEPRG) fi if test $HAVE_UNAME=yes -a x`uname -s` = xDarwin @@ -273,64 +273,64 @@ AC_DEFUN(BA_CHECK_OPSYS_DISTNAME, [AC_MSG_CHECKING(for Operating System Distribution) if test "x$DISTNAME" != "x" then - echo "distname set to $DISTNAME" + 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 -d /usr/src/OpenLinux then - DISTNAME=caldera + DISTNAME=caldera 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 "$ac_cv_cygwin" = yes then - DISTNAME=cygwin - AC_DEFINE(HAVE_CYGWIN) + DISTNAME=cygwin + AC_DEFINE(HAVE_CYGWIN) else - DISTNAME=unknown + DISTNAME=unknown fi AC_MSG_RESULT(" ") ]) @@ -342,50 +342,50 @@ AC_MSG_CHECKING(for MySQL support) AC_ARG_WITH(mysql, [ Which DBMS do you want to use (please select only one): - --with-mysql[=DIR] Include MySQL support. DIR is the MySQL base - install directory, default is to search through - a number of common places for the MySQL files.], + --with-mysql[=DIR] Include MySQL support. DIR is the MySQL base + install directory, default is to search through + a number of common places for the MySQL files.], [ 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 - AC_MSG_RESULT(no) - AC_MSG_ERROR(Unable to find mysql.h in standard locations) - 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 - AC_MSG_RESULT(no) - AC_MSG_ERROR(Invalid MySQL directory $withval - unable to find mysql.h under $withval) - fi - fi + 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 + AC_MSG_RESULT(no) + AC_MSG_ERROR(Unable to find mysql.h in standard locations) + 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 + AC_MSG_RESULT(no) + AC_MSG_ERROR(Invalid MySQL directory $withval - unable to find mysql.h under $withval) + fi + fi SQL_INCLUDE=-I$MYSQL_INCDIR SQL_LFLAGS="-L$MYSQL_LIBDIR -lmysqlclient -lz" SQL_BINDIR=$MYSQL_BINDIR @@ -398,7 +398,7 @@ Which DBMS do you want to use (please select only one): DB_NAME=mysql else - AC_MSG_RESULT(no) + AC_MSG_RESULT(no) fi ],[ AC_MSG_RESULT(no) @@ -408,49 +408,49 @@ AC_ARG_WITH(embedded-mysql, [ Which DBMS do you want to use (please select only one): --with-embedded-mysql[=DIR] Include MySQL support. DIR is the MySQL base - install directory, default is to search through - a number of common places for the MySQL files.], + install directory, default is to search through + a number of common places for the MySQL files.], [ 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 - AC_MSG_RESULT(no) - AC_MSG_ERROR(Unable to find mysql.h in standard locations) - 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 - AC_MSG_RESULT(no) - AC_MSG_ERROR(Invalid MySQL directory $withval - unable to find mysql.h under $withval) - fi - fi + 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 + AC_MSG_RESULT(no) + AC_MSG_ERROR(Unable to find mysql.h in standard locations) + 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 + AC_MSG_RESULT(no) + AC_MSG_ERROR(Invalid MySQL directory $withval - unable to find mysql.h under $withval) + fi + fi SQL_INCLUDE=-I$MYSQL_INCDIR SQL_LFLAGS="-L$MYSQL_LIBDIR -lmysqld -lz -lm -lcrypt" SQL_BINDIR=$MYSQL_BINDIR @@ -464,7 +464,7 @@ Which DBMS do you want to use (please select only one): DB_NAME=mysql else - AC_MSG_RESULT(no) + AC_MSG_RESULT(no) fi ],[ AC_MSG_RESULT(no) @@ -485,34 +485,34 @@ AC_MSG_CHECKING(for SQLite support) AC_ARG_WITH(sqlite, [ Which DBMS do you want to use (please select only one): - --with-sqlite[=DIR] Include SQLite support. DIR is the SQLite base - install directory, default is to search through - a number of common places for the SQLite files.], + --with-sqlite[=DIR] Include SQLite support. DIR is the SQLite base + install directory, default is to search through + a number of common places for the SQLite files.], [ if test "$withval" != "no"; 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 - SQLITE_BINDIR=/usr/local/bin - elif test -f /usr/include/sqlite.h; then - SQLITE_INCDIR=/usr/include - SQLITE_LIBDIR=/usr/lib - SQLITE_BINDIR=/usr/bin - else - AC_MSG_RESULT(no) - AC_MSG_ERROR(Unable to find sqlite.h in standard locations) - fi - else - if test -f $withval/sqlite.h; then - SQLITE_INCDIR=$withval - SQLITE_LIBDIR=$withval - SQLITE_BINDIR=$withval - else - AC_MSG_RESULT(no) - AC_MSG_ERROR(Invalid SQLite directory $withval - unable to find sqlite.h under $withval) - fi - fi + if test "$withval" = "yes"; then + if test -f /usr/local/include/sqlite.h; then + SQLITE_INCDIR=/usr/local/include + SQLITE_LIBDIR=/usr/local/lib + SQLITE_BINDIR=/usr/local/bin + elif test -f /usr/include/sqlite.h; then + SQLITE_INCDIR=/usr/include + SQLITE_LIBDIR=/usr/lib + SQLITE_BINDIR=/usr/bin + else + AC_MSG_RESULT(no) + AC_MSG_ERROR(Unable to find sqlite.h in standard locations) + fi + else + if test -f $withval/sqlite.h; then + SQLITE_INCDIR=$withval + SQLITE_LIBDIR=$withval + SQLITE_BINDIR=$withval + else + AC_MSG_RESULT(no) + AC_MSG_ERROR(Invalid SQLite directory $withval - unable to find sqlite.h under $withval) + fi + fi SQL_INCLUDE=-I$SQLITE_INCDIR SQL_LFLAGS="-L$SQLITE_LIBDIR -lsqlite" SQL_BINDIR=$SQLITE_BINDIR @@ -525,7 +525,7 @@ Which DBMS do you want to use (please select only one): DB_NAME=sqlite else - AC_MSG_RESULT(no) + AC_MSG_RESULT(no) fi ],[ AC_MSG_RESULT(no) @@ -561,28 +561,28 @@ AC_MSG_CHECKING(for Berkeley DB support) AC_ARG_WITH(berkeleydb, [ Which DBMS do you want to use (please select only one): - --with-berkeleydb[=DIR] Include Berkeley DB support. DIR is the Berkeley DB base - install directory, default is to search through - a number of common places for the DB files.], + --with-berkeleydb[=DIR] Include Berkeley DB support. DIR is the Berkeley DB base + install directory, default is to search through + a number of common places for the DB files.], [ if test "$withval" != "no"; then - if test "$withval" = "yes"; then - if test -f /usr/include/db.h; then - BERKELEYDB_INCDIR=/usr/include - BERKELEYDB_LIBDIR=/usr/lib - else - AC_MSG_RESULT(no) - AC_MSG_ERROR(Invalid Berkeley DB directory - unable to find db.h) - fi - else - if test -f $withval/include/db.h; then - BERKELEYDB_INCDIR=$withval/include - BERKELEYDBL_LIBDIR=$withval/lib - else - AC_MSG_RESULT(no) - AC_MSG_ERROR(Invalid Berkeley DB directory - unable to find db.h under $withval) - fi - fi + if test "$withval" = "yes"; then + if test -f /usr/include/db.h; then + BERKELEYDB_INCDIR=/usr/include + BERKELEYDB_LIBDIR=/usr/lib + else + AC_MSG_RESULT(no) + AC_MSG_ERROR(Invalid Berkeley DB directory - unable to find db.h) + fi + else + if test -f $withval/include/db.h; then + BERKELEYDB_INCDIR=$withval/include + BERKELEYDBL_LIBDIR=$withval/lib + else + AC_MSG_RESULT(no) + AC_MSG_ERROR(Invalid Berkeley DB directory - unable to find db.h under $withval) + fi + fi SQL_INCLUDE=-I$BERKELEYDB_INCDIR SQL_LFLAGS="-L$BERKELEYDB_LIBDIR -ldb" @@ -593,7 +593,7 @@ Which DBMS do you want to use (please select only one): db_name=BerkelyDB else - AC_MSG_RESULT(no) + AC_MSG_RESULT(no) fi ],[ AC_MSG_RESULT(no) @@ -608,31 +608,31 @@ fi AC_MSG_CHECKING(for PostgreSQL support) AC_ARG_WITH(pgsql, -[ --with-pgsql[=DIR] Include PostgreSQL support. DIR is the PostgreSQL - base install directory, defaults to /usr/local/pgsql.], +[ --with-pgsql[=DIR] Include PostgreSQL support. DIR is the PostgreSQL + base install directory, defaults to /usr/local/pgsql.], [ if test "$withval" != "no"; then if test "$have_db" = "yes"; then - AC_MSG_RESULT(error) - AC_MSG_ERROR("You can configure for only one database."); + AC_MSG_RESULT(error) + AC_MSG_ERROR("You can configure for only one database."); fi - if test "$withval" = "yes"; then - if test -f /usr/include/pgsql/libpq-fe.h; then - PGSQL_INCDIR=/usr/include/pgsql - else - PGSQL_INCDIR=/usr/local/pgsql/include - fi - if test -f /usr/lib/libpq.a; then - PGSQL_LIBDIR=/usr/lib - else - PGSQL_LIBDIR=/usr/local/pgsql/lib - fi - else - PGSQL_INCDIR=$withval/include - test -d $withval/include/pgsql && PGSQL_INCDIR=$withval/include/pgsql - PGSQL_LIBDIR=$withval/lib - test -d $withval/lib/pgsql && PGSQL_LIBDIR=$withval/lib/pgsql - fi + if test "$withval" = "yes"; then + if test -f /usr/include/pgsql/libpq-fe.h; then + PGSQL_INCDIR=/usr/include/pgsql + else + PGSQL_INCDIR=/usr/local/pgsql/include + fi + if test -f /usr/lib/libpq.a; then + PGSQL_LIBDIR=/usr/lib + else + PGSQL_LIBDIR=/usr/local/pgsql/lib + fi + else + PGSQL_INCDIR=$withval/include + test -d $withval/include/pgsql && PGSQL_INCDIR=$withval/include/pgsql + PGSQL_LIBDIR=$withval/lib + test -d $withval/lib/pgsql && PGSQL_LIBDIR=$withval/lib/pgsql + fi PGSQL_INCLUDE=-I$PGSQL_INCDIR PGSQL_LFLAGS="-L$PGSQL_LIBDIR -lpq" AC_CHECK_FUNC(crypt, , AC_CHECK_LIB(crypt, crypt, [LIBS="-lcrypt $LIBS"])) @@ -652,21 +652,21 @@ AC_SUBST(PGSQL_INCLUDE) AC_MSG_CHECKING(for mSQL support) AC_ARG_WITH(msql, -[ --with-msql[=DIR] Include mSQL support. DIR is the mSQL base - install directory, defaults to /usr/local/Hughes.], +[ --with-msql[=DIR] Include mSQL support. DIR is the mSQL base + install directory, defaults to /usr/local/Hughes.], [ if test "$withval" != "no"; then if test "$have_db" = "yes"; then - AC_MSG_RESULT(error) - AC_MSG_ERROR("You can configure for only one database."); + AC_MSG_RESULT(error) + AC_MSG_ERROR("You can configure for only one database."); fi if test "$withval" = "yes"; then - MSQL_INCDIR=/usr/local/Hughes/include - MSQL_LIBDIR=/usr/local/Hughes/lib + MSQL_INCDIR=/usr/local/Hughes/include + MSQL_LIBDIR=/usr/local/Hughes/lib else - MSQL_INCDIR=$withval/include - MSQL_LIBDIR=$withval/lib + MSQL_INCDIR=$withval/include + MSQL_LIBDIR=$withval/lib fi MSQL_INCLUDE=-I$MSQL_INCDIR MSQL_LFLAGS="-L$MSQL_LIBDIR -lmsql" @@ -675,7 +675,7 @@ AC_ARG_WITH(msql, AC_MSG_RESULT(yes) have_db=yes else - AC_MSG_RESULT(no) + AC_MSG_RESULT(no) fi ],[ AC_MSG_RESULT(no) @@ -686,36 +686,36 @@ AC_SUBST(MSQL_INCLUDE) AC_MSG_CHECKING(for iODBC support) AC_ARG_WITH(iodbc, -[ --with-iodbc[=DIR] Include iODBC support. DIR is the iODBC base - install directory, defaults to /usr/local.], +[ --with-iodbc[=DIR] Include iODBC support. DIR is the iODBC base + install directory, defaults to /usr/local.], [ - if test "$withval" != "no"; then - if test "$have_db" = "yes"; then - AC_MSG_RESULT(error) - AC_MSG_ERROR("You can configure for only one database."); - fi - fi - - if test "$withval" = "yes"; then - withval=/usr/local - fi - - if test "$withval" != "no"; then - if test -f $withval/include/isql.h; then - IODBC_INCDIR=$withval/include - IODBC_LIBDIR=$withval/lib - else - AC_MSG_RESULT(no) - AC_MSG_ERROR(Invalid iODBC directory - unable to find isql.h) - fi - IODBC_LFLAGS="-L$IODBC_LIBDIR -liodbc" - IODBC_INCLUDE=-I$IODBC_INCDIR - AC_DEFINE(HAVE_IODBC) - AC_MSG_RESULT(yes) - have_db=yes - fi + if test "$withval" != "no"; then + if test "$have_db" = "yes"; then + AC_MSG_RESULT(error) + AC_MSG_ERROR("You can configure for only one database."); + fi + fi + + if test "$withval" = "yes"; then + withval=/usr/local + fi + + if test "$withval" != "no"; then + if test -f $withval/include/isql.h; then + IODBC_INCDIR=$withval/include + IODBC_LIBDIR=$withval/lib + else + AC_MSG_RESULT(no) + AC_MSG_ERROR(Invalid iODBC directory - unable to find isql.h) + fi + IODBC_LFLAGS="-L$IODBC_LIBDIR -liodbc" + IODBC_INCLUDE=-I$IODBC_INCDIR + AC_DEFINE(HAVE_IODBC) + AC_MSG_RESULT(yes) + have_db=yes + fi ],[ - AC_MSG_RESULT(no) + AC_MSG_RESULT(no) ]) AC_SUBST(IODBC_LFLAGS) AC_SUBST(IODBC_INCLUDE) @@ -724,35 +724,35 @@ AC_SUBST(IODBC_INCLUDE) AC_MSG_CHECKING(for unixODBC support) AC_ARG_WITH(unixODBC, [ --with-unixODBC[=DIR] Include unixODBC support. DIR is the unixODBC base - install directory, defaults to /usr/local.], + install directory, defaults to /usr/local.], [ - if test "$withval" != "no"; then - if test "$have_db" = "yes"; then - AC_MSG_RESULT(error) - AC_MSG_ERROR("You can configure for only one database."); - fi - fi - - if test "$withval" = "yes"; then - withval=/usr/local - fi - - if test "$withval" != "no"; then - if test -f $withval/include/sql.h; then - UNIXODBC_INCDIR=$withval/include - UNIXODBC_LIBDIR=$withval/lib - else - AC_MSG_RESULT(no) - AC_MSG_ERROR(Invalid unixODBC directory - unable to find sql.h) - fi - UNIXODBC_LFLAGS="-L$UNIXODBC_LIBDIR -lodbc" - UNIXODBC_INCLUDE=-I$UNIXODBC_INCDIR - AC_DEFINE(HAVE_UNIXODBC) - AC_MSG_RESULT(yes) - have_db=yes - fi + if test "$withval" != "no"; then + if test "$have_db" = "yes"; then + AC_MSG_RESULT(error) + AC_MSG_ERROR("You can configure for only one database."); + fi + fi + + if test "$withval" = "yes"; then + withval=/usr/local + fi + + if test "$withval" != "no"; then + if test -f $withval/include/sql.h; then + UNIXODBC_INCDIR=$withval/include + UNIXODBC_LIBDIR=$withval/lib + else + AC_MSG_RESULT(no) + AC_MSG_ERROR(Invalid unixODBC directory - unable to find sql.h) + fi + UNIXODBC_LFLAGS="-L$UNIXODBC_LIBDIR -lodbc" + UNIXODBC_INCLUDE=-I$UNIXODBC_INCDIR + AC_DEFINE(HAVE_UNIXODBC) + AC_MSG_RESULT(yes) + have_db=yes + fi ],[ - AC_MSG_RESULT(no) + AC_MSG_RESULT(no) ]) AC_SUBST(UNIXODBC_LFLAGS) AC_SUBST(UNIXODBC_INCLUDE) @@ -760,36 +760,36 @@ AC_SUBST(UNIXODBC_INCLUDE) AC_MSG_CHECKING(for Solid support) AC_ARG_WITH(solid, -[ --with-solid[=DIR] Include Solid support. DIR is the Solid base - install directory, defaults to /usr/local.], +[ --with-solid[=DIR] Include Solid support. DIR is the Solid base + install directory, defaults to /usr/local.], [ - if test "$withval" != "no"; then - if test "$have_db" = "yes"; then - AC_MSG_RESULT(error) - AC_MSG_ERROR("You can configure for only one database."); - fi - fi - - if test "$withval" = "yes"; then - withval=/usr/local - fi - - if test "$withval" != "no"; then - if test -f $withval/include/cli0cli.h; then - SOLID_INCDIR=$withval/include - SOLID_LIBDIR=$withval/lib - else - AC_MSG_RESULT(no) - AC_MSG_ERROR(Invalid Solid directory - unable to find cli0cli.h) - fi - SOLID_LFLAGS="-L$SOLID_LIBDIR -lsolcli" - SOLID_INCLUDE="-I$SOLID_INCDIR" - AC_DEFINE(HAVE_SOLID) - AC_MSG_RESULT(yes) - have_db=yes - fi + if test "$withval" != "no"; then + if test "$have_db" = "yes"; then + AC_MSG_RESULT(error) + AC_MSG_ERROR("You can configure for only one database."); + fi + fi + + if test "$withval" = "yes"; then + withval=/usr/local + fi + + if test "$withval" != "no"; then + if test -f $withval/include/cli0cli.h; then + SOLID_INCDIR=$withval/include + SOLID_LIBDIR=$withval/lib + else + AC_MSG_RESULT(no) + AC_MSG_ERROR(Invalid Solid directory - unable to find cli0cli.h) + fi + SOLID_LFLAGS="-L$SOLID_LIBDIR -lsolcli" + SOLID_INCLUDE="-I$SOLID_INCDIR" + AC_DEFINE(HAVE_SOLID) + AC_MSG_RESULT(yes) + have_db=yes + fi ],[ - AC_MSG_RESULT(no) + AC_MSG_RESULT(no) ]) AC_SUBST(SOLID_LFLAGS) AC_SUBST(SOLID_INCLUDE) @@ -797,41 +797,41 @@ AC_SUBST(SOLID_INCLUDE) AC_MSG_CHECKING(for OpenLink ODBC support) AC_ARG_WITH(openlink, [ --with-openlink[=DIR] Include OpenLink ODBC support. - DIR is the base OpenLink ODBC install directory], + DIR is the base OpenLink ODBC install directory], [ if test "$withval" != "no"; then - if test "$withval" = "yes"; then - - if test "$have_db" = "yes"; then - AC_MSG_RESULT(error) - AC_MSG_ERROR("You can configure for only one database."); - fi - - if test -f /usr/local/virtuoso-ent/odbcsdk/include/isql.h; then - VIRT_INCDIR=/usr/local/virtuoso-ent/odbcsdk/include/ - VIRT_LIBDIR=/usr/local/virtuoso-ent/odbcsdk/lib/ - elif test -f /usr/local/virtuoso-lite/odbcsdk/include/isql.h; then - VIRT_INCDIR=/usr/local/virtuoso-lite/odbcsdk/include/ - VIRT_LIBDIR=/usr/local/virtuoso-lite/odbcsdk/lib/ - elif test -f /usr/local/virtuoso/odbcsdk/include/isql.h; then - VIRT_INCDIR=/usr/local/virtuoso/odbcsdk/include/ - VIRT_LIBDIR=/usr/local/virtuoso/odbcsdk/lib/ - else - AC_MSG_RESULT(no) - AC_MSG_ERROR(Invalid OpenLink ODBC directory - unable to find isql.h) - fi - else - if test -f $withval/odbcsdk/include/isql.h; then - VIRT_INCDIR=$withval/odbcsdk/include/ - VIRT_LIBDIR=$withval/odbcsdk/lib/ - elif test -f $withval/include/isql.h; then - VIRT_INCDIR=$withval/include/ - VIRT_LIBDIR=$withval/lib/ - else - AC_MSG_RESULT(no) - AC_MSG_ERROR(Invalid OpenLink ODBC directory - unable to find isql.h under $withval) - fi - fi + if test "$withval" = "yes"; then + + if test "$have_db" = "yes"; then + AC_MSG_RESULT(error) + AC_MSG_ERROR("You can configure for only one database."); + fi + + if test -f /usr/local/virtuoso-ent/odbcsdk/include/isql.h; then + VIRT_INCDIR=/usr/local/virtuoso-ent/odbcsdk/include/ + VIRT_LIBDIR=/usr/local/virtuoso-ent/odbcsdk/lib/ + elif test -f /usr/local/virtuoso-lite/odbcsdk/include/isql.h; then + VIRT_INCDIR=/usr/local/virtuoso-lite/odbcsdk/include/ + VIRT_LIBDIR=/usr/local/virtuoso-lite/odbcsdk/lib/ + elif test -f /usr/local/virtuoso/odbcsdk/include/isql.h; then + VIRT_INCDIR=/usr/local/virtuoso/odbcsdk/include/ + VIRT_LIBDIR=/usr/local/virtuoso/odbcsdk/lib/ + else + AC_MSG_RESULT(no) + AC_MSG_ERROR(Invalid OpenLink ODBC directory - unable to find isql.h) + fi + else + if test -f $withval/odbcsdk/include/isql.h; then + VIRT_INCDIR=$withval/odbcsdk/include/ + VIRT_LIBDIR=$withval/odbcsdk/lib/ + elif test -f $withval/include/isql.h; then + VIRT_INCDIR=$withval/include/ + VIRT_LIBDIR=$withval/lib/ + else + AC_MSG_RESULT(no) + AC_MSG_ERROR(Invalid OpenLink ODBC directory - unable to find isql.h under $withval) + fi + fi VIRT_INCLUDE=-I$VIRT_INCDIR VIRT_LFLAGS="-L$VIRT_LIBDIR -liodbc" @@ -840,7 +840,7 @@ AC_ARG_WITH(openlink, have_db=yes else - AC_MSG_RESULT(no) + AC_MSG_RESULT(no) fi ],[ AC_MSG_RESULT(no) @@ -852,32 +852,32 @@ AC_SUBST(VIRT_INCLUDE) AC_MSG_CHECKING(for EasySoft ODBC support) AC_ARG_WITH(easysoft, [ --with-easysoft[=DIR] Include EasySoft ODBC support. - DIR is the base EasySoft ODBC install directory], + DIR is the base EasySoft ODBC install directory], [ if test "$withval" != "no"; then - if test "$withval" = "yes"; then - - if test "$have_db" = "yes"; then - AC_MSG_RESULT(error) - AC_MSG_ERROR("You can configure for only one database."); - fi - - if test -f /usr/local/easysoft/oob/client/include/sql.h; then - EASYSOFT_INCDIR=/usr/local/easysoft/oob/client/include/ - EASYSOFT_LFLAGS="-L/usr/local/easysoft/oob/client/lib/ -L/usr/local/easysoft/lib" - else - AC_MSG_RESULT(no) - AC_MSG_ERROR(Invalid EasySoft ODBC directory - unable to find sql.h) - fi - else - if test -f $withval/easysoft/oob/client/include/sql.h; then - EASYSOFT_INCDIR=$withval/easysoft/oob/client/include/ - EASYSOFT_LFLAGS="-L$withval/easysoft/oob/client/lib/ -L$withval/easysoft/lib" - else - AC_MSG_RESULT(no) - AC_MSG_ERROR(Invalid EasySoft ODBC directory - unable to find sql.h under $withval) - fi - fi + if test "$withval" = "yes"; then + + if test "$have_db" = "yes"; then + AC_MSG_RESULT(error) + AC_MSG_ERROR("You can configure for only one database."); + fi + + if test -f /usr/local/easysoft/oob/client/include/sql.h; then + EASYSOFT_INCDIR=/usr/local/easysoft/oob/client/include/ + EASYSOFT_LFLAGS="-L/usr/local/easysoft/oob/client/lib/ -L/usr/local/easysoft/lib" + else + AC_MSG_RESULT(no) + AC_MSG_ERROR(Invalid EasySoft ODBC directory - unable to find sql.h) + fi + else + if test -f $withval/easysoft/oob/client/include/sql.h; then + EASYSOFT_INCDIR=$withval/easysoft/oob/client/include/ + EASYSOFT_LFLAGS="-L$withval/easysoft/oob/client/lib/ -L$withval/easysoft/lib" + else + AC_MSG_RESULT(no) + AC_MSG_ERROR(Invalid EasySoft ODBC directory - unable to find sql.h under $withval) + fi + fi EASYSOFT_INCLUDE=-I$EASYSOFT_INCDIR EASYSOFT_LFLAGS="$EASYSOFT_LFLAGS -lesoobclient -lesrpc -lsupport -lextra" @@ -886,7 +886,7 @@ AC_ARG_WITH(easysoft, have_db=yes else - AC_MSG_RESULT(no) + AC_MSG_RESULT(no) fi ],[ AC_MSG_RESULT(no) @@ -898,36 +898,36 @@ AC_SUBST(EASYSOFT_INCLUDE) AC_MSG_CHECKING(for InterBase support) AC_ARG_WITH(ibase, -[ --with-ibase[=DIR] Include InterBase support. DIR is the InterBase - install directory, defaults to /usr/interbase.], +[ --with-ibase[=DIR] Include InterBase support. DIR is the InterBase + install directory, defaults to /usr/interbase.], [ - if test "$withval" != "no"; then - if test "$have_db" = "yes"; then - AC_MSG_RESULT(error) - AC_MSG_ERROR("You can configure for only one database."); - fi - fi - - if test "$withval" = "yes"; then - withval=/usr/interbase - fi - - if test "$withval" != "no"; then - if test -f $withval/include/ibase.h; then - IBASE_INCDIR=$withval/include - IBASE_LIBDIR=$withval/lib - else - AC_MSG_RESULT(no) - AC_MSG_ERROR(Invalid InterBase directory - unable to find ibase.h) - fi - IBASE_LFLAGS="-L$IBASE_LIBDIR -lgds" - IBASE_INCLUDE=-I$IBASE_INCDIR - AC_DEFINE(HAVE_IBASE) - AC_MSG_RESULT(yes) - have_db=yes - fi + if test "$withval" != "no"; then + if test "$have_db" = "yes"; then + AC_MSG_RESULT(error) + AC_MSG_ERROR("You can configure for only one database."); + fi + fi + + if test "$withval" = "yes"; then + withval=/usr/interbase + fi + + if test "$withval" != "no"; then + if test -f $withval/include/ibase.h; then + IBASE_INCDIR=$withval/include + IBASE_LIBDIR=$withval/lib + else + AC_MSG_RESULT(no) + AC_MSG_ERROR(Invalid InterBase directory - unable to find ibase.h) + fi + IBASE_LFLAGS="-L$IBASE_LIBDIR -lgds" + IBASE_INCLUDE=-I$IBASE_INCDIR + AC_DEFINE(HAVE_IBASE) + AC_MSG_RESULT(yes) + have_db=yes + fi ],[ - AC_MSG_RESULT(no) + AC_MSG_RESULT(no) ]) AC_SUBST(IBASE_LFLAGS) AC_SUBST(IBASE_INCLUDE) @@ -935,43 +935,43 @@ AC_SUBST(IBASE_INCLUDE) AC_MSG_CHECKING(for Oracle8 support) AC_ARG_WITH(oracle8, [ --with-oracle8[=DIR] Include Oracle8 support. DIR is the Oracle - home directory, defaults to $ORACLE_HOME or - /oracle8/app/oracle/product/8.0.5.], + home directory, defaults to $ORACLE_HOME or + /oracle8/app/oracle/product/8.0.5.], [ - if test "$withval" != "no"; then - if test "$have_db" = "yes"; then - AC_MSG_RESULT(error) - AC_MSG_ERROR("You can configure for only one database."); - fi - fi - - if test "$withval" = "yes"; then - withval="$ORACLE_HOME" - if test "$withval" = ""; then - withval=/oracle8/app/oracle/product/8.0.5 - fi - fi - - if test "$withval" != "no"; then - if test -f $withval/rdbms/demo/oci.h; then - ORACLE8_INCDIR1=$withval/rdbms/demo/ - ORACLE8_INCDIR2=$withval/rdbms/public/: - ORACLE8_INCDIR3=$withval/network/public/ - ORACLE8_INCDIR4=$withval/plsql/public/ - ORACLE8_LIBDIR1=$withval/lib - ORACLE8_LIBDIR2=$withval/rdbms/lib - else - AC_MSG_RESULT(no) - AC_MSG_ERROR(Invalid ORACLE directory - unable to find oci.h) - fi - ORACLE8_LFLAGS="-L$ORACLE8_LIBDIR1 -L$ORACLE8_LIBDIR2 $withval/lib/libclntsh.so -lmm -lepc -lclient -lvsn -lcommon -lgeneric -lcore4 -lnlsrtl3 -lnsl -lm -ldl -lnetv2 -lnttcp -lnetwork -lncr -lsql" - ORACLE8_INCLUDE="-I$ORACLE8_INCDIR1 -I$ORACLE8_INCDIR2 -I$ORACLE8_INCDIR3 -I$ORACLE8_INCDIR4" - AC_DEFINE(HAVE_ORACLE8) - AC_MSG_RESULT(yes) - have_db=yes - fi + if test "$withval" != "no"; then + if test "$have_db" = "yes"; then + AC_MSG_RESULT(error) + AC_MSG_ERROR("You can configure for only one database."); + fi + fi + + if test "$withval" = "yes"; then + withval="$ORACLE_HOME" + if test "$withval" = ""; then + withval=/oracle8/app/oracle/product/8.0.5 + fi + fi + + if test "$withval" != "no"; then + if test -f $withval/rdbms/demo/oci.h; then + ORACLE8_INCDIR1=$withval/rdbms/demo/ + ORACLE8_INCDIR2=$withval/rdbms/public/: + ORACLE8_INCDIR3=$withval/network/public/ + ORACLE8_INCDIR4=$withval/plsql/public/ + ORACLE8_LIBDIR1=$withval/lib + ORACLE8_LIBDIR2=$withval/rdbms/lib + else + AC_MSG_RESULT(no) + AC_MSG_ERROR(Invalid ORACLE directory - unable to find oci.h) + fi + ORACLE8_LFLAGS="-L$ORACLE8_LIBDIR1 -L$ORACLE8_LIBDIR2 $withval/lib/libclntsh.so -lmm -lepc -lclient -lvsn -lcommon -lgeneric -lcore4 -lnlsrtl3 -lnsl -lm -ldl -lnetv2 -lnttcp -lnetwork -lncr -lsql" + ORACLE8_INCLUDE="-I$ORACLE8_INCDIR1 -I$ORACLE8_INCDIR2 -I$ORACLE8_INCDIR3 -I$ORACLE8_INCDIR4" + AC_DEFINE(HAVE_ORACLE8) + AC_MSG_RESULT(yes) + have_db=yes + fi ],[ - AC_MSG_RESULT(no) + AC_MSG_RESULT(no) ]) AC_SUBST(ORACLE8_LFLAGS) AC_SUBST(ORACLE8_INCLUDE) @@ -979,54 +979,54 @@ AC_SUBST(ORACLE8_INCLUDE) AC_MSG_CHECKING(for Oracle7 support) AC_ARG_WITH(oracle7, -[ --with-oracle7[=DIR] Include Oracle 7.3 support. DIR is the Oracle - home directory, defaults to - ORACLE_HOME [$ORACLE_HOME]], +[ --with-oracle7[=DIR] Include Oracle 7.3 support. DIR is the Oracle + home directory, defaults to + ORACLE_HOME [$ORACLE_HOME]], [ - if test "$withval" != "no"; then - if test "$have_db" = "yes"; then - AC_MSG_RESULT(error) - AC_MSG_ERROR("You can configure for only one database."); - fi - fi - - if test "$withval" = "yes"; then - withval="$ORACLE_HOME" - fi - - if test "$withval" != "no"; then - if test -f $withval/rdbms/demo/ocidfn.h; then - ORACLE7_INCDIR=$withval/rdbms/demo/ - ORACLE7_LIBDIR1=$withval/lib - ORACLE7_LIBDIR2=$withval/rdbms/lib - else - AC_MSG_RESULT(no) - AC_MSG_ERROR(Invalid ORACLE directory - unable to find ocidfn.h) - fi - - ORACLEINST_TOP=$withval - if test -f "$ORACLEINST_TOP/rdbms/lib/sysliblist" - then - ORA_SYSLIB="`cat $ORACLEINST_TOP/rdbms/lib/sysliblist`" - elif test -f "$ORACLEINST_TOP/lib/sysliblist" - then - ORA_SYSLIB="`cat $ORACLEINST_TOP/lib/sysliblist`" - else - ORA_SYSLIB="-lm" - fi - - ORACLE7_LFLAGS="-L$ORACLE7_LIBDIR1 -L$ORACLE7_LIBDIR2 \ - -lclient -lsqlnet -lncr -lsqlnet -lclient -lcommon \ - -lgeneric -lsqlnet -lncr -lsqlnet -lclient -lcommon -lgeneric \ - -lepc -lnlsrtl3 -lc3v6 -lcore3 -lnlsrtl3 -lcore3 -lnlsrtl3 \ - $ORA_SYSLIB -lcore3 $ORA_SYSLIB" - ORACLE7_INCLUDE="-I$ORACLE7_INCDIR " - AC_DEFINE(HAVE_ORACLE7) - AC_MSG_RESULT(yes) - have_db=yes - fi + if test "$withval" != "no"; then + if test "$have_db" = "yes"; then + AC_MSG_RESULT(error) + AC_MSG_ERROR("You can configure for only one database."); + fi + fi + + if test "$withval" = "yes"; then + withval="$ORACLE_HOME" + fi + + if test "$withval" != "no"; then + if test -f $withval/rdbms/demo/ocidfn.h; then + ORACLE7_INCDIR=$withval/rdbms/demo/ + ORACLE7_LIBDIR1=$withval/lib + ORACLE7_LIBDIR2=$withval/rdbms/lib + else + AC_MSG_RESULT(no) + AC_MSG_ERROR(Invalid ORACLE directory - unable to find ocidfn.h) + fi + + ORACLEINST_TOP=$withval + if test -f "$ORACLEINST_TOP/rdbms/lib/sysliblist" + then + ORA_SYSLIB="`cat $ORACLEINST_TOP/rdbms/lib/sysliblist`" + elif test -f "$ORACLEINST_TOP/lib/sysliblist" + then + ORA_SYSLIB="`cat $ORACLEINST_TOP/lib/sysliblist`" + else + ORA_SYSLIB="-lm" + fi + + ORACLE7_LFLAGS="-L$ORACLE7_LIBDIR1 -L$ORACLE7_LIBDIR2 \ + -lclient -lsqlnet -lncr -lsqlnet -lclient -lcommon \ + -lgeneric -lsqlnet -lncr -lsqlnet -lclient -lcommon -lgeneric \ + -lepc -lnlsrtl3 -lc3v6 -lcore3 -lnlsrtl3 -lcore3 -lnlsrtl3 \ + $ORA_SYSLIB -lcore3 $ORA_SYSLIB" + ORACLE7_INCLUDE="-I$ORACLE7_INCDIR " + AC_DEFINE(HAVE_ORACLE7) + AC_MSG_RESULT(yes) + have_db=yes + fi ],[ - AC_MSG_RESULT(no) + AC_MSG_RESULT(no) ]) AC_SUBST(ORACLE7_LFLAGS) AC_SUBST(ORACLE7_INCLUDE) @@ -1035,11 +1035,11 @@ AC_SUBST(ORACLE7_INCLUDE) dnl AM_ACLOCAL_INCLUDE(macrodir) AC_DEFUN([AM_ACLOCAL_INCLUDE], [ - AM_CONDITIONAL(INSIDE_GNOME_COMMON, false) + AM_CONDITIONAL(INSIDE_GNOME_COMMON, false) - test -n "$ACLOCAL_FLAGS" && ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" + test -n "$ACLOCAL_FLAGS" && ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" - for k in $1 ; do ACLOCAL="$ACLOCAL -I $k" ; done + for k in $1 ; do ACLOCAL="$ACLOCAL -I $k" ; done ]) dnl @@ -1050,119 +1050,119 @@ dnl is not found. dnl AC_DEFUN([GNOME_INIT_HOOK],[ - AC_SUBST(GNOME_LIBS) - AC_SUBST(GNOMEUI_LIBS) - AC_SUBST(GNOMEGNORBA_LIBS) - AC_SUBST(GTKXMHTML_LIBS) - AC_SUBST(ZVT_LIBS) - AC_SUBST(GNOME_LIBDIR) - AC_SUBST(GNOME_INCLUDEDIR) - - AC_ARG_WITH(gnome-includes, - [ --with-gnome-includes Specify location of GNOME headers],[ - CFLAGS="$CFLAGS -I$withval" - ]) - - AC_ARG_WITH(gnome-libs, - [ --with-gnome-libs Specify location of GNOME libs],[ - LDFLAGS="$LDFLAGS -L$withval" - gnome_prefix=$withval - ]) - - AC_ARG_WITH(gnome, - [ --with-gnome Specify prefix for GNOME files], - if test x$withval = xyes; then - want_gnome=yes - dnl Note that an empty true branch is not - dnl valid sh syntax. - ifelse([$1], [], :, [$1]) - else - if test "x$withval" = xno; then - want_gnome=no - else - want_gnome=yes - LDFLAGS="$LDFLAGS -L$withval/lib" - CFLAGS="$CFLAGS -I$withval/include" - gnome_prefix=$withval/lib - fi - fi, - want_gnome=yes) - - if test "x$want_gnome" = xyes; then - - AC_PATH_PROG(GNOME_CONFIG,gnome-config,no) - if test "$GNOME_CONFIG" = "no"; then - no_gnome_config="yes" - else - AC_MSG_CHECKING(if $GNOME_CONFIG works) - if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then - AC_MSG_RESULT(yes) - GNOME_GNORBA_HOOK([],$2) - GNOME_LIBS="`$GNOME_CONFIG --libs-only-l gnome`" - GNOMEUI_LIBS="`$GNOME_CONFIG --libs-only-l gnomeui`" - GNOMEGNORBA_LIBS="`$GNOME_CONFIG --libs-only-l gnorba gnomeui`" - GTKXMHTML_LIBS="`$GNOME_CONFIG --libs-only-l gtkxmhtml`" - ZVT_LIBS="`$GNOME_CONFIG --libs-only-l zvt`" - GNOME_LIBDIR="`$GNOME_CONFIG --libs-only-L gnorba gnomeui`" - GNOME_INCLUDEDIR="`$GNOME_CONFIG --cflags gnorba gnomeui`" - $1 - else - AC_MSG_RESULT(no) - no_gnome_config="yes" - fi - fi - - if test x$exec_prefix = xNONE; then - if test x$prefix = xNONE; then - gnome_prefix=$ac_default_prefix/lib - else - gnome_prefix=$prefix/lib - fi - else - gnome_prefix=`eval echo \`echo $libdir\`` - fi - - if test "$no_gnome_config" = "yes"; then - AC_MSG_CHECKING(for gnomeConf.sh file in $gnome_prefix) - if test -f $gnome_prefix/gnomeConf.sh; then - AC_MSG_RESULT(found) - echo "loading gnome configuration from" \ - "$gnome_prefix/gnomeConf.sh" - . $gnome_prefix/gnomeConf.sh - $1 - else - AC_MSG_RESULT(not found) - if test x$2 = xfail; then - AC_MSG_ERROR(Could not find the gnomeConf.sh file that is generated by gnome-libs install) - fi - fi - fi - fi - - if test -n "$3"; then - n="$3" - for i in $n; do - AC_MSG_CHECKING(extra library \"$i\") - case $i in - applets) - AC_SUBST(GNOME_APPLETS_LIBS) - GNOME_APPLETS_LIBS=`$GNOME_CONFIG --libs-only-l applets` - AC_MSG_RESULT($GNOME_APPLETS_LIBS);; - docklets) - AC_SUBST(GNOME_DOCKLETS_LIBS) - GNOME_DOCKLETS_LIBS=`$GNOME_CONFIG --libs-only-l docklets` - AC_MSG_RESULT($GNOME_DOCKLETS_LIBS);; - capplet) - AC_SUBST(GNOME_CAPPLET_LIBS) - GNOME_CAPPLET_LIBS=`$GNOME_CONFIG --libs-only-l capplet` - AC_MSG_RESULT($GNOME_CAPPLET_LIBS);; - *) - AC_MSG_RESULT(unknown library) - esac - EXTRA_INCLUDEDIR=`$GNOME_CONFIG --cflags $i` - GNOME_INCLUDEDIR="$GNOME_INCLUDEDIR $EXTRA_INCLUDEDIR" - done - fi + AC_SUBST(GNOME_LIBS) + AC_SUBST(GNOMEUI_LIBS) + AC_SUBST(GNOMEGNORBA_LIBS) + AC_SUBST(GTKXMHTML_LIBS) + AC_SUBST(ZVT_LIBS) + AC_SUBST(GNOME_LIBDIR) + AC_SUBST(GNOME_INCLUDEDIR) + + AC_ARG_WITH(gnome-includes, + [ --with-gnome-includes Specify location of GNOME headers],[ + CFLAGS="$CFLAGS -I$withval" + ]) + + AC_ARG_WITH(gnome-libs, + [ --with-gnome-libs Specify location of GNOME libs],[ + LDFLAGS="$LDFLAGS -L$withval" + gnome_prefix=$withval + ]) + + AC_ARG_WITH(gnome, + [ --with-gnome Specify prefix for GNOME files], + if test x$withval = xyes; then + want_gnome=yes + dnl Note that an empty true branch is not + dnl valid sh syntax. + ifelse([$1], [], :, [$1]) + else + if test "x$withval" = xno; then + want_gnome=no + else + want_gnome=yes + LDFLAGS="$LDFLAGS -L$withval/lib" + CFLAGS="$CFLAGS -I$withval/include" + gnome_prefix=$withval/lib + fi + fi, + want_gnome=yes) + + if test "x$want_gnome" = xyes; then + + AC_PATH_PROG(GNOME_CONFIG,gnome-config,no) + if test "$GNOME_CONFIG" = "no"; then + no_gnome_config="yes" + else + AC_MSG_CHECKING(if $GNOME_CONFIG works) + if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then + AC_MSG_RESULT(yes) + GNOME_GNORBA_HOOK([],$2) + GNOME_LIBS="`$GNOME_CONFIG --libs-only-l gnome`" + GNOMEUI_LIBS="`$GNOME_CONFIG --libs-only-l gnomeui`" + GNOMEGNORBA_LIBS="`$GNOME_CONFIG --libs-only-l gnorba gnomeui`" + GTKXMHTML_LIBS="`$GNOME_CONFIG --libs-only-l gtkxmhtml`" + ZVT_LIBS="`$GNOME_CONFIG --libs-only-l zvt`" + GNOME_LIBDIR="`$GNOME_CONFIG --libs-only-L gnorba gnomeui`" + GNOME_INCLUDEDIR="`$GNOME_CONFIG --cflags gnorba gnomeui`" + $1 + else + AC_MSG_RESULT(no) + no_gnome_config="yes" + fi + fi + + if test x$exec_prefix = xNONE; then + if test x$prefix = xNONE; then + gnome_prefix=$ac_default_prefix/lib + else + gnome_prefix=$prefix/lib + fi + else + gnome_prefix=`eval echo \`echo $libdir\`` + fi + + if test "$no_gnome_config" = "yes"; then + AC_MSG_CHECKING(for gnomeConf.sh file in $gnome_prefix) + if test -f $gnome_prefix/gnomeConf.sh; then + AC_MSG_RESULT(found) + echo "loading gnome configuration from" \ + "$gnome_prefix/gnomeConf.sh" + . $gnome_prefix/gnomeConf.sh + $1 + else + AC_MSG_RESULT(not found) + if test x$2 = xfail; then + AC_MSG_ERROR(Could not find the gnomeConf.sh file that is generated by gnome-libs install) + fi + fi + fi + fi + + if test -n "$3"; then + n="$3" + for i in $n; do + AC_MSG_CHECKING(extra library \"$i\") + case $i in + applets) + AC_SUBST(GNOME_APPLETS_LIBS) + GNOME_APPLETS_LIBS=`$GNOME_CONFIG --libs-only-l applets` + AC_MSG_RESULT($GNOME_APPLETS_LIBS);; + docklets) + AC_SUBST(GNOME_DOCKLETS_LIBS) + GNOME_DOCKLETS_LIBS=`$GNOME_CONFIG --libs-only-l docklets` + AC_MSG_RESULT($GNOME_DOCKLETS_LIBS);; + capplet) + AC_SUBST(GNOME_CAPPLET_LIBS) + GNOME_CAPPLET_LIBS=`$GNOME_CONFIG --libs-only-l capplet` + AC_MSG_RESULT($GNOME_CAPPLET_LIBS);; + *) + AC_MSG_RESULT(unknown library) + esac + EXTRA_INCLUDEDIR=`$GNOME_CONFIG --cflags $i` + GNOME_INCLUDEDIR="$GNOME_INCLUDEDIR $EXTRA_INCLUDEDIR" + done + fi ]) dnl @@ -1170,7 +1170,7 @@ dnl GNOME_INIT ([additional-inits]) dnl AC_DEFUN([GNOME_INIT],[ - GNOME_INIT_HOOK([],fail,$1) + GNOME_INIT_HOOK([],fail,$1) ]) dnl GNOME_X_CHECKS @@ -1178,95 +1178,95 @@ dnl dnl Basic X11 related checks for X11. At the end, the following will be dnl defined/changed: dnl GTK_{CFLAGS,LIBS} From AM_PATH_GTK -dnl CPPFLAGS Will include $X_CFLAGS -dnl GNOME_HAVE_SM `true' or `false' depending on whether session -dnl management is available. It is available if -dnl both -lSM and X11/SM/SMlib.h exist. (Some -dnl Solaris boxes have the library but not the header) -dnl XPM_LIBS -lXpm if Xpm library is present, otherwise "" +dnl CPPFLAGS Will include $X_CFLAGS +dnl GNOME_HAVE_SM `true' or `false' depending on whether session +dnl management is available. It is available if +dnl both -lSM and X11/SM/SMlib.h exist. (Some +dnl Solaris boxes have the library but not the header) +dnl XPM_LIBS -lXpm if Xpm library is present, otherwise "" dnl dnl The following configure cache variables are defined (but not used): dnl gnome_cv_passdown_{x_libs,X_LIBS,X_CFLAGS} dnl AC_DEFUN([GNOME_X_CHECKS], [ - AM_PATH_GTK(1.2.0,,AC_MSG_ERROR(GTK not installed, or gtk-config not in path)) - dnl Hope that GTK_CFLAGS have only -I and -D. Otherwise, we could - dnl test -z "$x_includes" || CPPFLAGS="$CPPFLAGS -I$x_includes" - dnl - dnl Use CPPFLAGS instead of CFLAGS because AC_CHECK_HEADERS uses - dnl CPPFLAGS, not CFLAGS - CPPFLAGS="$CPPFLAGS $GTK_CFLAGS" + AM_PATH_GTK(1.2.0,,AC_MSG_ERROR(GTK not installed, or gtk-config not in path)) + dnl Hope that GTK_CFLAGS have only -I and -D. Otherwise, we could + dnl test -z "$x_includes" || CPPFLAGS="$CPPFLAGS -I$x_includes" + dnl + dnl Use CPPFLAGS instead of CFLAGS because AC_CHECK_HEADERS uses + dnl CPPFLAGS, not CFLAGS + CPPFLAGS="$CPPFLAGS $GTK_CFLAGS" - saved_ldflags="$LDFLAGS" - LDFLAGS="$LDFLAGS $GTK_LIBS" + saved_ldflags="$LDFLAGS" + LDFLAGS="$LDFLAGS $GTK_LIBS" - gnome_cv_passdown_x_libs="$GTK_LIBS" - gnome_cv_passdown_X_LIBS="$GTK_LIBS" - gnome_cv_passdown_X_CFLAGS="$GTK_CFLAGS" - gnome_cv_passdown_GTK_LIBS="$GTK_LIBS" + gnome_cv_passdown_x_libs="$GTK_LIBS" + gnome_cv_passdown_X_LIBS="$GTK_LIBS" + gnome_cv_passdown_X_CFLAGS="$GTK_CFLAGS" + gnome_cv_passdown_GTK_LIBS="$GTK_LIBS" - LDFLAGS="$saved_ldflags $GTK_LIBS" + LDFLAGS="$saved_ldflags $GTK_LIBS" dnl We are requiring GTK >= 1.1.1, which means this will be fine anyhow. - USE_DEVGTK=true - -dnl AC_MSG_CHECKING([whether to use features from (unstable) GTK+ 1.1.x]) -dnl AC_EGREP_CPP(answer_affirmatively, -dnl [#include -dnl #ifdef GTK_HAVE_FEATURES_1_1_0 -dnl answer_affirmatively -dnl #endif -dnl ], dev_gtk=yes, dev_gtk=no) -dnl if test "$dev_gtk" = "yes"; then -dnl USE_DEVGTK=true -dnl fi -dnl AC_MSG_RESULT("$dev_gtk") - - GNOME_HAVE_SM=true - case "$GTK_LIBS" in - *-lSM*) - dnl Already found it. - ;; - *) - dnl Assume that if we have -lSM then we also have -lICE. - AC_CHECK_LIB(SM, SmcSaveYourselfDone, - [GTK_LIBS="-lSM -lICE $GTK_LIBS"],GNOME_HAVE_SM=false, - $x_libs -lICE) - ;; - esac - - if test "$GNOME_HAVE_SM" = true; then - AC_CHECK_HEADERS(X11/SM/SMlib.h,,GNOME_HAVE_SM=false) - fi - - if test "$GNOME_HAVE_SM" = true; then - AC_DEFINE(HAVE_LIBSM) - fi - - XPM_LIBS="" - AC_CHECK_LIB(Xpm, XpmFreeXpmImage, [XPM_LIBS="-lXpm"], , $x_libs) - AC_SUBST(XPM_LIBS) - - AC_REQUIRE([GNOME_PTHREAD_CHECK]) - LDFLAGS="$saved_ldflags" - - AC_PROVIDE([GNOME_X_CHECKS]) + USE_DEVGTK=true + +dnl AC_MSG_CHECKING([whether to use features from (unstable) GTK+ 1.1.x]) +dnl AC_EGREP_CPP(answer_affirmatively, +dnl [#include +dnl #ifdef GTK_HAVE_FEATURES_1_1_0 +dnl answer_affirmatively +dnl #endif +dnl ], dev_gtk=yes, dev_gtk=no) +dnl if test "$dev_gtk" = "yes"; then +dnl USE_DEVGTK=true +dnl fi +dnl AC_MSG_RESULT("$dev_gtk") + + GNOME_HAVE_SM=true + case "$GTK_LIBS" in + *-lSM*) + dnl Already found it. + ;; + *) + dnl Assume that if we have -lSM then we also have -lICE. + AC_CHECK_LIB(SM, SmcSaveYourselfDone, + [GTK_LIBS="-lSM -lICE $GTK_LIBS"],GNOME_HAVE_SM=false, + $x_libs -lICE) + ;; + esac + + if test "$GNOME_HAVE_SM" = true; then + AC_CHECK_HEADERS(X11/SM/SMlib.h,,GNOME_HAVE_SM=false) + fi + + if test "$GNOME_HAVE_SM" = true; then + AC_DEFINE(HAVE_LIBSM) + fi + + XPM_LIBS="" + AC_CHECK_LIB(Xpm, XpmFreeXpmImage, [XPM_LIBS="-lXpm"], , $x_libs) + AC_SUBST(XPM_LIBS) + + AC_REQUIRE([GNOME_PTHREAD_CHECK]) + LDFLAGS="$saved_ldflags" + + AC_PROVIDE([GNOME_X_CHECKS]) ]) AC_DEFUN([GNOME_PTHREAD_CHECK],[ - PTHREAD_LIB="" - AC_CHECK_LIB(pthread, pthread_create, PTHREAD_LIB="-lpthread", - [AC_CHECK_LIB(pthreads, pthread_create, PTHREAD_LIB="-lpthreads", - [AC_CHECK_LIB(c_r, pthread_create, PTHREAD_LIB="-lc_r", - [AC_CHECK_LIB(pthread, __pthread_attr_init_system, PTHREAD_LIB="-lpthread", - [AC_CHECK_FUNC(pthread_create)] - )] - )] - )] - ) - AC_SUBST(PTHREAD_LIB) - AC_PROVIDE([GNOME_PTHREAD_CHECK]) + PTHREAD_LIB="" + AC_CHECK_LIB(pthread, pthread_create, PTHREAD_LIB="-lpthread", + [AC_CHECK_LIB(pthreads, pthread_create, PTHREAD_LIB="-lpthreads", + [AC_CHECK_LIB(c_r, pthread_create, PTHREAD_LIB="-lc_r", + [AC_CHECK_LIB(pthread, __pthread_attr_init_system, PTHREAD_LIB="-lpthread", + [AC_CHECK_FUNC(pthread_create)] + )] + )] + )] + ) + AC_SUBST(PTHREAD_LIB) + AC_PROVIDE([GNOME_PTHREAD_CHECK]) ]) AC_DEFUN(AM_CONDITIONAL, @@ -1287,33 +1287,33 @@ dnl if failflag is "failure" it aborts if gnorba is not found. dnl AC_DEFUN([GNOME_GNORBA_HOOK],[ - GNOME_ORBIT_HOOK([],$2) - AC_CACHE_CHECK([for gnorba libraries],gnome_cv_gnorba_found,[ - gnome_cv_gnorba_found=no - if test x$gnome_cv_orbit_found = xyes; then - GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`" - GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`" - if test -n "$GNORBA_LIBS"; then - gnome_cv_gnorba_found=yes - fi - fi - ]) - AM_CONDITIONAL(HAVE_GNORBA, test x$gnome_cv_gnorba_found = xyes) - if test x$gnome_cv_orbit_found = xyes; then - $1 - GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`" - GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`" - AC_SUBST(GNORBA_CFLAGS) - AC_SUBST(GNORBA_LIBS) - else - if test x$2 = xfailure; then - AC_MSG_ERROR(gnorba library not installed or installation problem) - fi - fi + GNOME_ORBIT_HOOK([],$2) + AC_CACHE_CHECK([for gnorba libraries],gnome_cv_gnorba_found,[ + gnome_cv_gnorba_found=no + if test x$gnome_cv_orbit_found = xyes; then + GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`" + GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`" + if test -n "$GNORBA_LIBS"; then + gnome_cv_gnorba_found=yes + fi + fi + ]) + AM_CONDITIONAL(HAVE_GNORBA, test x$gnome_cv_gnorba_found = xyes) + if test x$gnome_cv_orbit_found = xyes; then + $1 + GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`" + GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`" + AC_SUBST(GNORBA_CFLAGS) + AC_SUBST(GNORBA_LIBS) + else + if test x$2 = xfailure; then + AC_MSG_ERROR(gnorba library not installed or installation problem) + fi + fi ]) AC_DEFUN([GNOME_GNORBA_CHECK], [ - GNOME_GNORBA_HOOK([],failure) + GNOME_GNORBA_HOOK([],failure) ]) dnl @@ -1323,29 +1323,29 @@ dnl if failflag is "failure" it aborts if orbit is not found. dnl AC_DEFUN([GNOME_ORBIT_HOOK],[ - AC_PATH_PROG(ORBIT_CONFIG,orbit-config,no) - AC_PATH_PROG(ORBIT_IDL,orbit-idl,no) - AC_CACHE_CHECK([for working ORBit environment],gnome_cv_orbit_found,[ - if test x$ORBIT_CONFIG = xno -o x$ORBIT_IDL = xno; then - gnome_cv_orbit_found=no - else - gnome_cv_orbit_found=yes - fi - ]) - AM_CONDITIONAL(HAVE_ORBIT, test x$gnome_cv_orbit_found = xyes) - if test x$gnome_cv_orbit_found = xyes; then - $1 - ORBIT_CFLAGS=`orbit-config --cflags client server` - ORBIT_LIBS=`orbit-config --use-service=name --libs client server` - AC_SUBST(ORBIT_CFLAGS) - AC_SUBST(ORBIT_LIBS) - else - if test x$2 = xfailure; then - AC_MSG_ERROR(ORBit not installed or installation problem) - fi - fi + AC_PATH_PROG(ORBIT_CONFIG,orbit-config,no) + AC_PATH_PROG(ORBIT_IDL,orbit-idl,no) + AC_CACHE_CHECK([for working ORBit environment],gnome_cv_orbit_found,[ + if test x$ORBIT_CONFIG = xno -o x$ORBIT_IDL = xno; then + gnome_cv_orbit_found=no + else + gnome_cv_orbit_found=yes + fi + ]) + AM_CONDITIONAL(HAVE_ORBIT, test x$gnome_cv_orbit_found = xyes) + if test x$gnome_cv_orbit_found = xyes; then + $1 + ORBIT_CFLAGS=`orbit-config --cflags client server` + ORBIT_LIBS=`orbit-config --use-service=name --libs client server` + AC_SUBST(ORBIT_CFLAGS) + AC_SUBST(ORBIT_LIBS) + else + if test x$2 = xfailure; then + AC_MSG_ERROR(ORBit not installed or installation problem) + fi + fi ]) AC_DEFUN([GNOME_ORBIT_CHECK], [ - GNOME_ORBIT_HOOK([],failure) + GNOME_ORBIT_HOOK([],failure) ]) diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in index dcdd09d5fd..309c1d823b 100644 --- a/bacula/autoconf/configure.in +++ b/bacula/autoconf/configure.in @@ -757,7 +757,7 @@ AC_EXEEXT dnl See if we can use 64 bit file addresses largefile_support="no" -AC_SYS_LARGEFILE +AC_BAC_LARGEFILE AC_PATH_XTRA diff --git a/bacula/configure b/bacula/configure index a8d4b9bffe..f10f4067bb 100755 --- a/bacula/configure +++ b/bacula/configure @@ -16,9 +16,9 @@ ac_help="$ac_help ac_help="$ac_help --with-gnome-includes Specify location of GNOME headers" ac_help="$ac_help - --with-gnome-libs Specify location of GNOME libs" + --with-gnome-libs Specify location of GNOME libs" ac_help="$ac_help - --with-gnome Specify prefix for GNOME files" + --with-gnome Specify prefix for GNOME files" ac_help="$ac_help --enable-smartalloc enable smartalloc debugging support [disabled]" ac_help="$ac_help @@ -65,23 +65,23 @@ ac_help="$ac_help ac_help="$ac_help Which DBMS do you want to use (please select only one): - --with-mysql[=DIR] Include MySQL support. DIR is the MySQL base - install directory, default is to search through - a number of common places for the MySQL files." + --with-mysql[=DIR] Include MySQL support. DIR is the MySQL base + install directory, default is to search through + a number of common places for the MySQL files." ac_help="$ac_help Which DBMS do you want to use (please select only one): --with-embedded-mysql[=DIR] Include MySQL support. DIR is the MySQL base - install directory, default is to search through - a number of common places for the MySQL files." + install directory, default is to search through + a number of common places for the MySQL files." ac_help="$ac_help Which DBMS do you want to use (please select only one): - --with-sqlite[=DIR] Include SQLite support. DIR is the SQLite base - install directory, default is to search through - a number of common places for the SQLite files." + --with-sqlite[=DIR] Include SQLite support. DIR is the SQLite base + install directory, default is to search through + a number of common places for the SQLite files." ac_help="$ac_help - --disable-largefile omit support for large files" + --disable-largefile omit support for large files" ac_help="$ac_help --with-x use the X Window System" @@ -1884,7 +1884,7 @@ CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes if test $HAVE_UNAME=yes -a x`uname -s` = xSunOS then - + if $TRUEPRG; then HAVE_SUN_OS_TRUE= @@ -1893,12 +1893,12 @@ else HAVE_SUN_OS_TRUE='#' HAVE_SUN_OS_FALSE= fi - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_SUN_OS 1 EOF else - + if $FALSEPRG; then HAVE_SUN_OS_TRUE= @@ -1911,7 +1911,7 @@ fi if test $HAVE_UNAME=yes -a x`uname -s` = xOSF1 then - + if $TRUEPRG; then HAVE_OSF1_OS_TRUE= @@ -1920,12 +1920,12 @@ else HAVE_OSF1_OS_TRUE='#' HAVE_OSF1_OS_FALSE= fi - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_OSF1_OS 1 EOF else - + if $FALSEPRG; then HAVE_OSF1_OS_TRUE= @@ -1938,7 +1938,7 @@ fi if test $HAVE_UNAME=yes -a x`uname -s` = xAIX then - + if $TRUEPRG; then HAVE_AIX_OS_TRUE= @@ -1947,12 +1947,12 @@ else HAVE_AIX_OS_TRUE='#' HAVE_AIX_OS_FALSE= fi - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_AIX_OS 1 EOF else - + if $FALSEPRG; then HAVE_AIX_OS_TRUE= @@ -1965,7 +1965,7 @@ fi if test $HAVE_UNAME=yes -a x`uname -s` = xHP-UX then - + if $TRUEPRG; then HAVE_HPUX_OS_TRUE= @@ -1974,12 +1974,12 @@ else HAVE_HPUX_OS_TRUE='#' HAVE_HPUX_OS_FALSE= fi - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_HPUX_OS 1 EOF else - + if $FALSEPRG; then HAVE_HPUX_OS_TRUE= @@ -1992,7 +1992,7 @@ fi if test $HAVE_UNAME=yes -a x`uname -s` = xLinux then - + if $TRUEPRG; then HAVE_LINUX_OS_TRUE= @@ -2001,12 +2001,12 @@ else HAVE_LINUX_OS_TRUE='#' HAVE_LINUX_OS_FALSE= fi - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_LINUX_OS 1 EOF else - + if $FALSEPRG; then HAVE_LINUX_OS_TRUE= @@ -2019,7 +2019,7 @@ fi if test $HAVE_UNAME=yes -a x`uname -s` = xFreeBSD then - + if $TRUEPRG; then HAVE_FREEBSD_OS_TRUE= @@ -2028,12 +2028,12 @@ else HAVE_FREEBSD_OS_TRUE='#' HAVE_FREEBSD_OS_FALSE= fi - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_FREEBSD_OS 1 EOF else - + if $FALSEPRG; then HAVE_FREEBSD_OS_TRUE= @@ -2046,7 +2046,7 @@ fi if test $HAVE_UNAME=yes -a x`uname -s` = xNetBSD then - + if $TRUEPRG; then HAVE_NETBSD_OS_TRUE= @@ -2055,12 +2055,12 @@ else HAVE_NETBSD_OS_TRUE='#' HAVE_NETBSD_OS_FALSE= fi - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_NETBSD_OS 1 EOF else - + if $FALSEPRG; then HAVE_NETBSD_OS_TRUE= @@ -2073,7 +2073,7 @@ fi if test $HAVE_UNAME=yes -a x`uname -s` = xOpenBSD then - + if $TRUEPRG; then HAVE_OPENBSD_OS_TRUE= @@ -2082,12 +2082,12 @@ else HAVE_OPENBSD_OS_TRUE='#' HAVE_OPENBSD_OS_FALSE= fi - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_OPENBSD_OS 1 EOF else - + if $FALSEPRG; then HAVE_OPENBSD_OS_TRUE= @@ -2100,7 +2100,7 @@ fi if test $HAVE_UNAME=yes -a x`uname -s` = xBSD/OS then - + if $TRUEPRG; then HAVE_BSDI_OS_TRUE= @@ -2109,12 +2109,12 @@ else HAVE_BSDI_OS_TRUE='#' HAVE_BSDI_OS_FALSE= fi - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_BSDI_OS 1 EOF else - + if $FALSEPRG; then HAVE_BSDI_OS_TRUE= @@ -2127,7 +2127,7 @@ fi if test $HAVE_UNAME=yes -a x`uname -s` = xSGI then - + if $TRUEPRG; then HAVE_SGI_OS_TRUE= @@ -2136,12 +2136,12 @@ else HAVE_SGI_OS_TRUE='#' HAVE_SGI_OS_FALSE= fi - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_SGI_OS 1 EOF else - + if $FALSEPRG; then HAVE_SGI_OS_TRUE= @@ -2154,7 +2154,7 @@ fi if test $HAVE_UNAME=yes -a x`uname -s` = xIRIX then - + if $TRUEPRG; then HAVE_IRIX_OS_TRUE= @@ -2163,12 +2163,12 @@ else HAVE_IRIX_OS_TRUE='#' HAVE_IRIX_OS_FALSE= fi - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_IRIX_OS 1 EOF else - + if $FALSEPRG; then HAVE_IRIX_OS_TRUE= @@ -2215,67 +2215,67 @@ echo $ac_n "checking for Operating System Distribution""... $ac_c" 1>&6 echo "configure:2216: checking for Operating System Distribution" >&5 if test "x$DISTNAME" != "x" then - echo "distname set to $DISTNAME" + 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 -d /usr/src/OpenLinux then - DISTNAME=caldera + DISTNAME=caldera 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 "$ac_cv_cygwin" = yes then - DISTNAME=cygwin - cat >> confdefs.h <<\EOF + DISTNAME=cygwin + cat >> confdefs.h <<\EOF #define HAVE_CYGWIN 1 EOF else - DISTNAME=unknown + DISTNAME=unknown fi echo "$ac_t""" "" 1>&6 @@ -2283,7 +2283,7 @@ echo "$ac_t""" "" 1>&6 # ----------------------------------------------------------- # ---------------------------------------------------------- - + if false; then INSIDE_GNOME_COMMON_TRUE= @@ -2293,9 +2293,9 @@ else INSIDE_GNOME_COMMON_FALSE= fi - test -n "$ACLOCAL_FLAGS" && ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" + test -n "$ACLOCAL_FLAGS" && ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" - for k in gnome-macros ; do ACLOCAL="$ACLOCAL -I $k" ; done + for k in gnome-macros ; do ACLOCAL="$ACLOCAL -I $k" ; done # ------------------------------------------------------------------ @@ -2415,58 +2415,58 @@ fi GNOME_DIR= if test x$support_gnome = xyes; then - - - - - - - - - - # Check whether --with-gnome-includes or --without-gnome-includes was given. + + + + + + + + + + # Check whether --with-gnome-includes or --without-gnome-includes was given. if test "${with_gnome_includes+set}" = set; then withval="$with_gnome_includes" - CFLAGS="$CFLAGS -I$withval" - + CFLAGS="$CFLAGS -I$withval" + fi - - # Check whether --with-gnome-libs or --without-gnome-libs was given. + + # Check whether --with-gnome-libs or --without-gnome-libs was given. if test "${with_gnome_libs+set}" = set; then withval="$with_gnome_libs" - LDFLAGS="$LDFLAGS -L$withval" - gnome_prefix=$withval - + LDFLAGS="$LDFLAGS -L$withval" + gnome_prefix=$withval + fi - # Check whether --with-gnome or --without-gnome was given. + # Check whether --with-gnome or --without-gnome was given. if test "${with_gnome+set}" = set; then withval="$with_gnome" if test x$withval = xyes; then - want_gnome=yes - : - else - if test "x$withval" = xno; then - want_gnome=no - else - want_gnome=yes - LDFLAGS="$LDFLAGS -L$withval/lib" - CFLAGS="$CFLAGS -I$withval/include" - gnome_prefix=$withval/lib - fi - fi + want_gnome=yes + : + else + if test "x$withval" = xno; then + want_gnome=no + else + want_gnome=yes + LDFLAGS="$LDFLAGS -L$withval/lib" + CFLAGS="$CFLAGS -I$withval/include" + gnome_prefix=$withval/lib + fi + fi else want_gnome=yes fi - if test "x$want_gnome" = xyes; then + if test "x$want_gnome" = xyes; then - # Extract the first word of "gnome-config", so it can be a program name with args. + # Extract the first word of "gnome-config", so it can be a program name with args. set dummy gnome-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo "configure:2473: checking for $ac_word" >&5 @@ -2502,16 +2502,16 @@ else echo "$ac_t""no" 1>&6 fi - if test "$GNOME_CONFIG" = "no"; then - no_gnome_config="yes" - else - echo $ac_n "checking if $GNOME_CONFIG works""... $ac_c" 1>&6 + if test "$GNOME_CONFIG" = "no"; then + no_gnome_config="yes" + else + echo $ac_n "checking if $GNOME_CONFIG works""... $ac_c" 1>&6 echo "configure:2510: checking if $GNOME_CONFIG works" >&5 - if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then - echo "$ac_t""yes" 1>&6 - - - # Extract the first word of "orbit-config", so it can be a program name with args. + if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then + echo "$ac_t""yes" 1>&6 + + + # Extract the first word of "orbit-config", so it can be a program name with args. set dummy orbit-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo "configure:2518: checking for $ac_word" >&5 @@ -2547,7 +2547,7 @@ else echo "$ac_t""no" 1>&6 fi - # Extract the first word of "orbit-idl", so it can be a program name with args. + # Extract the first word of "orbit-idl", so it can be a program name with args. set dummy orbit-idl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo "configure:2554: checking for $ac_word" >&5 @@ -2583,22 +2583,22 @@ else echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking for working ORBit environment""... $ac_c" 1>&6 + echo $ac_n "checking for working ORBit environment""... $ac_c" 1>&6 echo "configure:2588: checking for working ORBit environment" >&5 if eval "test \"`echo '$''{'gnome_cv_orbit_found'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test x$ORBIT_CONFIG = xno -o x$ORBIT_IDL = xno; then - gnome_cv_orbit_found=no - else - gnome_cv_orbit_found=yes - fi - + if test x$ORBIT_CONFIG = xno -o x$ORBIT_IDL = xno; then + gnome_cv_orbit_found=no + else + gnome_cv_orbit_found=yes + fi + fi echo "$ac_t""$gnome_cv_orbit_found" 1>&6 - + if test x$gnome_cv_orbit_found = xyes; then HAVE_ORBIT_TRUE= @@ -2607,37 +2607,37 @@ else HAVE_ORBIT_TRUE='#' HAVE_ORBIT_FALSE= fi - if test x$gnome_cv_orbit_found = xyes; then - - ORBIT_CFLAGS=`orbit-config --cflags client server` - ORBIT_LIBS=`orbit-config --use-service=name --libs client server` - - - else - if test xfail = xfailure; then - { echo "configure: error: ORBit not installed or installation problem" 1>&2; exit 1; } - fi - fi - - echo $ac_n "checking for gnorba libraries""... $ac_c" 1>&6 + if test x$gnome_cv_orbit_found = xyes; then + + ORBIT_CFLAGS=`orbit-config --cflags client server` + ORBIT_LIBS=`orbit-config --use-service=name --libs client server` + + + else + if test xfail = xfailure; then + { echo "configure: error: ORBit not installed or installation problem" 1>&2; exit 1; } + fi + fi + + echo $ac_n "checking for gnorba libraries""... $ac_c" 1>&6 echo "configure:2624: checking for gnorba libraries" >&5 if eval "test \"`echo '$''{'gnome_cv_gnorba_found'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - gnome_cv_gnorba_found=no - if test x$gnome_cv_orbit_found = xyes; then - GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`" - GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`" - if test -n "$GNORBA_LIBS"; then - gnome_cv_gnorba_found=yes - fi - fi - + gnome_cv_gnorba_found=no + if test x$gnome_cv_orbit_found = xyes; then + GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`" + GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`" + if test -n "$GNORBA_LIBS"; then + gnome_cv_gnorba_found=yes + fi + fi + fi echo "$ac_t""$gnome_cv_gnorba_found" 1>&6 - + if test x$gnome_cv_gnorba_found = xyes; then HAVE_GNORBA_TRUE= @@ -2646,85 +2646,85 @@ else HAVE_GNORBA_TRUE='#' HAVE_GNORBA_FALSE= fi - if test x$gnome_cv_orbit_found = xyes; then - - GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`" - GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`" - - - else - if test xfail = xfailure; then - { echo "configure: error: gnorba library not installed or installation problem" 1>&2; exit 1; } - fi - fi - - GNOME_LIBS="`$GNOME_CONFIG --libs-only-l gnome`" - GNOMEUI_LIBS="`$GNOME_CONFIG --libs-only-l gnomeui`" - GNOMEGNORBA_LIBS="`$GNOME_CONFIG --libs-only-l gnorba gnomeui`" - GTKXMHTML_LIBS="`$GNOME_CONFIG --libs-only-l gtkxmhtml`" - ZVT_LIBS="`$GNOME_CONFIG --libs-only-l zvt`" - GNOME_LIBDIR="`$GNOME_CONFIG --libs-only-L gnorba gnomeui`" - GNOME_INCLUDEDIR="`$GNOME_CONFIG --cflags gnorba gnomeui`" - - else - echo "$ac_t""no" 1>&6 - no_gnome_config="yes" - fi - fi - - if test x$exec_prefix = xNONE; then - if test x$prefix = xNONE; then - gnome_prefix=$ac_default_prefix/lib - else - gnome_prefix=$prefix/lib - fi - else - gnome_prefix=`eval echo \`echo $libdir\`` - fi - - if test "$no_gnome_config" = "yes"; then - echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6 + if test x$gnome_cv_orbit_found = xyes; then + + GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`" + GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`" + + + else + if test xfail = xfailure; then + { echo "configure: error: gnorba library not installed or installation problem" 1>&2; exit 1; } + fi + fi + + GNOME_LIBS="`$GNOME_CONFIG --libs-only-l gnome`" + GNOMEUI_LIBS="`$GNOME_CONFIG --libs-only-l gnomeui`" + GNOMEGNORBA_LIBS="`$GNOME_CONFIG --libs-only-l gnorba gnomeui`" + GTKXMHTML_LIBS="`$GNOME_CONFIG --libs-only-l gtkxmhtml`" + ZVT_LIBS="`$GNOME_CONFIG --libs-only-l zvt`" + GNOME_LIBDIR="`$GNOME_CONFIG --libs-only-L gnorba gnomeui`" + GNOME_INCLUDEDIR="`$GNOME_CONFIG --cflags gnorba gnomeui`" + + else + echo "$ac_t""no" 1>&6 + no_gnome_config="yes" + fi + fi + + if test x$exec_prefix = xNONE; then + if test x$prefix = xNONE; then + gnome_prefix=$ac_default_prefix/lib + else + gnome_prefix=$prefix/lib + fi + else + gnome_prefix=`eval echo \`echo $libdir\`` + fi + + if test "$no_gnome_config" = "yes"; then + echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6 echo "configure:2688: checking for gnomeConf.sh file in $gnome_prefix" >&5 - if test -f $gnome_prefix/gnomeConf.sh; then - echo "$ac_t""found" 1>&6 - echo "loading gnome configuration from" \ - "$gnome_prefix/gnomeConf.sh" - . $gnome_prefix/gnomeConf.sh - - else - echo "$ac_t""not found" 1>&6 - if test xfail = xfail; then - { echo "configure: error: Could not find the gnomeConf.sh file that is generated by gnome-libs install" 1>&2; exit 1; } - fi - fi - fi - fi - - if test -n ""; then - n="" - for i in $n; do - echo $ac_n "checking extra library \"$i\"""... $ac_c" 1>&6 + if test -f $gnome_prefix/gnomeConf.sh; then + echo "$ac_t""found" 1>&6 + echo "loading gnome configuration from" \ + "$gnome_prefix/gnomeConf.sh" + . $gnome_prefix/gnomeConf.sh + + else + echo "$ac_t""not found" 1>&6 + if test xfail = xfail; then + { echo "configure: error: Could not find the gnomeConf.sh file that is generated by gnome-libs install" 1>&2; exit 1; } + fi + fi + fi + fi + + if test -n ""; then + n="" + for i in $n; do + echo $ac_n "checking extra library \"$i\"""... $ac_c" 1>&6 echo "configure:2708: checking extra library \"$i\"" >&5 - case $i in - applets) - - GNOME_APPLETS_LIBS=`$GNOME_CONFIG --libs-only-l applets` - echo "$ac_t""$GNOME_APPLETS_LIBS" 1>&6;; - docklets) - - GNOME_DOCKLETS_LIBS=`$GNOME_CONFIG --libs-only-l docklets` - echo "$ac_t""$GNOME_DOCKLETS_LIBS" 1>&6;; - capplet) - - GNOME_CAPPLET_LIBS=`$GNOME_CONFIG --libs-only-l capplet` - echo "$ac_t""$GNOME_CAPPLET_LIBS" 1>&6;; - *) - echo "$ac_t""unknown library" 1>&6 - esac - EXTRA_INCLUDEDIR=`$GNOME_CONFIG --cflags $i` - GNOME_INCLUDEDIR="$GNOME_INCLUDEDIR $EXTRA_INCLUDEDIR" - done - fi + case $i in + applets) + + GNOME_APPLETS_LIBS=`$GNOME_CONFIG --libs-only-l applets` + echo "$ac_t""$GNOME_APPLETS_LIBS" 1>&6;; + docklets) + + GNOME_DOCKLETS_LIBS=`$GNOME_CONFIG --libs-only-l docklets` + echo "$ac_t""$GNOME_DOCKLETS_LIBS" 1>&6;; + capplet) + + GNOME_CAPPLET_LIBS=`$GNOME_CONFIG --libs-only-l capplet` + echo "$ac_t""$GNOME_CAPPLET_LIBS" 1>&6;; + *) + echo "$ac_t""unknown library" 1>&6 + esac + EXTRA_INCLUDEDIR=`$GNOME_CONFIG --cflags $i` + GNOME_INCLUDEDIR="$GNOME_INCLUDEDIR $EXTRA_INCLUDEDIR" + done + fi GNOME_DIR=src/gnome-console @@ -3867,45 +3867,45 @@ if test "${with_mysql+set}" = set; then withval="$with_mysql" 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 "$ac_t""no" 1>&6 - { echo "configure: error: Unable to find mysql.h in standard locations" 1>&2; exit 1; } - 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 "$ac_t""no" 1>&6 - { echo "configure: error: Invalid MySQL directory $withval - unable to find mysql.h under $withval" 1>&2; exit 1; } - fi - fi + 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 "$ac_t""no" 1>&6 + { echo "configure: error: Unable to find mysql.h in standard locations" 1>&2; exit 1; } + 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 "$ac_t""no" 1>&6 + { echo "configure: error: Invalid MySQL directory $withval - unable to find mysql.h under $withval" 1>&2; exit 1; } + fi + fi SQL_INCLUDE=-I$MYSQL_INCDIR SQL_LFLAGS="-L$MYSQL_LIBDIR -lmysqlclient -lz" SQL_BINDIR=$MYSQL_BINDIR @@ -3921,7 +3921,7 @@ EOF DB_NAME=mysql else - echo "$ac_t""no" 1>&6 + echo "$ac_t""no" 1>&6 fi else @@ -3936,45 +3936,45 @@ if test "${with_embedded_mysql+set}" = set; then withval="$with_embedded_mysql" 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 "$ac_t""no" 1>&6 - { echo "configure: error: Unable to find mysql.h in standard locations" 1>&2; exit 1; } - 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 "$ac_t""no" 1>&6 - { echo "configure: error: Invalid MySQL directory $withval - unable to find mysql.h under $withval" 1>&2; exit 1; } - fi - fi + 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 "$ac_t""no" 1>&6 + { echo "configure: error: Unable to find mysql.h in standard locations" 1>&2; exit 1; } + 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 "$ac_t""no" 1>&6 + { echo "configure: error: Invalid MySQL directory $withval - unable to find mysql.h under $withval" 1>&2; exit 1; } + fi + fi SQL_INCLUDE=-I$MYSQL_INCDIR SQL_LFLAGS="-L$MYSQL_LIBDIR -lmysqld -lz -lm -lcrypt" SQL_BINDIR=$MYSQL_BINDIR @@ -3994,7 +3994,7 @@ EOF DB_NAME=mysql else - echo "$ac_t""no" 1>&6 + echo "$ac_t""no" 1>&6 fi else @@ -4024,29 +4024,29 @@ if test "${with_sqlite+set}" = set; then withval="$with_sqlite" if test "$withval" != "no"; 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 - SQLITE_BINDIR=/usr/local/bin - elif test -f /usr/include/sqlite.h; then - SQLITE_INCDIR=/usr/include - SQLITE_LIBDIR=/usr/lib - SQLITE_BINDIR=/usr/bin - else - echo "$ac_t""no" 1>&6 - { echo "configure: error: Unable to find sqlite.h in standard locations" 1>&2; exit 1; } - fi - else - if test -f $withval/sqlite.h; then - SQLITE_INCDIR=$withval - SQLITE_LIBDIR=$withval - SQLITE_BINDIR=$withval - else - echo "$ac_t""no" 1>&6 - { echo "configure: error: Invalid SQLite directory $withval - unable to find sqlite.h under $withval" 1>&2; exit 1; } - fi - fi + if test "$withval" = "yes"; then + if test -f /usr/local/include/sqlite.h; then + SQLITE_INCDIR=/usr/local/include + SQLITE_LIBDIR=/usr/local/lib + SQLITE_BINDIR=/usr/local/bin + elif test -f /usr/include/sqlite.h; then + SQLITE_INCDIR=/usr/include + SQLITE_LIBDIR=/usr/lib + SQLITE_BINDIR=/usr/bin + else + echo "$ac_t""no" 1>&6 + { echo "configure: error: Unable to find sqlite.h in standard locations" 1>&2; exit 1; } + fi + else + if test -f $withval/sqlite.h; then + SQLITE_INCDIR=$withval + SQLITE_LIBDIR=$withval + SQLITE_BINDIR=$withval + else + echo "$ac_t""no" 1>&6 + { echo "configure: error: Invalid SQLite directory $withval - unable to find sqlite.h under $withval" 1>&2; exit 1; } + fi + fi SQL_INCLUDE=-I$SQLITE_INCDIR SQL_LFLAGS="-L$SQLITE_LIBDIR -lsqlite" SQL_BINDIR=$SQLITE_BINDIR @@ -4062,7 +4062,7 @@ EOF DB_NAME=sqlite else - echo "$ac_t""no" 1>&6 + echo "$ac_t""no" 1>&6 fi else @@ -4227,16 +4227,16 @@ if eval "test \"`echo '$''{'ac_cv_sys_largefile_CFLAGS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_sys_largefile_CFLAGS=`($GETCONF LFS_CFLAGS) 2>/dev/null` || { - ac_cv_sys_largefile_CFLAGS=no - case "$host_os" in - # IRIX 6.2 and later require cc -n32. - irix6.[2-9]* | irix6.1[0-9]* | irix[7-9].* | irix[1-9][0-9]*) - if test "$GCC" != yes; then - ac_cv_sys_largefile_CFLAGS=-n32 - fi - ac_save_CC="$CC" - CC="$CC $ac_cv_sys_largefile_CFLAGS" - cat > conftest.$ac_ext < conftest.$ac_ext <&6 else ac_cv_sys_largefile_LDFLAGS=`($GETCONF LFS_LDFLAGS) 2>/dev/null` || { - ac_cv_sys_largefile_LDFLAGS=no - + ac_cv_sys_largefile_LDFLAGS=no + } fi @@ -4277,8 +4277,8 @@ if eval "test \"`echo '$''{'ac_cv_sys_largefile_LIBS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_sys_largefile_LIBS=`($GETCONF LFS_LIBS) 2>/dev/null` || { - ac_cv_sys_largefile_LIBS=no - + ac_cv_sys_largefile_LIBS=no + } fi @@ -4291,7 +4291,7 @@ echo "$ac_t""$ac_cv_sys_largefile_LIBS" 1>&6 -D_LARGEFILE_SOURCE | -D_LARGEFILE_SOURCE=*) ;; -D_LARGE_FILES | -D_LARGE_FILES=*) ;; -D?* | -I?*) - case "$ac_flag" in + case "$ac_flag" in no) ;; ?*) case "$CPPFLAGS" in @@ -4300,7 +4300,7 @@ echo "$ac_t""$ac_cv_sys_largefile_LIBS" 1>&6 esac ;; esac ;; *) - case "$ac_flag" in + case "$ac_flag" in no) ;; ?*) case "$CFLAGS" in @@ -4333,17 +4333,17 @@ if eval "test \"`echo '$''{'ac_cv_sys_file_offset_bits'+set}'`\" = set"; then else ac_cv_sys_file_offset_bits=no case "$host_os" in - # HP-UX 10.20 and later - hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*) - ac_cv_sys_file_offset_bits=64 ;; - esac + # HP-UX 10.20 and later + hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*) + ac_cv_sys_file_offset_bits=64 ;; + esac for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do - case "$ac_flag" in - -D_FILE_OFFSET_BITS) - ac_cv_sys_file_offset_bits=1 ;; - -D_FILE_OFFSET_BITS=*) - ac_cv_sys_file_offset_bits=`expr " $ac_flag" : '[^=]*=\(.*\)'` ;; - esac + case "$ac_flag" in + -D_FILE_OFFSET_BITS) + ac_cv_sys_file_offset_bits=1 ;; + -D_FILE_OFFSET_BITS=*) + ac_cv_sys_file_offset_bits=`expr " $ac_flag" : '[^=]*=\(.*\)'` ;; + esac done fi @@ -4362,17 +4362,17 @@ if eval "test \"`echo '$''{'ac_cv_sys_largefile_source'+set}'`\" = set"; then else ac_cv_sys_largefile_source=no case "$host_os" in - # HP-UX 10.20 and later - hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*) - ac_cv_sys_largefile_source=1 ;; - esac + # HP-UX 10.20 and later + hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*) + ac_cv_sys_largefile_source=1 ;; + esac for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do - case "$ac_flag" in - -D_LARGEFILE_SOURCE) - ac_cv_sys_largefile_source=1 ;; - -D_LARGEFILE_SOURCE=*) - ac_cv_sys_largefile_source=`expr " $ac_flag" : '[^=]*=\(.*\)'` ;; - esac + case "$ac_flag" in + -D_LARGEFILE_SOURCE) + ac_cv_sys_largefile_source=1 ;; + -D_LARGEFILE_SOURCE=*) + ac_cv_sys_largefile_source=`expr " $ac_flag" : '[^=]*=\(.*\)'` ;; + esac done fi @@ -4391,17 +4391,17 @@ if eval "test \"`echo '$''{'ac_cv_sys_large_files'+set}'`\" = set"; then else ac_cv_sys_large_files=no case "$host_os" in - # AIX 4.2 and later - aix4.[2-9]* | aix4.1[0-9]* | aix[5-9].* | aix[1-9][0-9]*) - ac_cv_sys_large_files=1 ;; - esac + # AIX 4.2 and later + aix4.[2-9]* | aix4.1[0-9]* | aix[5-9].* | aix[1-9][0-9]*) + ac_cv_sys_large_files=1 ;; + esac for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do - case "$ac_flag" in - -D_LARGE_FILES) - ac_cv_sys_large_files=1 ;; - -D_LARGE_FILES=*) - ac_cv_sys_large_files=`expr " $ac_flag" : '[^=]*=\(.*\)'` ;; - esac + case "$ac_flag" in + -D_LARGE_FILES) + ac_cv_sys_large_files=1 ;; + -D_LARGE_FILES=*) + ac_cv_sys_large_files=`expr " $ac_flag" : '[^=]*=\(.*\)'` ;; + esac done fi @@ -6346,8 +6346,8 @@ else #include int main() { - int mask = sigmask(SIGINT); - sigsetmask(mask); sigblock(mask); sigpause(mask); + int mask = sigmask(SIGINT); + sigsetmask(mask); sigblock(mask); sigpause(mask); ; return 0; } EOF @@ -6363,14 +6363,14 @@ else #line 6364 "configure" #include "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; } EOF if { (eval echo configure:6377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then diff --git a/bacula/src/console.glade b/bacula/src/console.glade index b23faa4fa7..e8db191904 100644 --- a/bacula/src/console.glade +++ b/bacula/src/console.glade @@ -1019,6 +1019,11 @@ GtkCombo:entry entry_job True + + changed + on_entry_job_changed + Wed, 30 Apr 2003 16:00:40 GMT + False True 0 @@ -1045,7 +1050,7 @@ GtkCombo - type_combo + combo_type 131 selection_received @@ -1057,11 +1062,7 @@ False True False - Backup -Restore -Admin -Verify - + 6 False @@ -1077,7 +1078,7 @@ Verify False True 0 - Backup + @@ -1305,12 +1306,7 @@ Verify False True False - Incremental -Full -Differential -Catalog -InitCatalog -VolumeToCatalog + 0 @@ -1326,7 +1322,7 @@ VolumeToCatalog False True 0 - Incremental + @@ -1385,7 +1381,8 @@ VolumeToCatalog False True False - + + 0 True @@ -1400,7 +1397,7 @@ VolumeToCatalog False True 0 - Default + @@ -1424,20 +1421,20 @@ VolumeToCatalog GtkHBox - hbox34 + hbox39 False 0 - 2 + 0 True True GtkLabel - label77 + label96 70 - + GTK_JUSTIFY_CENTER False 0.5 @@ -1453,13 +1450,14 @@ VolumeToCatalog GtkCombo - combo_where - False - True + combo-storage + True + False False True False - + + 0 True @@ -1469,18 +1467,18 @@ VolumeToCatalog GtkEntry GtkCombo:entry - entry_where + entry_storage True - True + False True 0 - /tmp/bacula-restores + GtkLabel - label78 + label97 GTK_JUSTIFY_CENTER False @@ -1495,85 +1493,147 @@ VolumeToCatalog - - - - GtkHBox - hbox35 - False - 0 - - 5 - False - False - - GtkLabel - label80 - 70 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 + GtkHBox + hbox40 + False + 0 0 - False - False + True + True + + + GtkLabel + label98 + 70 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + + + + + GtkCombo + combo_messages + True + False + False + True + False + + + 0 + True + True + + + + GtkEntry + GtkCombo:entry + entry_messages + True + False + True + 0 + + + + + + GtkLabel + label99 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 120 + False + False + + - GtkCombo - combo30 - False - True - False - True - False - + GtkHBox + hbox34 + False + 0 - 0 + 2 True True + + GtkLabel + label77 + 70 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + + + GtkEntry - GtkCombo:entry - entry_when + entry_where True True True 0 + + 0 + True + True + - - - GtkLabel - label81 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 120 - False - False - + + GtkLabel + label78 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 120 + False + False + + GtkHBox - hbox36 + hbox41 False 0 @@ -1584,9 +1644,9 @@ VolumeToCatalog GtkLabel - label82 + label100 70 - + GTK_JUSTIFY_CENTER False 0.5 @@ -1601,35 +1661,23 @@ VolumeToCatalog - GtkCombo - combo_messages - True - False - False - True - False - + GtkEntry + entry_when + True + True + True + 0 + 0 True True - - - GtkEntry - GtkCombo:entry - entry_messages - True - False - True - 0 - Standard - GtkLabel - label83 + label101 GTK_JUSTIFY_CENTER False diff --git a/bacula/src/dird/job.c b/bacula/src/dird/job.c index 139e88f714..4a73ac3895 100644 --- a/bacula/src/dird/job.c +++ b/bacula/src/dird/job.c @@ -268,20 +268,24 @@ bail_out: static int acquire_resource_locks(JCR *jcr) { time_t now = time(NULL); + time_t wtime = jcr->sched_time - now; /* Wait until scheduled time arrives */ - if (jcr->sched_time > now && verbose) { - Jmsg(jcr, M_INFO, 0, _("Waiting %d seconds for sched time.\n"), - jcr->sched_time - now); - } - while (jcr->sched_time > now) { - Dmsg2(100, "Waiting on sched time, jobid=%d secs=%d\n", jcr->JobId, - jcr->sched_time - now); - bmicrosleep(jcr->sched_time - now, 0); - now = time(NULL); + if (wtime > 0 && verbose) { + Jmsg(jcr, M_INFO, 0, _("Waiting %d seconds for start time.\n"), wtime); + set_jcr_job_status(jcr, JS_WaitStartTime); + } + while (wtime > 0) { + Dmsg2(100, "Waiting on sched time, jobid=%d secs=%d\n", jcr->JobId, wtime); + if (wtime > 30) { + wtime = 30; + } + bmicrosleep(wtime, 0); if (job_canceled(jcr)) { return 0; } + wtime = jcr->sched_time - time(NULL); + } diff --git a/bacula/src/dird/ua_cmds.c b/bacula/src/dird/ua_cmds.c index ad2efde98e..2e5128acfa 100644 --- a/bacula/src/dird/ua_cmds.c +++ b/bacula/src/dird/ua_cmds.c @@ -424,10 +424,14 @@ static int cancelcmd(UAContext *ua, char *cmd) } } - set_jcr_job_status(jcr, JS_Canceled); - switch (jcr->JobStatus) { case JS_Created: + case JS_WaitJobRes: + case JS_WaitClientRes: + case JS_WaitStoreRes: + case JS_WaitMaxJobs: + case JS_WaitStartTime: + set_jcr_job_status(jcr, JS_Canceled); bsendmsg(ua, _("JobId %d, Job %s marked to be canceled.\n"), jcr->JobId, jcr->Job); #ifndef USE_SEMAPHORE @@ -437,40 +441,45 @@ static int cancelcmd(UAContext *ua, char *cmd) return 1; default: + set_jcr_job_status(jcr, JS_Canceled); + /* Cancel File daemon */ - ua->jcr->client = jcr->client; - if (!connect_to_file_daemon(ua->jcr, 10, FDConnectTimeout, 1)) { - bsendmsg(ua, _("Failed to connect to File daemon.\n")); - free_jcr(jcr); - return 1; - } - Dmsg0(200, "Connected to file daemon\n"); - fd = ua->jcr->file_bsock; - bnet_fsend(fd, "cancel Job=%s\n", jcr->Job); - while (bnet_recv(fd) >= 0) { - bsendmsg(ua, "%s", fd->msg); + if (jcr->file_bsock) { + ua->jcr->client = jcr->client; + if (!connect_to_file_daemon(ua->jcr, 10, FDConnectTimeout, 1)) { + bsendmsg(ua, _("Failed to connect to File daemon.\n")); + free_jcr(jcr); + return 1; + } + Dmsg0(200, "Connected to file daemon\n"); + fd = ua->jcr->file_bsock; + bnet_fsend(fd, "cancel Job=%s\n", jcr->Job); + while (bnet_recv(fd) >= 0) { + bsendmsg(ua, "%s", fd->msg); + } + bnet_sig(fd, BNET_TERMINATE); + bnet_close(fd); + ua->jcr->file_bsock = NULL; } - bnet_sig(fd, BNET_TERMINATE); - bnet_close(fd); - ua->jcr->file_bsock = NULL; /* Cancel Storage daemon */ - ua->jcr->store = jcr->store; - if (!connect_to_storage_daemon(ua->jcr, 10, SDConnectTimeout, 1)) { - bsendmsg(ua, _("Failed to connect to Storage daemon.\n")); - free_jcr(jcr); - return 1; - } - Dmsg0(200, "Connected to storage daemon\n"); - sd = ua->jcr->store_bsock; - bnet_fsend(sd, "cancel Job=%s\n", jcr->Job); - while (bnet_recv(sd) >= 0) { - bsendmsg(ua, "%s", sd->msg); + if (jcr->store_bsock) { + ua->jcr->store = jcr->store; + if (!connect_to_storage_daemon(ua->jcr, 10, SDConnectTimeout, 1)) { + bsendmsg(ua, _("Failed to connect to Storage daemon.\n")); + free_jcr(jcr); + return 1; + } + Dmsg0(200, "Connected to storage daemon\n"); + sd = ua->jcr->store_bsock; + bnet_fsend(sd, "cancel Job=%s\n", jcr->Job); + while (bnet_recv(sd) >= 0) { + bsendmsg(ua, "%s", sd->msg); + } + bnet_sig(sd, BNET_TERMINATE); + bnet_close(sd); + ua->jcr->store_bsock = NULL; } - bnet_sig(sd, BNET_TERMINATE); - bnet_close(sd); - ua->jcr->store_bsock = NULL; - } free_jcr(jcr); diff --git a/bacula/src/dird/ua_dotcmds.c b/bacula/src/dird/ua_dotcmds.c index 76489ac817..605def60f6 100644 --- a/bacula/src/dird/ua_dotcmds.c +++ b/bacula/src/dird/ua_dotcmds.c @@ -51,6 +51,10 @@ static int filesetscmd(UAContext *ua, char *cmd); static int clientscmd(UAContext *ua, char *cmd); static int msgscmd(UAContext *ua, char *cmd); static int poolscmd(UAContext *ua, char *cmd); +static int storagecmd(UAContext *ua, char *cmd); +static int defaultscmd(UAContext *ua, char *cmd); +static int typescmd(UAContext *ua, char *cmd); +static int levelscmd(UAContext *ua, char *cmd); struct cmdstruct { char *key; int (*func)(UAContext *ua, char *cmd); char *help; }; static struct cmdstruct commands[] = { @@ -60,6 +64,10 @@ static struct cmdstruct commands[] = { { N_(".clients"), clientscmd, NULL}, { N_(".msgs"), msgscmd, NULL}, { N_(".pools"), poolscmd, NULL}, + { N_(".types"), typescmd, NULL}, + { N_(".levels"), levelscmd, NULL}, + { N_(".storage"), storagecmd, NULL}, + { N_(".defaults"), defaultscmd, NULL}, { N_(".messages"), qmessagescmd, NULL}, { N_(".quit"), quitcmd, NULL}, { N_(".exit"), quitcmd, NULL} @@ -169,3 +177,59 @@ static int poolscmd(UAContext *ua, char *cmd) return 1; } +static int storagecmd(UAContext *ua, char *cmd) +{ + STORE *store = NULL; + LockRes(); + while ( (store = (STORE *)GetNextRes(R_STORAGE, (RES *)store)) ) { + bsendmsg(ua, "%s\n", store->hdr.name); + } + UnlockRes(); + return 1; +} + + +static int typescmd(UAContext *ua, char *cmd) +{ + bsendmsg(ua, "Backup\n"); + bsendmsg(ua, "Restore\n"); + bsendmsg(ua, "Admin\n"); + bsendmsg(ua, "Verify\n"); + return 1; +} + +static int levelscmd(UAContext *ua, char *cmd) +{ + bsendmsg(ua, "Incremental\n"); + bsendmsg(ua, "Full\n"); + bsendmsg(ua, "Differential\n"); + bsendmsg(ua, "Catalog\n"); + bsendmsg(ua, "InitCatalog\n"); + bsendmsg(ua, "VolumeToCatalog\n"); + return 1; +} + + + +/* + * Return default values for a job + */ +static int defaultscmd(UAContext *ua, char *cmd) +{ + JOB *job; + if (ua->argc == 2 && strcmp(ua->argk[1], "job") == 0) { + job = (JOB *)GetResWithName(R_JOB, ua->argv[1]); + if (job) { + bsendmsg(ua, "job=%s", job->hdr.name); + bsendmsg(ua, "pool=%s", job->pool->hdr.name); + bsendmsg(ua, "messages=%s", job->messages->hdr.name); + bsendmsg(ua, "client=%s", job->client->hdr.name); + bsendmsg(ua, "storage=%s", job->storage->hdr.name); + bsendmsg(ua, "where=%s", job->RestoreWhere?job->RestoreWhere:""); + bsendmsg(ua, "level=%s", level_to_str(job->level)); + bsendmsg(ua, "type=%s", job_type_to_str(job->JobType)); + bsendmsg(ua, "fileset=%s", job->fileset->hdr.name); + } + } + return 1; +} diff --git a/bacula/src/dird/ua_status.c b/bacula/src/dird/ua_status.c index f543fd0147..3969f4556c 100644 --- a/bacula/src/dird/ua_status.c +++ b/bacula/src/dird/ua_status.c @@ -263,6 +263,10 @@ static void do_director_status(UAContext *ua, char *cmd) case JS_WaitMaxJobs: msg = _("is waiting on max total jobs"); break; + case JS_WaitStartTime: + msg = _("is waiting for its start time"); + break; + default: msg = (char *) get_pool_memory(PM_FNAME); diff --git a/bacula/src/jcr.h b/bacula/src/jcr.h index 8bb95fdcf1..6092d10381 100644 --- a/bacula/src/jcr.h +++ b/bacula/src/jcr.h @@ -69,6 +69,7 @@ #define JS_WaitJobRes 'j' /* Waiting for job resource */ #define JS_WaitClientRes 'c' /* Waiting for Client resource */ #define JS_WaitMaxJobs 'd' /* Waiting for maximum jobs */ +#define JS_WaitStartTime 't' /* Waiting for start time */ #define job_canceled(jcr) \ (jcr->JobStatus == JS_Canceled || \ diff --git a/bacula/src/lib/jcr.c b/bacula/src/lib/jcr.c index 69f46c36cb..caa59b4f5a 100755 --- a/bacula/src/lib/jcr.c +++ b/bacula/src/lib/jcr.c @@ -31,6 +31,8 @@ #include "bacula.h" #include "jcr.h" +extern void timeout_handler(int sig); + struct s_last_job last_job; /* last job run by this daemon */ static JCR *jobs = NULL; /* pointer to JCR chain */ @@ -45,6 +47,7 @@ static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; JCR *new_jcr(int size, JCR_free_HANDLER *daemon_free_jcr) { JCR *jcr; + struct sigaction sigtimer; Dmsg0(200, "Enter new_jcr\n"); jcr = (JCR *)malloc(size); @@ -60,6 +63,11 @@ JCR *new_jcr(int size, JCR_free_HANDLER *daemon_free_jcr) jcr->errmsg = get_pool_memory(PM_MESSAGE); jcr->errmsg[0] = 0; + sigtimer.sa_flags = 0; + sigtimer.sa_handler = timeout_handler; + sigfillset(&sigtimer.sa_mask); + sigaction(TIMEOUT_SIGNAL, &sigtimer, NULL); + P(mutex); jcr->prev = NULL; jcr->next = jobs; diff --git a/bacula/src/lib/signal.c b/bacula/src/lib/signal.c index e92bf7b2f4..0bbd312391 100644 --- a/bacula/src/lib/signal.c +++ b/bacula/src/lib/signal.c @@ -65,7 +65,8 @@ static void signal_handler(int sig) if (already_dead) { _exit(1); } - if (sig == SIGCHLD) { /* Ignore sigchld */ + /* Ignore certain signals */ + if (sig == SIGCHLD || sig == SIGUSR2) { return; } already_dead = sig; diff --git a/bacula/src/lib/watchdog.c b/bacula/src/lib/watchdog.c index 8f75dbb889..6814e1fcee 100755 --- a/bacula/src/lib/watchdog.c +++ b/bacula/src/lib/watchdog.c @@ -33,8 +33,6 @@ /* Exported globals */ time_t watchdog_time; /* this has granularity of SLEEP_TIME */ - -#define TIMEOUT_SIGNAL SIGUSR2 #define SLEEP_TIME 30 /* examine things every 30 seconds */ /* Forward referenced functions */ @@ -52,7 +50,7 @@ static btimer_t *timer_chain = NULL; /* * Timeout signal comes here */ -static void timeout_handler(int sig) +void timeout_handler(int sig) { return; /* thus interrupting the function */ } diff --git a/bacula/src/lib/watchdog.h b/bacula/src/lib/watchdog.h index 57f9d677b3..8d39d38bda 100644 --- a/bacula/src/lib/watchdog.h +++ b/bacula/src/lib/watchdog.h @@ -27,15 +27,17 @@ #define TYPE_CHILD 1 #define TYPE_PTHREAD 2 +#define TIMEOUT_SIGNAL SIGUSR2 + typedef struct s_btimer_t { struct s_btimer_t *next; struct s_btimer_t *prev; time_t start_time; int32_t wait; - pid_t pid; /* process id if TYPE_CHILD */ + pid_t pid; /* process id if TYPE_CHILD */ int killed; int type; - pthread_t tid; /* thread id if TYPE_PTHREAD */ + pthread_t tid; /* thread id if TYPE_PTHREAD */ } btimer_t; #define btimer_id btimer_t * diff --git a/bacula/src/version.h b/bacula/src/version.h index 135f9206c5..5bf9a0aa53 100644 --- a/bacula/src/version.h +++ b/bacula/src/version.h @@ -1,8 +1,8 @@ /* */ -#define VERSION "1.31" +#define VERSION "1.30a" #define VSTRING "1" -#define BDATE "29 April 2003" -#define LSMDATE "29Apr03" +#define BDATE "30 April 2003" +#define LSMDATE "30Apr03" /* Debug flags */ #define DEBUG 1 -- 2.39.2