Remove broke MySQL library detection + cleanup

diff --git a/bacula/autoconf/acconfig.h b/bacula/autoconf/acconfig.h
index d655307d64e990b1423b59155ae7d925808efb3d..c60296ab6372409134635f6c55a49679907ea064 100644 (file)
--- a/bacula/autoconf/acconfig.h
+++ b/bacula/autoconf/acconfig.h
@@ -26,9 +26,6 @@
 /* Define if you want to use MySQL */
 #undef HAVE_MYSQL
 
-/* Defined if MySQL thread safe library is present */
-#undef HAVE_THREAD_SAFE_MYSQL
-
 /* Define if you want to use embedded MySQL */
 #undef HAVE_EMBEDDED_MYSQL
 
@@ -207,4 +204,3 @@
 
 /* Define if language support is enabled */
 #undef ENABLE_NLS
-

diff --git a/bacula/autoconf/bacula-macros/db.m4 b/bacula/autoconf/bacula-macros/db.m4
index 7ef55517d615fa28923eab798de5e2b53d50c539..0055e220c7d99998e6ed027402271153392ce300 100644 (file)
--- a/bacula/autoconf/bacula-macros/db.m4
+++ b/bacula/autoconf/bacula-macros/db.m4
@@ -325,18 +325,22 @@ AC_HELP_STRING([--with-mysql@<:@=DIR@:>@], [Include MySQL support. DIR is the My
 [
   if test "$withval" != "no"; then
         if test "$withval" = "yes"; then
-           MYSQL_CONFIG=`which mysql_config 2>/dev/null`
-           if test "x${MYSQL_CONFIG}" != x; then
-              MYSQL_BINDIR="${MYSQL_CONFIG%/*}"
-              ${MYSQL_CONFIG} --variable=pkglibdir > /dev/null 2>&1
-              if test $? = 0 ; then
-                 MYSQL_LIBDIR=`${MYSQL_CONFIG} --variable=pkglibdir`
-                 MYSQL_INCDIR=`${MYSQL_CONFIG} --variable=pkgincludedir`
-              else
-                 MYSQL_LIBDIR=`${MYSQL_CONFIG} --libs | sed -e 's/.*-L//' -e 's/ .*//'`
-                 MYSQL_INCDIR=`${MYSQL_CONFIG} --include | sed -e 's/-I//'`
-              fi
-           elif test -f /usr/local/mysql/include/mysql/mysql.h; then
+#
+# This code is very broken on older systems
+#
+#           MYSQL_CONFIG=`which mysql_config 2>/dev/null`
+#           if test "x${MYSQL_CONFIG}" != x; then
+#              MYSQL_BINDIR="${MYSQL_CONFIG%/*}"
+#              ${MYSQL_CONFIG} --variable=pkglibdir > /dev/null 2>&1
+#              if test $? = 0 ; then
+#                 MYSQL_LIBDIR=`${MYSQL_CONFIG} --variable=pkglibdir`
+#                 MYSQL_INCDIR=`${MYSQL_CONFIG} --variable=pkgincludedir`
+#              else
+#                 MYSQL_LIBDIR=`${MYSQL_CONFIG} --libs | sed -e 's/.*-L//' -e 's/ .*//'`
+#                 MYSQL_INCDIR=`${MYSQL_CONFIG} --include | sed -e 's/-I//'`
+#              fi
+#           elif test -f /usr/local/mysql/include/mysql/mysql.h; then
+           if test -f /usr/local/mysql/include/mysql/mysql.h; then
               MYSQL_INCDIR=/usr/local/mysql/include/mysql
               if test -f /usr/local/mysql/lib64/mysql/libmysqlclient_r.a \
                       -o -f /usr/local/mysql/lib64/mysql/libmysqlclient_r.so; then
@@ -432,7 +436,6 @@ AC_HELP_STRING([--with-mysql@<:@=DIR@:>@], [Include MySQL support. DIR is the My
         else
            MYSQL_LIBS="-L$MYSQL_LIBDIR -lmysqlclient_r -lz"
         fi
-        AC_DEFINE(HAVE_THREAD_SAFE_MYSQL, 1, [Set if Thread Safe MySQL can be checked using mysql_thread_safe])
         DB_LIBS="${DB_LIBS} ${MYSQL_LIBS}"
      fi
      MYSQL_LIB=$MYSQL_LIBDIR/libmysqlclient_r.a

diff --git a/bacula/autoconf/config.h.in b/bacula/autoconf/config.h.in
index 4d0a5f981c6c900831d1bcc3acdfe81021df0361..dc367ddcc92eaa1af21538d5d2c0ad237c7fc4c6 100644 (file)
--- a/bacula/autoconf/config.h.in
+++ b/bacula/autoconf/config.h.in
@@ -27,9 +27,6 @@
 /* Define if you want to use MySQL */
 #undef HAVE_MYSQL
 
-/* Defined if MySQL thread safe library is present */
-#undef HAVE_THREAD_SAFE_MYSQL
-
 /* Define if you want to use embedded MySQL */
 #undef HAVE_EMBEDDED_MYSQL
 
@@ -208,7 +205,6 @@
 /* Define if language support is enabled */
 #undef ENABLE_NLS
 
-
 /* Define if building universal (internal helper macro) */
 #undef AC_APPLE_UNIVERSAL_BUILD
 
@@ -881,9 +877,6 @@
 /* Define to 1 if you have the <term.h> header file. */
 #undef HAVE_TERM_H
 
-/* Set if Thread Safe MySQL can be checked using mysql_thread_safe */
-#undef HAVE_THREAD_SAFE_MYSQL
-
 /* Define if TLS support should be enabled */
 #undef HAVE_TLS
 

diff --git a/bacula/autoconf/config.h.in.save b/bacula/autoconf/config.h.in.save
index 3590d47c0eb1ca3e433f3289f3e70a824b912215..ecafd61b20e64ec9cae4930837b8943d20bdc4b0 100644 (file)
--- a/bacula/autoconf/config.h.in.save
+++ b/bacula/autoconf/config.h.in.save
@@ -27,8 +27,8 @@
 /* Define if you want to use MySQL */
 #undef HAVE_MYSQL
 
-/* Defined if MySQL thread safe library is present */
-#undef HAVE_THREAD_SAFE_MYSQL
+/* Set if have entrypoint mysql_thread_safe */
+#undef HAVE_MYSQL_THREAD_SAFE
 
 /* Define if you want to use embedded MySQL */
 #undef HAVE_EMBEDDED_MYSQL
@@ -53,7 +53,7 @@
 #undef HAVE_GCC
 
 /* Define if you have the Andrew File System.  */
-#undef HAVE_AFS
+#undef AFS
 
 /* Define If you want find -nouser and -nogroup to make tables of
    used UIDs and GIDs at startup instead of using getpwuid or
@@ -114,9 +114,15 @@
 /* Define if you have zlib */
 #undef HAVE_LIBZ
 
+/* Define if you have lzo lib */
+#undef HAVE_LZO
+
 /* Define if you have libacl */
 #undef HAVE_ACL
 
+/* Define if you have AFS acls */
+#undef HAVE_AFS_ACL
+
 /* General libs */
 #undef LIBS
 
@@ -202,6 +208,13 @@
 /* Define if language support is enabled */
 #undef ENABLE_NLS
 
+
+/* Define if building universal (internal helper macro) */
+#undef AC_APPLE_UNIVERSAL_BUILD
+
+/* Set if ***BEEF*** DEMO code enabled */
+#undef BEEF_DEMO_ENABLED
+
 /* Define to 1 if the `closedir' function returns void instead of `int'. */
 #undef CLOSEDIR_VOID
 
@@ -220,6 +233,27 @@
 /* Normal acl support */
 #undef HAVE_ACL
 
+/* Defines if your system have the ACL_TYPE_DEFAULT_DIR acl type */
+#undef HAVE_ACL_TYPE_DEFAULT_DIR
+
+/* Defines if your system have the ACL_TYPE_EXTENDED acl type */
+#undef HAVE_ACL_TYPE_EXTENDED
+
+/* Defines if your system have the ACL_TYPE_NFS4 acl type */
+#undef HAVE_ACL_TYPE_NFS4
+
+/* Define to 1 if you have the 'add_proplist_entry' function. */
+#undef HAVE_ADD_PROPLIST_ENTRY
+
+/* Define to 1 if your system has AFS support */
+#undef HAVE_AFS
+
+/* Andrew FileSystem ACL support */
+#undef HAVE_AFS_ACL
+
+/* Define to 1 if you have the <afs/stds.h> header file. */
+#undef HAVE_AFS_STDS_H
+
 /* Define to 1 if you have `alloca', as a function or macro. */
 #undef HAVE_ALLOCA
 
@@ -242,9 +276,15 @@
 /* Defines if your system have the attr.h header file */
 #undef HAVE_ATTR_H
 
+/* Define to 1 if you have the `backtrace' function. */
+#undef HAVE_BACKTRACE
+
 /* Set if Bacula bat Qt4 GUI support enabled */
 #undef HAVE_BAT
 
+/* Big Endian */
+#undef HAVE_BIG_ENDIAN
+
 /* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
    CoreFoundation framework. */
 #undef HAVE_CFLOCALECOPYCURRENT
@@ -265,12 +305,6 @@
 /* Define to 1 if you have the <curses.h> header file. */
 #undef HAVE_CURSES_H
 
-/* Set if you have the DBI driver */
-#undef HAVE_DBI
-
-/* Set if DBI DB batch insert code enabled */
-#undef HAVE_DBI_BATCH_FILE_INSERT
-
 /* Define if the GNU dcgettext() function is already present or preinstalled.
    */
 #undef HAVE_DCGETTEXT
@@ -309,6 +343,9 @@
 /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
 #undef HAVE_DOPRNT
 
+/* Set if you have an Embedded MySQL Database */
+#undef HAVE_EMBEDDED_MYSQL
+
 /* Define to 1 if you have the 'extattr_get_file' function. */
 #undef HAVE_EXTATTR_GET_FILE
 
@@ -336,9 +373,6 @@
 /* Extended acl support */
 #undef HAVE_EXTENDED_ACL
 
-/* AFS ACL support */
-#undef HAVE_AFS_ACL
-
 /* Define to 1 if you have the `fchdir' function. */
 #undef HAVE_FCHDIR
 
@@ -369,6 +403,9 @@
 /* Define to 1 if you have the `getcwd' function. */
 #undef HAVE_GETCWD
 
+/* Define to 1 if you have the 'getea' function. */
+#undef HAVE_GETEA
+
 /* Define to 1 if you have the `getegid' function. */
 #undef HAVE_GETEGID
 
@@ -393,12 +430,18 @@
 /* Define to 1 if you have the `getmntent' function. */
 #undef HAVE_GETMNTENT
 
-/* Define to 1 if you have the `getpagesize' function. */
+/* Define to 1 if you have the `getmntinfo' function. */
+#undef HAVE_GETMNTINFO
+
+/* Set if have getpagesize */
 #undef HAVE_GETPAGESIZE
 
 /* Define to 1 if you have the `getpid' function. */
 #undef HAVE_GETPID
 
+/* Define to 1 if you have the 'getproplist' function. */
+#undef HAVE_GETPROPLIST
+
 /* Define if the GNU gettext() function is already present or preinstalled. */
 #undef HAVE_GETTEXT
 
@@ -411,6 +454,9 @@
 /* Define to 1 if you have the 'getxattr' function. */
 #undef HAVE_GETXATTR
 
+/* Define to 1 if you have the 'get_proplist_entry' function. */
+#undef HAVE_GET_PROPLIST_ENTRY
+
 /* Define to 1 if you have the <grp.h> header file. */
 #undef HAVE_GRP_H
 
@@ -426,9 +472,6 @@
 /* Define to 1 if you have the `inet_pton' function. */
 #undef HAVE_INET_PTON
 
-/* Set if have Ingres Database */
-#undef HAVE_INGRES
-
 /* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */
 #undef HAVE_INTMAX_T
 
@@ -457,6 +500,9 @@
 /* Define if your <locale.h> file defines LC_MESSAGES. */
 #undef HAVE_LC_MESSAGES
 
+/* Define to 1 if you have the 'lgetea' function. */
+#undef HAVE_LGETEA
+
 /* Define to 1 if you have the 'lgetxattr' function. */
 #undef HAVE_LGETXATTR
 
@@ -496,9 +542,18 @@
 /* Define to 1 if you have the <limits.h> header file. */
 #undef HAVE_LIMITS_H
 
+/* Define to 1 if you have the 'listea' function. */
+#undef HAVE_LISTEA
+
 /* Define to 1 if you have the 'listxattr' function. */
 #undef HAVE_LISTXATTR
 
+/* Little Endian */
+#undef HAVE_LITTLE_ENDIAN
+
+/* Define to 1 if you have the 'llistea' function. */
+#undef HAVE_LLISTEA
+
 /* Define to 1 if you have the 'llistxattr' function. */
 #undef HAVE_LLISTXATTR
 
@@ -514,15 +569,24 @@
 /* Define if you have the 'long long' type. */
 #undef HAVE_LONG_LONG
 
+/* Define to 1 if you have the 'lsetea' function. */
+#undef HAVE_LSETEA
+
 /* Define to 1 if you have the 'lsetxattr' function. */
 #undef HAVE_LSETXATTR
 
 /* Define to 1 if you have the `lstat' function. */
 #undef HAVE_LSTAT
 
+/* Define to 1 if you have LZO compression */
+#undef HAVE_LZO
+
 /* Define to 1 if you have the <malloc.h> header file. */
 #undef HAVE_MALLOC_H
 
+/* Set if have malloc_trim */
+#undef HAVE_MALLOC_TRIM
+
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
@@ -538,12 +602,6 @@
 /* Define to 1 if you have the `munmap' function. */
 #undef HAVE_MUNMAP
 
-/* Set if you have an MySQL Database */
-#undef HAVE_MYSQL
-
-/* Set if have mysql_thread_safe */
-#undef HAVE_MYSQL_THREAD_SAFE
-
 /* Define to 1 if you have the `nanosleep' function. */
 #undef HAVE_NANOSLEEP
 
@@ -577,6 +635,9 @@
 /* Define if your printf() function supports format strings with positions. */
 #undef HAVE_POSIX_PRINTF
 
+/* Set if you have an PostgreSQL Database */
+#undef HAVE_POSTGRESQL
+
 /* Set if PostgreSQL DB batch insert code enabled */
 #undef HAVE_POSTGRESQL_BATCH_FILE_INSERT
 
@@ -610,6 +671,9 @@
 /* Define to 1 if you have the `select' function. */
 #undef HAVE_SELECT
 
+/* Define to 1 if you have the 'setea' function. */
+#undef HAVE_SETEA
+
 /* Define to 1 if you have the `setenv' function. */
 #undef HAVE_SETENV
 
@@ -622,6 +686,9 @@
 /* Define to 1 if you have the `setpgrp' function. */
 #undef HAVE_SETPGRP
 
+/* Define to 1 if you have the 'setproplist' function. */
+#undef HAVE_SETPROPLIST
+
 /* Define to 1 if you have the `setreuid' function. */
 #undef HAVE_SETREUID
 
@@ -637,12 +704,18 @@
 /* Define to 1 if you have the `signal' function. */
 #undef HAVE_SIGNAL
 
+/* Define to 1 if you have the 'sizeof_proplist_entry' function. */
+#undef HAVE_SIZEOF_PROPLIST_ENTRY
+
 /* Define to 1 if you have the `snprintf' function. */
 #undef HAVE_SNPRINTF
 
 /* Set if socklen_t exists */
 #undef HAVE_SOCKLEN_T
 
+/* Set if you have an SQLite3 Database */
+#undef HAVE_SQLITE3
+
 /* Set if have sqlite3_threadsafe */
 #undef HAVE_SQLITE3_THREADSAFE
 
@@ -698,16 +771,16 @@
 /* Define to 1 if you have the `strtoul' function. */
 #undef HAVE_STRTOUL
 
-/* Define to 1 if `st_blksize' is member of `struct stat'. */
+/* Define to 1 if `st_blksize' is a member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_BLKSIZE
 
-/* Define to 1 if `st_blocks' is member of `struct stat'. */
+/* Define to 1 if `st_blocks' is a member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_BLOCKS
 
-/* Define to 1 if `st_rdev' is member of `struct stat'. */
+/* Define to 1 if `st_rdev' is a member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_RDEV
 
-/* Define to 1 if `tm_zone' is member of `struct tm'. */
+/* Define to 1 if `tm_zone' is a member of `struct tm'. */
 #undef HAVE_STRUCT_TM_TM_ZONE
 
 /* Define to 1 if your `struct stat' has `st_blksize'. Deprecated, use
@@ -722,6 +795,9 @@
    `HAVE_STRUCT_STAT_ST_RDEV' instead. */
 #undef HAVE_ST_RDEV
 
+/* Define to 1 if systemd support should be enabled */
+#undef HAVE_SYSTEMD
+
 /* Defines if your system have the sys/acl.h header file */
 #undef HAVE_SYS_ACL_H
 
@@ -741,6 +817,9 @@
    */
 #undef HAVE_SYS_DIR_H
 
+/* Defines if your system have the sys/ea.h header file */
+#undef HAVE_SYS_EA_H
+
 /* Defines if your system have the sys/extattr.h header file */
 #undef HAVE_SYS_EXTATTR_H
 
@@ -763,6 +842,9 @@
 /* Define to 1 if you have the <sys/prctl.h> header file. */
 #undef HAVE_SYS_PRCTL_H
 
+/* Defines if your system have the sys/proplist.h header file */
+#undef HAVE_SYS_PROPLIST_H
+
 /* Define to 1 if you have the <sys/select.h> header file. */
 #undef HAVE_SYS_SELECT_H
 
@@ -915,6 +997,9 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
@@ -955,9 +1040,9 @@
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
    automatically deduced at runtime.
-       STACK_DIRECTION > 0 => grows toward higher addresses
-       STACK_DIRECTION < 0 => grows toward lower addresses
-       STACK_DIRECTION = 0 => direction of growth unknown */
+        STACK_DIRECTION > 0 => grows toward higher addresses
+        STACK_DIRECTION < 0 => grows toward lower addresses
+        STACK_DIRECTION = 0 => direction of growth unknown */
 #undef STACK_DIRECTION
 
 /* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
@@ -975,6 +1060,18 @@
 /* Set if DB batch insert code enabled */
 #undef USE_BATCH_FILE_INSERT
 
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+#  undef WORDS_BIGENDIAN
+# endif
+#endif
+
 /* Define to 1 if the X Window System is missing or not being used. */
 #undef X_DISPLAY_MISSING
 

diff --git a/bacula/configure b/bacula/configure
index 71a1c59d917afdf8df798837dd64fdfbb64c39f4..f2e8aa83d42692378dcdf31089b3591ff87f87de 100755 (executable)
--- a/bacula/configure
+++ b/bacula/configure
@@ -23967,18 +23967,22 @@ if test "${with_mysql+set}" = set; then :
   withval=$with_mysql;
   if test "$withval" != "no"; then
         if test "$withval" = "yes"; then
-           MYSQL_CONFIG=`which mysql_config 2>/dev/null`
-           if test "x${MYSQL_CONFIG}" != x; then
-              MYSQL_BINDIR="${MYSQL_CONFIG%/*}"
-              ${MYSQL_CONFIG} --variable=pkglibdir > /dev/null 2>&1
-              if test $? = 0 ; then
-                 MYSQL_LIBDIR=`${MYSQL_CONFIG} --variable=pkglibdir`
-                 MYSQL_INCDIR=`${MYSQL_CONFIG} --variable=pkgincludedir`
-              else
-                 MYSQL_LIBDIR=`${MYSQL_CONFIG} --libs | sed -e 's/.*-L//' -e 's/ .*//'`
-                 MYSQL_INCDIR=`${MYSQL_CONFIG} --include | sed -e 's/-I//'`
-              fi
-           elif test -f /usr/local/mysql/include/mysql/mysql.h; then
+#
+# This code is very broken on older systems
+#
+#           MYSQL_CONFIG=`which mysql_config 2>/dev/null`
+#           if test "x${MYSQL_CONFIG}" != x; then
+#              MYSQL_BINDIR="${MYSQL_CONFIG%/*}"
+#              ${MYSQL_CONFIG} --variable=pkglibdir > /dev/null 2>&1
+#              if test $? = 0 ; then
+#                 MYSQL_LIBDIR=`${MYSQL_CONFIG} --variable=pkglibdir`
+#                 MYSQL_INCDIR=`${MYSQL_CONFIG} --variable=pkgincludedir`
+#              else
+#                 MYSQL_LIBDIR=`${MYSQL_CONFIG} --libs | sed -e 's/.*-L//' -e 's/ .*//'`
+#                 MYSQL_INCDIR=`${MYSQL_CONFIG} --include | sed -e 's/-I//'`
+#              fi
+#           elif test -f /usr/local/mysql/include/mysql/mysql.h; then
+           if test -f /usr/local/mysql/include/mysql/mysql.h; then
               MYSQL_INCDIR=/usr/local/mysql/include/mysql
               if test -f /usr/local/mysql/lib64/mysql/libmysqlclient_r.a \
                       -o -f /usr/local/mysql/lib64/mysql/libmysqlclient_r.so; then
@@ -24076,9 +24080,6 @@ $as_echo "no" >&6; }
         else
            MYSQL_LIBS="-L$MYSQL_LIBDIR -lmysqlclient_r -lz"
         fi
-
-$as_echo "#define HAVE_THREAD_SAFE_MYSQL 1" >>confdefs.h
-
         DB_LIBS="${DB_LIBS} ${MYSQL_LIBS}"
      fi
      MYSQL_LIB=$MYSQL_LIBDIR/libmysqlclient_r.a