Automatically find Python, SQLite, PostgreSQL, and MySQL libraries on platforms that...

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3113 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/autoconf/bacula-macros/db.m4 b/bacula/autoconf/bacula-macros/db.m4
index f3cc016021680109d0e1e7a784c9ec4924854aaf..a5238bae699a23d39840805309d79107775ccde7 100644 (file)
--- a/bacula/autoconf/bacula-macros/db.m4
+++ b/bacula/autoconf/bacula-macros/db.m4
@@ -12,23 +12,43 @@ AC_ARG_WITH(mysql,
         if test "$withval" = "yes"; then
                 if test -f /usr/local/mysql/include/mysql/mysql.h; then
                         MYSQL_INCDIR=/usr/local/mysql/include/mysql
-                        MYSQL_LIBDIR=/usr/local/mysql/lib/mysql
+                        if test -f /usr/local/mysql/lib64/mysql/libmysqlclient.a; then
+                                MYSQL_LIBDIR=/usr/local/mysql/lib64/mysql
+                        else
+                                MYSQL_LIBDIR=/usr/local/mysql/lib/mysql
+                        fi
                         MYSQL_BINDIR=/usr/local/mysql/bin
                 elif test -f /usr/include/mysql/mysql.h; then
                         MYSQL_INCDIR=/usr/include/mysql
-                        MYSQL_LIBDIR=/usr/lib/mysql
-                        MYSQL_BINDIR=/usr/bin      
+                        if test -f /usr/lib64/mysql/libmysqlclient.a; then
+                                MYSQL_LIBDIR=/usr/lib64/mysql
+                        else
+                                MYSQL_LIBDIR=/usr/lib/mysql
+                        fi
+                        MYSQL_BINDIR=/usr/bin
                 elif test -f /usr/include/mysql.h; then
                         MYSQL_INCDIR=/usr/include
-                        MYSQL_LIBDIR=/usr/lib
+                        if test -f /usr/lib64/libmysqlclient.a; then
+                                MYSQL_LIBDIR=/usr/lib64
+                        else
+                                MYSQL_LIBDIR=/usr/lib
+                        fi
                         MYSQL_BINDIR=/usr/bin
                 elif test -f /usr/local/include/mysql/mysql.h; then
                         MYSQL_INCDIR=/usr/local/include/mysql
-                        MYSQL_LIBDIR=/usr/local/lib/mysql
+                        if test -f /usr/local/lib64/mysql/libmysqlclient.a; then
+                                MYSQL_LIBDIR=/usr/local/lib64/mysql
+                        else
+                                MYSQL_LIBDIR=/usr/local/lib/mysql
+                        fi
                         MYSQL_BINDIR=/usr/local/bin
                 elif test -f /usr/local/include/mysql.h; then
                         MYSQL_INCDIR=/usr/local/include
-                        MYSQL_LIBDIR=/usr/local/lib
+                        if test -f /usr/local/lib64/libmysqlclient.a; then
+                                MYSQL_LIBDIR=/usr/local/lib64
+                        else
+                                MYSQL_LIBDIR=/usr/local/lib
+                        fi
                         MYSQL_BINDIR=/usr/local/bin
                 else
                    AC_MSG_RESULT(no)
@@ -37,11 +57,19 @@ AC_ARG_WITH(mysql,
         else
                 if test -f $withval/include/mysql/mysql.h; then
                         MYSQL_INCDIR=$withval/include/mysql
-                        MYSQL_LIBDIR=$withval/lib/mysql
+                        if test -f $withval/lib64/mysql/libmysqlclient.a; then
+                                MYSQL_LIBDIR=$withval/lib64/mysql
+                        else
+                                MYSQL_LIBDIR=$withval/lib/mysql
+                        fi
                         MYSQL_BINDIR=$withval/bin
                 elif test -f $withval/include/mysql.h; then
                         MYSQL_INCDIR=$withval/include
-                        MYSQL_LIBDIR=$withval/lib
+                        if test -f "$withval/lib64/libmysqlclient.a"; then
+                                MYSQL_LIBDIR=$withval/lib64
+                        else
+                                MYSQL_LIBDIR=$withval/lib
+                        fi
                         MYSQL_BINDIR=$withval/bin
                 else
                    AC_MSG_RESULT(no)
@@ -49,7 +77,7 @@ AC_ARG_WITH(mysql,
                 fi
         fi
     SQL_INCLUDE=-I$MYSQL_INCDIR
-    if test -f $MYSQL_LIBDIR/libmysqlclient_r.a; then
+    if test -f "$MYSQL_LIBDIR/libmysqlclient_r.a"; then
        SQL_LFLAGS="-L$MYSQL_LIBDIR -lmysqlclient_r -lz"
        AC_DEFINE(HAVE_THREAD_SAFE_MYSQL)
     else
@@ -80,23 +108,43 @@ AC_ARG_WITH(embedded-mysql,
         if test "$withval" = "yes"; then
                 if test -f /usr/local/mysql/include/mysql/mysql.h; then
                         MYSQL_INCDIR=/usr/local/mysql/include/mysql
-                        MYSQL_LIBDIR=/usr/local/mysql/lib/mysql
+                        if test -d /usr/local/mysql/lib64/mysql; then
+                                MYSQL_LIBDIR=/usr/local/mysql/lib64/mysql
+                        else
+                                MYSQL_LIBDIR=/usr/local/mysql/lib/mysql
+                        fi
                         MYSQL_BINDIR=/usr/local/mysql/bin
                 elif test -f /usr/include/mysql/mysql.h; then
                         MYSQL_INCDIR=/usr/include/mysql
-                        MYSQL_LIBDIR=/usr/lib/mysql
-                        MYSQL_BINDIR=/usr/bin      
+                        if test -d /usr/lib64/mysql; then
+                                MYSQL_LIBDIR=/usr/lib64/mysql
+                        else
+                                MYSQL_LIBDIR=/usr/lib/mysql
+                        fi
+                        MYSQL_BINDIR=/usr/bin
                 elif test -f /usr/include/mysql.h; then
                         MYSQL_INCDIR=/usr/include
-                        MYSQL_LIBDIR=/usr/lib
+                        if test -d /usr/lib64; then
+                                MYSQL_LIBDIR=/usr/lib64
+                        else
+                                MYSQL_LIBDIR=/usr/lib
+                        fi
                         MYSQL_BINDIR=/usr/bin
                 elif test -f /usr/local/include/mysql/mysql.h; then
                         MYSQL_INCDIR=/usr/local/include/mysql
-                        MYSQL_LIBDIR=/usr/local/lib/mysql
+                        if test -d /usr/local/lib64/mysql; then
+                                MYSQL_LIBDIR=/usr/local/lib64/mysql
+                        else
+                                MYSQL_LIBDIR=/usr/local/lib/mysql
+                        fi
                         MYSQL_BINDIR=/usr/local/bin
                 elif test -f /usr/local/include/mysql.h; then
                         MYSQL_INCDIR=/usr/local/include
-                        MYSQL_LIBDIR=/usr/local/lib
+                        if test -d /usr/local/lib64; then
+                                MYSQL_LIBDIR=/usr/local/lib64
+                        else
+                                MYSQL_LIBDIR=/usr/local/lib
+                        fi
                         MYSQL_BINDIR=/usr/local/bin
                 else
                    AC_MSG_RESULT(no)
@@ -105,11 +153,19 @@ AC_ARG_WITH(embedded-mysql,
         else
                 if test -f $withval/include/mysql/mysql.h; then
                         MYSQL_INCDIR=$withval/include/mysql
-                        MYSQL_LIBDIR=$withval/lib/mysql
+                        if test -d $withval/lib64/mysql; then
+                                MYSQL_LIBDIR=$withval/lib64/mysql
+                        else
+                                MYSQL_LIBDIR=$withval/lib/mysql
+                        fi
                         MYSQL_BINDIR=$withval/bin
                 elif test -f $withval/include/mysql.h; then
                         MYSQL_INCDIR=$withval/include
-                        MYSQL_LIBDIR=$withval/lib
+                        if test -d $withval/lib64; then
+                                MYSQL_LIBDIR=$withval/lib64
+                        else
+                                MYSQL_LIBDIR=$withval/lib
+                        fi
                         MYSQL_BINDIR=$withval/bin
                 else
                    AC_MSG_RESULT(no)
@@ -156,15 +212,27 @@ AC_ARG_WITH(sqlite,
      if test "$withval" = "yes"; then
         if test -f /usr/local/include/sqlite.h; then
            SQLITE_INCDIR=/usr/local/include
-           SQLITE_LIBDIR=/usr/local/lib
+           if test -d /usr/local/lib64; then
+              SQLITE_LIBDIR=/usr/local/lib64
+           else
+              SQLITE_LIBDIR=/usr/local/lib
+           fi
            SQLITE_BINDIR=/usr/local/bin
         elif test -f /usr/include/sqlite.h; then
            SQLITE_INCDIR=/usr/include
-           SQLITE_LIBDIR=/usr/lib
+           if test -d /usr/lib64; then
+              SQLITE_LIBDIR=/usr/lib64
+           else
+              SQLITE_LIBDIR=/usr/lib
+           fi
            SQLITE_BINDIR=/usr/bin      
         elif test -f $prefix/include/sqlite.h; then
            SQLITE_INCDIR=$prefix/include
-           SQLITE_LIBDIR=$prefix/lib
+           if test -d $prefix/lib64; then
+              SQLITE_LIBDIR=$prefix/lib64
+           else
+              SQLITE_LIBDIR=$prefix/lib
+           fi
            SQLITE_BINDIR=$prefix/bin      
         else
            AC_MSG_RESULT(no)
@@ -177,7 +245,11 @@ AC_ARG_WITH(sqlite,
            SQLITE_BINDIR=$withval
         elif test -f $withval/include/sqlite.h; then
            SQLITE_INCDIR=$withval/include
-           SQLITE_LIBDIR=$withval/lib
+           if test -d $withval/lib64; then
+              SQLITE_LIBDIR=$withval/lib64
+           else
+              SQLITE_LIBDIR=$withval/lib
+           fi
            SQLITE_BINDIR=$withval/bin
         else
            AC_MSG_RESULT(no)
@@ -221,15 +293,27 @@ AC_ARG_WITH(sqlite3,
      if test "$withval" = "yes"; then
         if test -f /usr/local/include/sqlite3.h; then
            SQLITE_INCDIR=/usr/local/include
-           SQLITE_LIBDIR=/usr/local/lib
+           if test -d /usr/local/lib64; then
+              SQLITE_LIBDIR=/usr/local/lib64
+           else
+              SQLITE_LIBDIR=/usr/local/lib
+           fi
            SQLITE_BINDIR=/usr/local/bin
         elif test -f /usr/include/sqlite3.h; then
            SQLITE_INCDIR=/usr/include
-           SQLITE_LIBDIR=/usr/lib
+           if test -d /usr/lib64; then
+              SQLITE_LIBDIR=/usr/lib64
+           else
+              SQLITE_LIBDIR=/usr/lib
+           fi
            SQLITE_BINDIR=/usr/bin      
         elif test -f $prefix/include/sqlite3.h; then
            SQLITE_INCDIR=$prefix/include
-           SQLITE_LIBDIR=$prefix/lib
+           if test -d $prefix/lib64; then
+              SQLITE_LIBDIR=$prefix/lib64
+           else
+              SQLITE_LIBDIR=$prefix/lib
+           fi
            SQLITE_BINDIR=$prefix/bin      
         else
            AC_MSG_RESULT(no)
@@ -242,7 +326,11 @@ AC_ARG_WITH(sqlite3,
            SQLITE_BINDIR=$withval
         elif test -f $withval/include/sqlite3.h; then
            SQLITE_INCDIR=$withval/include
-           SQLITE_LIBDIR=$withval/lib
+           if test -d $withval/lib64; then
+              SQLITE_LIBDIR=$withval/lib64
+           else
+              SQLITE_LIBDIR=$withval/lib
+           fi
            SQLITE_BINDIR=$withval/bin
         else
            AC_MSG_RESULT(no)
@@ -295,19 +383,35 @@ AC_ARG_WITH(postgresql,
               POSTGRESQL_BINDIR=`"$PG_CONFIG" --bindir`
           elif test -f /usr/local/include/libpq-fe.h; then
               POSTGRESQL_INCDIR=/usr/local/include
-              POSTGRESQL_LIBDIR=/usr/local/lib
+              if test -d /usr/local/lib64; then
+                 POSTGRESQL_LIBDIR=/usr/local/lib64
+              else
+                 POSTGRESQL_LIBDIR=/usr/local/lib
+              fi
               POSTGRESQL_BINDIR=/usr/local/bin
           elif test -f /usr/include/libpq-fe.h; then
               POSTGRESQL_INCDIR=/usr/include
-              POSTGRESQL_LIBDIR=/usr/lib
+              if test -d /usr/lib64; then
+                 POSTGRESQL_LIBDIR=/usr/lib64
+              else
+                 POSTGRESQL_LIBDIR=/usr/lib
+              fi
               POSTGRESQL_BINDIR=/usr/bin
           elif test -f /usr/include/pgsql/libpq-fe.h; then
               POSTGRESQL_INCDIR=/usr/include/pgsql
-              POSTGRESQL_LIBDIR=/usr/lib/pgsql
+              if test -d /usr/lib64/pgsql; then
+                 POSTGRESQL_LIBDIR=/usr/lib64/pgsql
+              else
+                 POSTGRESQL_LIBDIR=/usr/lib/pgsql
+              fi
               POSTGRESQL_BINDIR=/usr/bin
           elif test -f /usr/include/postgresql/libpq-fe.h; then
               POSTGRESQL_INCDIR=/usr/include/postgresql
-              POSTGRESQL_LIBDIR=/usr/lib/postgresql
+              if test -d /usr/lib64/postgresql; then
+                 POSTGRESQL_LIBDIR=/usr/lib64/postgresql
+              else
+                 POSTGRESQL_LIBDIR=/usr/lib/postgresql
+              fi
               POSTGRESQL_BINDIR=/usr/bin
           else
               AC_MSG_RESULT(no)
@@ -319,7 +423,11 @@ AC_ARG_WITH(postgresql,
           POSTGRESQL_BINDIR=$withval/bin
       elif test -f $withval/include/postgresql/libpq-fe.h; then
           POSTGRESQL_INCDIR=$withval/include/postgresql
-          POSTGRESQL_LIBDIR=$withval/lib
+     if test -d $withval/lib64; then
+         POSTGRESQL_LIBDIR=$withval/lib64
+     else
+         POSTGRESQL_LIBDIR=$withval/lib
+     fi
           POSTGRESQL_BINDIR=$withval/bin
       else
           AC_MSG_RESULT(no)
@@ -375,7 +483,11 @@ AC_ARG_WITH(berkeleydb,
         if test "$withval" = "yes"; then
                 if test -f /usr/include/db.h; then
                         BERKELEYDB_INCDIR=/usr/include
-                        BERKELEYDB_LIBDIR=/usr/lib
+                        if test -d /usr/lib64; then
+                                BERKELEYDB_LIBDIR=/usr/lib64
+                        else
+                                BERKELEYDB_LIBDIR=/usr/lib
+                        fi
                 else
                 AC_MSG_RESULT(no)
                 AC_MSG_ERROR(Invalid Berkeley DB directory - unable to find db.h)
@@ -383,7 +495,11 @@ AC_ARG_WITH(berkeleydb,
         else
                 if test -f $withval/include/db.h; then
                         BERKELEYDB_INCDIR=$withval/include
-                        BERKELEYDBL_LIBDIR=$withval/lib
+                        if test -d $withval/lib64; then
+                                BERKELEYDB_LIBDIR=$withval/lib64
+                        else
+                                BERKELEYDB_LIBDIR=$withval/lib
+                        fi
                 else
                 AC_MSG_RESULT(no)
                 AC_MSG_ERROR(Invalid Berkeley DB directory - unable to find db.h under $withval)
@@ -427,10 +543,18 @@ AC_ARG_WITH(msql,
 
     if test "$withval" = "yes"; then
         MSQL_INCDIR=/usr/local/Hughes/include
-        MSQL_LIBDIR=/usr/local/Hughes/lib
+        if test -d /usr/local/Hughes/lib64; then
+            MSQL_LIBDIR=/usr/local/Hughes/lib64
+        else
+            MSQL_LIBDIR=/usr/local/Hughes/lib
+        fi
     else
         MSQL_INCDIR=$withval/include
-        MSQL_LIBDIR=$withval/lib
+        if test -d $withval/lib64; then
+            MSQL_LIBDIR=$withval/lib64
+        else
+            MSQL_LIBDIR=$withval/lib
+        fi
     fi
     MSQL_INCLUDE=-I$MSQL_INCDIR
     MSQL_LFLAGS="-L$MSQL_LIBDIR -lmsql"
@@ -467,7 +591,11 @@ AC_ARG_WITH(iodbc,
         if test "$withval" != "no"; then
                 if test -f $withval/include/isql.h; then
                         IODBC_INCDIR=$withval/include
-                        IODBC_LIBDIR=$withval/lib
+                        if test -d $withval/lib64; then
+                                IODBC_LIBDIR=$withval/lib64
+                        else
+                                IODBC_LIBDIR=$withval/lib
+                        fi
                 else
                         AC_MSG_RESULT(no)
                         AC_MSG_ERROR(Invalid iODBC directory - unable to find isql.h)
@@ -504,7 +632,11 @@ AC_ARG_WITH(unixODBC,
         if test "$withval" != "no"; then
                 if test -f $withval/include/sql.h; then
                         UNIXODBC_INCDIR=$withval/include
-                        UNIXODBC_LIBDIR=$withval/lib
+                        if test -d $withval/lib64; then
+                                UNIXODBC_LIBDIR=$withval/lib64
+                        else
+                                UNIXODBC_LIBDIR=$withval/lib
+                        fi
                 else
                         AC_MSG_RESULT(no)
                         AC_MSG_ERROR(Invalid unixODBC directory - unable to find sql.h)
@@ -541,7 +673,11 @@ AC_ARG_WITH(solid,
         if test "$withval" != "no"; then
                 if test -f $withval/include/cli0cli.h; then
                         SOLID_INCDIR=$withval/include
-                        SOLID_LIBDIR=$withval/lib
+                        if test -d $withval/lib64; then
+                                SOLID_LIBDIR=$withval/lib64
+                        else
+                                SOLID_LIBDIR=$withval/lib
+                        fi
                 else
                         AC_MSG_RESULT(no)
                         AC_MSG_ERROR(Invalid Solid directory - unable to find cli0cli.h)
@@ -573,13 +709,25 @@ AC_ARG_WITH(openlink,
 
                 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/
+                        if test -d /usr/local/virtuoso-ent/odbcsdk/lib64/; then
+                                VIRT_LIBDIR=/usr/local/virtuoso-ent/odbcsdk/lib64/
+                        else
+                                VIRT_LIBDIR=/usr/local/virtuoso-ent/odbcsdk/lib/
+                        fi
                 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/
+                        if test -d /usr/local/virtuoso-lite/odbcsdk/lib64/; then
+                                VIRT_LIBDIR=/usr/local/virtuoso-lite/odbcsdk/lib64/
+                        else
+                                VIRT_LIBDIR=/usr/local/virtuoso-lite/odbcsdk/lib/
+                        fi
                 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/
+                        if test -d /usr/local/virtuoso/odbcsdk/lib64/; then
+                                VIRT_LIBDIR=/usr/local/virtuoso/odbcsdk/lib64/
+                        else
+                                VIRT_LIBDIR=/usr/local/virtuoso/odbcsdk/lib/
+                        fi
                 else
                 AC_MSG_RESULT(no)
                 AC_MSG_ERROR(Invalid OpenLink ODBC directory - unable to find isql.h)
@@ -587,10 +735,18 @@ AC_ARG_WITH(openlink,
         else
                 if test -f $withval/odbcsdk/include/isql.h; then
                         VIRT_INCDIR=$withval/odbcsdk/include/
-                        VIRT_LIBDIR=$withval/odbcsdk/lib/
+                        if test -d $withval/odbcsdk/lib64/; then
+                                VIRT_LIBDIR=$withval/odbcsdk/lib64/
+                        else
+                                VIRT_LIBDIR=$withval/odbcsdk/lib/
+                        fi
                 elif test -f $withval/include/isql.h; then
                         VIRT_INCDIR=$withval/include/
-                        VIRT_LIBDIR=$withval/lib/
+                        if test -d $withval/lib64/; then
+                                VIRT_LIBDIR=$withval/lib64/
+                        else
+                                VIRT_LIBDIR=$withval/lib/
+                        fi
                 else
                 AC_MSG_RESULT(no)
                 AC_MSG_ERROR(Invalid OpenLink ODBC directory - unable to find isql.h under $withval)
@@ -628,7 +784,11 @@ AC_ARG_WITH(easysoft,
 
                 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"
+                        if test -d /usr/local/easysoft/oob/client/lib64/; then
+                                EASYSOFT_LFLAGS="-L/usr/local/easysoft/oob/client/lib64/ -L/usr/local/easysoft/lib64"
+                        else
+                                EASYSOFT_LFLAGS="-L/usr/local/easysoft/oob/client/lib/ -L/usr/local/easysoft/lib"
+                        fi
                 else
                 AC_MSG_RESULT(no)
                 AC_MSG_ERROR(Invalid EasySoft ODBC directory - unable to find sql.h)
@@ -636,7 +796,11 @@ AC_ARG_WITH(easysoft,
         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"
+                        if test -d $withval/easysoft/oob/client/lib64/; then
+                                EASYSOFT_LFLAGS="-L$withval/easysoft/oob/client/lib64/ -L$withval/easysoft/lib64"
+                        else
+                                EASYSOFT_LFLAGS="-L$withval/easysoft/oob/client/lib/ -L$withval/easysoft/lib"
+                        fi
                 else
                 AC_MSG_RESULT(no)
                 AC_MSG_ERROR(Invalid EasySoft ODBC directory - unable to find sql.h under $withval)
@@ -679,7 +843,11 @@ AC_ARG_WITH(ibase,
         if test "$withval" != "no"; then
                 if test -f $withval/include/ibase.h; then
                         IBASE_INCDIR=$withval/include
-                        IBASE_LIBDIR=$withval/lib
+                        if test -d $withval/lib64; then
+                                IBASE_LIBDIR=$withval/lib64
+                        else
+                                IBASE_LIBDIR=$withval/lib
+                        fi
                 else
                         AC_MSG_RESULT(no)
                         AC_MSG_ERROR(Invalid InterBase directory - unable to find ibase.h)
@@ -722,13 +890,25 @@ AC_ARG_WITH(oracle8,
                         ORACLE8_INCDIR2=$withval/rdbms/public/:
                         ORACLE8_INCDIR3=$withval/network/public/
                         ORACLE8_INCDIR4=$withval/plsql/public/
-                        ORACLE8_LIBDIR1=$withval/lib
-                        ORACLE8_LIBDIR2=$withval/rdbms/lib
+                        if test -d $withval/lib64; then
+                                ORACLE8_LIBDIR1=$withval/lib64
+                        else
+                                ORACLE8_LIBDIR1=$withval/lib
+                        fi
+                        if test -d $withval/rdbms/lib64; then
+                               ORACLE8_LIBDIR2=$withval/rdbms/lib64
+                        else
+                                ORACLE8_LIBDIR2=$withval/rdbms/lib
+                        fi
                 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"
+                if test -f $withval/lib64/libclntsh.so; then
+                        ORACLE8_LFLAGS="-L$ORACLE8_LIBDIR1 -L$ORACLE8_LIBDIR2 $withval/lib64/libclntsh.so -lmm -lepc -lclient -lvsn -lcommon -lgeneric -lcore4 -lnlsrtl3 -lnsl -lm -ldl -lnetv2 -lnttcp -lnetwork -lncr -lsql"
+                else
+                        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"
+                fi
                 ORACLE8_INCLUDE="-I$ORACLE8_INCDIR1 -I$ORACLE8_INCDIR2 -I$ORACLE8_INCDIR3 -I$ORACLE8_INCDIR4"
                 AC_DEFINE(HAVE_ORACLE8)
                 AC_MSG_RESULT(yes)
@@ -761,8 +941,16 @@ AC_ARG_WITH(oracle7,
         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
+                        if test -d $withval/lib64; then
+                                ORACLE7_LIBDIR1=$withval/lib64
+                        else
+                                ORACLE7_LIBDIR1=$withval/lib
+                        fi
+                        if test -d $withval/rdbms/lib64; then
+                                ORACLE7_LIBDIR2=$withval/rdbms/lib64
+                        else
+                                ORACLE7_LIBDIR2=$withval/rdbms/lib
+                        fi
                 else
                         AC_MSG_RESULT(no)
                         AC_MSG_ERROR(Invalid ORACLE directory - unable to find ocidfn.h)
@@ -772,9 +960,15 @@ AC_ARG_WITH(oracle7,
         if test -f "$ORACLEINST_TOP/rdbms/lib/sysliblist"
         then
           ORA_SYSLIB="`cat $ORACLEINST_TOP/rdbms/lib/sysliblist`"
+        elif test -f "$ORACLEINST_TOP/rdbms/lib64/sysliblist"
+        then
+          ORA_SYSLIB="`cat $ORACLEINST_TOP/rdbms/lib64/sysliblist`"
         elif test -f "$ORACLEINST_TOP/lib/sysliblist"
             then
           ORA_SYSLIB="`cat $ORACLEINST_TOP/lib/sysliblist`"
+        elif test -f "$ORACLEINST_TOP/lib64/sysliblist"
+            then
+          ORA_SYSLIB="`cat $ORACLEINST_TOP/lib64/sysliblist`"
         else
           ORA_SYSLIB="-lm"
         fi

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index 19f3d1d70191bdffaaa25b4d9629583035bc3785..43d3fbc07e4eeebdc62605dee763e842c9808c9e 100644 (file)
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -612,22 +612,38 @@ AC_ARG_WITH(python,
        for python_root in /usr /usr/local /usr/sfw; do
          if test -f $python_root/include/python2.2/Python.h; then
             PYTHON_INCDIR=-I$python_root/include/python2.2
-            PYTHON_LIBS="-L$python_root/lib/python2.2/config -lpython2.2"
+            if test -d $python_root/lib64/python2.2/config; then
+               PYTHON_LIBS="-L$python_root/lib64/python2.2/config -lpython2.2"
+             else
+               PYTHON_LIBS="-L$python_root/lib/python2.2/config -lpython2.2"
+             fi
             break
          elif test -f $python_root/include/python2.3/Python.h; then
             PYTHON_INCDIR=-I$python_root/include/python2.3
-            PYTHON_LIBS="-L$python_root/lib/python2.3/config -lpython2.3"
+            if test -d $python_root/lib64/python2.3/config; then
+               PYTHON_LIBS="-L$python_root/lib64/python2.3/config -lpython2.3"
+             else
+               PYTHON_LIBS="-L$python_root/lib/python2.3/config -lpython2.3"
+             fi
             break
          elif test -f $python_root/include/python2.4/Python.h; then
             PYTHON_INCDIR=-I$python_root/include/python2.4
-            PYTHON_LIBS="-L$python_root/lib/python2.4/config -lpython2.4"
+            if test -d $python_root/lib64/python2.4/config; then
+               PYTHON_LIBS="-L$python_root/lib64/python2.4/config -lpython2.4"
+             else
+               PYTHON_LIBS="-L$python_root/lib/python2.4/config -lpython2.4"
+             fi
             break
          fi
        done
        if test x$PYTHON_INCDIR = x; then
          if test -f $prefix/include/Python.h; then
             PYTHON_INCDIR=-I$prefix/include
-            PYTHON_LIBS="-L$prefix/lib/config -lpython"
+            if test -d $prefix/lib64/config; then
+               PYTHON_LIBS="-L$prefix/lib64/config -lpython"
+             else
+               PYTHON_LIBS="-L$prefix/lib/config -lpython"
+             fi
          else
           AC_MSG_RESULT(no)
           AC_MSG_ERROR(Unable to find Python.h in standard locations)
@@ -639,10 +655,18 @@ AC_ARG_WITH(python,
           PYTHON_LIBS="-L$withval/config -lpython"
        elif test -f $withval/include/Python.h; then
           PYTHON_INCDIR=-I$withval/include
-          PYTHON_LIBS="-L$withval/lib/config -lpython"
+          if test -d $withval/lib64/config; then
+             PYTHON_LIBS="-L$withval/lib64/config -lpython"
+          else
+             PYTHON_LIBS="-L$withval/lib/config -lpython"
+          fi
        elif test -f $withval/include/python/Python.h; then
           PYTHON_INCDIR=-I$withval/include/python
-          PYTHON_LIBS="-L$withval/lib/python/config -lpython"
+          if test -d $withval/lib64/python/config; then
+             PYTHON_LIBS="-L$withval/lib64/python/config -lpython"
+          else
+             PYTHON_LIBS="-L$withval/lib/python/config -lpython"
+          fi
        else
           AC_MSG_RESULT(no)
           AC_MSG_ERROR(Invalid Python directory $withval - unable to find Python.h under $withval)

diff --git a/bacula/configure b/bacula/configure
index 2480acf3691c1c168c9c1463f29764ffc77fa125..ac2a1f4ebdfd4b29800b0d2a0519250a62009102 100755 (executable)
--- a/bacula/configure
+++ b/bacula/configure
@@ -10750,6 +10750,7 @@ fi
 
 
 
+
 for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
 stdlib.h string.h unistd.h sys/param.h
 do
@@ -10919,6 +10920,9 @@ done
 
 
 
+
+
+
 
 
 
@@ -14956,22 +14960,38 @@ if test "${with_python+set}" = set; then
        for python_root in /usr /usr/local /usr/sfw; do
          if test -f $python_root/include/python2.2/Python.h; then
             PYTHON_INCDIR=-I$python_root/include/python2.2
-            PYTHON_LIBS="-L$python_root/lib/python2.2/config -lpython2.2"
+            if test -d $python_root/lib64/python2.2/config; then
+               PYTHON_LIBS="-L$python_root/lib64/python2.2/config -lpython2.2"
+             else
+               PYTHON_LIBS="-L$python_root/lib/python2.2/config -lpython2.2"
+             fi
             break
          elif test -f $python_root/include/python2.3/Python.h; then
             PYTHON_INCDIR=-I$python_root/include/python2.3
-            PYTHON_LIBS="-L$python_root/lib/python2.3/config -lpython2.3"
+            if test -d $python_root/lib64/python2.3/config; then
+               PYTHON_LIBS="-L$python_root/lib64/python2.3/config -lpython2.3"
+             else
+               PYTHON_LIBS="-L$python_root/lib/python2.3/config -lpython2.3"
+             fi
             break
          elif test -f $python_root/include/python2.4/Python.h; then
             PYTHON_INCDIR=-I$python_root/include/python2.4
-            PYTHON_LIBS="-L$python_root/lib/python2.4/config -lpython2.4"
+            if test -d $python_root/lib64/python2.4/config; then
+               PYTHON_LIBS="-L$python_root/lib64/python2.4/config -lpython2.4"
+             else
+               PYTHON_LIBS="-L$python_root/lib/python2.4/config -lpython2.4"
+             fi
             break
          fi
        done
        if test x$PYTHON_INCDIR = x; then
          if test -f $prefix/include/Python.h; then
             PYTHON_INCDIR=-I$prefix/include
-            PYTHON_LIBS="-L$prefix/lib/config -lpython"
+            if test -d $prefix/lib64/config; then
+               PYTHON_LIBS="-L$prefix/lib64/config -lpython"
+             else
+               PYTHON_LIBS="-L$prefix/lib/config -lpython"
+             fi
          else
           echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
@@ -14986,10 +15006,18 @@ echo "$as_me: error: Unable to find Python.h in standard locations" >&2;}
           PYTHON_LIBS="-L$withval/config -lpython"
        elif test -f $withval/include/Python.h; then
           PYTHON_INCDIR=-I$withval/include
-          PYTHON_LIBS="-L$withval/lib/config -lpython"
+          if test -d $withval/lib64/config; then
+             PYTHON_LIBS="-L$withval/lib64/config -lpython"
+          else
+             PYTHON_LIBS="-L$withval/lib/config -lpython"
+          fi
        elif test -f $withval/include/python/Python.h; then
           PYTHON_INCDIR=-I$withval/include/python
-          PYTHON_LIBS="-L$withval/lib/python/config -lpython"
+          if test -d $withval/lib64/python/config; then
+             PYTHON_LIBS="-L$withval/lib64/python/config -lpython"
+          else
+             PYTHON_LIBS="-L$withval/lib/python/config -lpython"
+          fi
        else
           echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
@@ -16563,19 +16591,35 @@ echo "$as_me: error: \"You can configure for only one database.\"" >&2;}
               POSTGRESQL_BINDIR=`"$PG_CONFIG" --bindir`
           elif test -f /usr/local/include/libpq-fe.h; then
               POSTGRESQL_INCDIR=/usr/local/include
-              POSTGRESQL_LIBDIR=/usr/local/lib
+              if test -d /usr/local/lib64; then
+                 POSTGRESQL_LIBDIR=/usr/local/lib64
+              else
+                 POSTGRESQL_LIBDIR=/usr/local/lib
+              fi
               POSTGRESQL_BINDIR=/usr/local/bin
           elif test -f /usr/include/libpq-fe.h; then
               POSTGRESQL_INCDIR=/usr/include
-              POSTGRESQL_LIBDIR=/usr/lib
+              if test -d /usr/lib64; then
+                 POSTGRESQL_LIBDIR=/usr/lib64
+              else
+                 POSTGRESQL_LIBDIR=/usr/lib
+              fi
               POSTGRESQL_BINDIR=/usr/bin
           elif test -f /usr/include/pgsql/libpq-fe.h; then
               POSTGRESQL_INCDIR=/usr/include/pgsql
-              POSTGRESQL_LIBDIR=/usr/lib/pgsql
+              if test -d /usr/lib64/pgsql; then
+                 POSTGRESQL_LIBDIR=/usr/lib64/pgsql
+              else
+                 POSTGRESQL_LIBDIR=/usr/lib/pgsql
+              fi
               POSTGRESQL_BINDIR=/usr/bin
           elif test -f /usr/include/postgresql/libpq-fe.h; then
               POSTGRESQL_INCDIR=/usr/include/postgresql
-              POSTGRESQL_LIBDIR=/usr/lib/postgresql
+              if test -d /usr/lib64/postgresql; then
+                 POSTGRESQL_LIBDIR=/usr/lib64/postgresql
+              else
+                 POSTGRESQL_LIBDIR=/usr/lib/postgresql
+              fi
               POSTGRESQL_BINDIR=/usr/bin
           else
               echo "$as_me:$LINENO: result: no" >&5
@@ -16590,7 +16634,11 @@ echo "$as_me: error: Unable to find libpq-fe.h in standard locations" >&2;}
           POSTGRESQL_BINDIR=$withval/bin
       elif test -f $withval/include/postgresql/libpq-fe.h; then
           POSTGRESQL_INCDIR=$withval/include/postgresql
-          POSTGRESQL_LIBDIR=$withval/lib
+     if test -d $withval/lib64/postgresql; then
+         POSTGRESQL_LIBDIR=$withval/lib64/postgresql
+     else
+         POSTGRESQL_LIBDIR=$withval/lib/postgresql
+     fi
           POSTGRESQL_BINDIR=$withval/bin
       else
           echo "$as_me:$LINENO: result: no" >&5
@@ -16806,23 +16854,43 @@ if test "${with_mysql+set}" = set; then
         if test "$withval" = "yes"; then
                 if test -f /usr/local/mysql/include/mysql/mysql.h; then
                         MYSQL_INCDIR=/usr/local/mysql/include/mysql
-                        MYSQL_LIBDIR=/usr/local/mysql/lib/mysql
+                        if test -f /usr/local/mysql/lib64/mysql/libmysqlclient.a; then
+                                MYSQL_LIBDIR=/usr/local/mysql/lib64/mysql
+                        else
+                                MYSQL_LIBDIR=/usr/local/mysql/lib/mysql
+                        fi
                         MYSQL_BINDIR=/usr/local/mysql/bin
                 elif test -f /usr/include/mysql/mysql.h; then
                         MYSQL_INCDIR=/usr/include/mysql
-                        MYSQL_LIBDIR=/usr/lib/mysql
+                        if test -f /usr/lib64/mysql/libmysqlclient.a; then
+                                MYSQL_LIBDIR=/usr/lib64/mysql
+                        else
+                                MYSQL_LIBDIR=/usr/lib/mysql
+                        fi
                         MYSQL_BINDIR=/usr/bin
                 elif test -f /usr/include/mysql.h; then
                         MYSQL_INCDIR=/usr/include
-                        MYSQL_LIBDIR=/usr/lib
+                        if test -f /usr/lib64/libmysqlclient.a; then
+                                MYSQL_LIBDIR=/usr/lib64
+                        else
+                                MYSQL_LIBDIR=/usr/lib
+                        fi
                         MYSQL_BINDIR=/usr/bin
                 elif test -f /usr/local/include/mysql/mysql.h; then
                         MYSQL_INCDIR=/usr/local/include/mysql
-                        MYSQL_LIBDIR=/usr/local/lib/mysql
+                        if test -f /usr/local/lib64/mysql/libmysqlclient.a; then
+                                MYSQL_LIBDIR=/usr/local/lib64/mysql
+                        else
+                                MYSQL_LIBDIR=/usr/local/lib/mysql
+                        fi
                         MYSQL_BINDIR=/usr/local/bin
                 elif test -f /usr/local/include/mysql.h; then
                         MYSQL_INCDIR=/usr/local/include
-                        MYSQL_LIBDIR=/usr/local/lib
+                        if test -f /usr/local/lib64/libmysqlclient.a; then
+                                MYSQL_LIBDIR=/usr/local/lib64
+                        else
+                                MYSQL_LIBDIR=/usr/local/lib
+                        fi
                         MYSQL_BINDIR=/usr/local/bin
                 else
                    echo "$as_me:$LINENO: result: no" >&5
@@ -16834,11 +16902,19 @@ echo "$as_me: error: Unable to find mysql.h in standard locations" >&2;}
         else
                 if test -f $withval/include/mysql/mysql.h; then
                         MYSQL_INCDIR=$withval/include/mysql
-                        MYSQL_LIBDIR=$withval/lib/mysql
+                        if test -f $withval/lib64/mysql/libmysqlclient.a; then
+                                MYSQL_LIBDIR=$withval/lib64/mysql
+                        else
+                                MYSQL_LIBDIR=$withval/lib/mysql
+                        fi
                         MYSQL_BINDIR=$withval/bin
                 elif test -f $withval/include/mysql.h; then
                         MYSQL_INCDIR=$withval/include
-                        MYSQL_LIBDIR=$withval/lib
+                        if test -f "$withval/lib64/libmysqlclient.a"; then
+                                MYSQL_LIBDIR=$withval/lib64
+                        else
+                                MYSQL_LIBDIR=$withval/lib
+                        fi
                         MYSQL_BINDIR=$withval/bin
                 else
                    echo "$as_me:$LINENO: result: no" >&5
@@ -16888,23 +16964,43 @@ if test "${with_embedded_mysql+set}" = set; then
         if test "$withval" = "yes"; then
                 if test -f /usr/local/mysql/include/mysql/mysql.h; then
                         MYSQL_INCDIR=/usr/local/mysql/include/mysql
-                        MYSQL_LIBDIR=/usr/local/mysql/lib/mysql
+                        if test -d /usr/local/mysql/lib64/mysql; then
+                                MYSQL_LIBDIR=/usr/local/mysql/lib64/mysql
+                        else
+                                MYSQL_LIBDIR=/usr/local/mysql/lib/mysql
+                        fi
                         MYSQL_BINDIR=/usr/local/mysql/bin
                 elif test -f /usr/include/mysql/mysql.h; then
                         MYSQL_INCDIR=/usr/include/mysql
-                        MYSQL_LIBDIR=/usr/lib/mysql
+                        if test -d /usr/lib64/mysql; then
+                                MYSQL_LIBDIR=/usr/lib64/mysql
+                        else
+                                MYSQL_LIBDIR=/usr/lib/mysql
+                        fi
                         MYSQL_BINDIR=/usr/bin
                 elif test -f /usr/include/mysql.h; then
                         MYSQL_INCDIR=/usr/include
-                        MYSQL_LIBDIR=/usr/lib
+                        if test -d /usr/lib64; then
+                                MYSQL_LIBDIR=/usr/lib64
+                        else
+                                MYSQL_LIBDIR=/usr/lib
+                        fi
                         MYSQL_BINDIR=/usr/bin
                 elif test -f /usr/local/include/mysql/mysql.h; then
                         MYSQL_INCDIR=/usr/local/include/mysql
-                        MYSQL_LIBDIR=/usr/local/lib/mysql
+                        if test -d /usr/local/lib64/mysql; then
+                                MYSQL_LIBDIR=/usr/local/lib64/mysql
+                        else
+                                MYSQL_LIBDIR=/usr/local/lib/mysql
+                        fi
                         MYSQL_BINDIR=/usr/local/bin
                 elif test -f /usr/local/include/mysql.h; then
                         MYSQL_INCDIR=/usr/local/include
-                        MYSQL_LIBDIR=/usr/local/lib
+                        if test -d /usr/local/lib64; then
+                                MYSQL_LIBDIR=/usr/local/lib64
+                        else
+                                MYSQL_LIBDIR=/usr/local/lib
+                        fi
                         MYSQL_BINDIR=/usr/local/bin
                 else
                    echo "$as_me:$LINENO: result: no" >&5
@@ -16916,11 +17012,19 @@ echo "$as_me: error: Unable to find mysql.h in standard locations" >&2;}
         else
                 if test -f $withval/include/mysql/mysql.h; then
                         MYSQL_INCDIR=$withval/include/mysql
-                        MYSQL_LIBDIR=$withval/lib/mysql
+                        if test -d $withval/lib64/mysql; then
+                                MYSQL_LIBDIR=$withval/lib64/mysql
+                        else
+                                MYSQL_LIBDIR=$withval/lib/mysql
+                        fi
                         MYSQL_BINDIR=$withval/bin
                 elif test -f $withval/include/mysql.h; then
                         MYSQL_INCDIR=$withval/include
-                        MYSQL_LIBDIR=$withval/lib
+                        if test -d $withval/lib64; then
+                                MYSQL_LIBDIR=$withval/lib64
+                        else
+                                MYSQL_LIBDIR=$withval/lib
+                        fi
                         MYSQL_BINDIR=$withval/bin
                 else
                    echo "$as_me:$LINENO: result: no" >&5
@@ -16977,15 +17081,27 @@ if test "${with_sqlite3+set}" = set; then
      if test "$withval" = "yes"; then
         if test -f /usr/local/include/sqlite3.h; then
            SQLITE_INCDIR=/usr/local/include
-           SQLITE_LIBDIR=/usr/local/lib
+           if test -d /usr/local/lib64; then
+              SQLITE_LIBDIR=/usr/local/lib64
+           else
+              SQLITE_LIBDIR=/usr/local/lib
+           fi
            SQLITE_BINDIR=/usr/local/bin
         elif test -f /usr/include/sqlite3.h; then
            SQLITE_INCDIR=/usr/include
-           SQLITE_LIBDIR=/usr/lib
+           if test -d /usr/lib64; then
+              SQLITE_LIBDIR=/usr/lib64
+           else
+              SQLITE_LIBDIR=/usr/lib
+           fi
            SQLITE_BINDIR=/usr/bin
         elif test -f $prefix/include/sqlite3.h; then
            SQLITE_INCDIR=$prefix/include
-           SQLITE_LIBDIR=$prefix/lib
+           if test -d $prefix/lib64; then
+              SQLITE_LIBDIR=$prefix/lib64
+           else
+              SQLITE_LIBDIR=$prefix/lib
+           fi
            SQLITE_BINDIR=$prefix/bin
         else
            echo "$as_me:$LINENO: result: no" >&5
@@ -17001,7 +17117,11 @@ echo "$as_me: error: Unable to find sqlite3.h in standard locations" >&2;}
            SQLITE_BINDIR=$withval
         elif test -f $withval/include/sqlite3.h; then
            SQLITE_INCDIR=$withval/include
-           SQLITE_LIBDIR=$withval/lib
+           if test -d $withval/lib64; then
+              SQLITE_LIBDIR=$withval/lib64
+           else
+              SQLITE_LIBDIR=$withval/lib
+           fi
            SQLITE_BINDIR=$withval/bin
         else
            echo "$as_me:$LINENO: result: no" >&5
@@ -17056,15 +17176,27 @@ if test "${with_sqlite+set}" = set; then
      if test "$withval" = "yes"; then
         if test -f /usr/local/include/sqlite.h; then
            SQLITE_INCDIR=/usr/local/include
-           SQLITE_LIBDIR=/usr/local/lib
+           if test -d /usr/local/lib64; then
+              SQLITE_LIBDIR=/usr/local/lib64
+           else
+              SQLITE_LIBDIR=/usr/local/lib
+           fi
            SQLITE_BINDIR=/usr/local/bin
         elif test -f /usr/include/sqlite.h; then
            SQLITE_INCDIR=/usr/include
-           SQLITE_LIBDIR=/usr/lib
+           if test -d /usr/lib64; then
+              SQLITE_LIBDIR=/usr/lib64
+           else
+              SQLITE_LIBDIR=/usr/lib
+           fi
            SQLITE_BINDIR=/usr/bin
         elif test -f $prefix/include/sqlite.h; then
            SQLITE_INCDIR=$prefix/include
-           SQLITE_LIBDIR=$prefix/lib
+           if test -d $prefix/lib64; then
+              SQLITE_LIBDIR=$prefix/lib64
+           else
+              SQLITE_LIBDIR=$prefix/lib
+           fi
            SQLITE_BINDIR=$prefix/bin
         else
            echo "$as_me:$LINENO: result: no" >&5
@@ -17080,7 +17212,11 @@ echo "$as_me: error: Unable to find sqlite.h in standard locations" >&2;}
            SQLITE_BINDIR=$withval
         elif test -f $withval/include/sqlite.h; then
            SQLITE_INCDIR=$withval/include
-           SQLITE_LIBDIR=$withval/lib
+           if test -d $withval/lib64; then
+              SQLITE_LIBDIR=$withval/lib64
+           else
+              SQLITE_LIBDIR=$withval/lib
+           fi
            SQLITE_BINDIR=$withval/bin
         else
            echo "$as_me:$LINENO: result: no" >&5
@@ -29839,7 +29975,7 @@ if test "x${subsysdir}" = "x${sbindir}" ; then
    exit 1
 fi
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/bacula-ctl-dir scripts/bacula-ctl-fd scripts/bacula-ctl-sd scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/bacula.desktop.gnome1.consolehelper scripts/bacula.desktop.gnome2.consolehelper scripts/bacula.desktop.gnome1.xsu scripts/bacula.desktop.gnome2.xsu scripts/gnome-console.console_apps scripts/mtx-changer scripts/disk-changer scripts/dvd-handler scripts/bacula-tray-monitor.desktop scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf scripts/wxconsole.console_apps scripts/wxconsole.desktop.consolehelper scripts/wxconsole.desktop.xsu src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/gnome2-console/Makefile src/gnome2-console/gnome-console.conf src/wx-console/Makefile src/wx-console/wx-console.conf src/tray-monitor/Makefile src/tray-monitor/tray-monitor.conf src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/filed/win32/Makefile src/cats/Makefile src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite_database src/cats/update_sqlite_tables src/cats/make_sqlite_tables src/cats/grant_sqlite_privileges src/cats/drop_sqlite_tables src/cats/drop_sqlite_database src/cats/create_sqlite3_database src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables src/cats/drop_sqlite3_database src/cats/sqlite src/cats/mysql src/cats/create_bdb_database src/cats/update_bdb_tables src/cats/make_bdb_tables src/cats/grant_bdb_privileges src/cats/drop_bdb_tables src/cats/drop_bdb_database src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/findlib/Makefile src/pygtk-console/Makefile src/tools/Makefile src/win32/winbacula.nsi src/win32/baculafd/bacula-fd.conf src/win32/Makefile src/win32/Makefile.vcpp src/win32/console/bconsole.conf src/win32/wx-console/wx-console.conf src/win32/pebuilder/Makefile po/Makefile.in $PFILES"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/bacula-ctl-dir scripts/bacula-ctl-fd scripts/bacula-ctl-sd scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/bacula.desktop.gnome1.consolehelper scripts/bacula.desktop.gnome2.consolehelper scripts/bacula.desktop.gnome1.xsu scripts/bacula.desktop.gnome2.xsu scripts/gnome-console.console_apps scripts/mtx-changer scripts/disk-changer scripts/dvd-handler scripts/bacula-tray-monitor.desktop scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf scripts/wxconsole.console_apps scripts/wxconsole.desktop.consolehelper scripts/wxconsole.desktop.xsu src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/gnome2-console/Makefile src/gnome2-console/gnome-console.conf src/wx-console/Makefile src/wx-console/wx-console.conf src/tray-monitor/Makefile src/tray-monitor/tray-monitor.conf src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/cats/Makefile src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite_database src/cats/update_sqlite_tables src/cats/make_sqlite_tables src/cats/grant_sqlite_privileges src/cats/drop_sqlite_tables src/cats/drop_sqlite_database src/cats/create_sqlite3_database src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables src/cats/drop_sqlite3_database src/cats/sqlite src/cats/mysql src/cats/create_bdb_database src/cats/update_bdb_tables src/cats/make_bdb_tables src/cats/grant_bdb_privileges src/cats/drop_bdb_tables src/cats/drop_bdb_database src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/findlib/Makefile src/pygtk-console/Makefile src/tools/Makefile po/Makefile.in $PFILES"
           ac_config_commands="$ac_config_commands default"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure