Only add modules/pdb_xml.so and modules/pdb_mysql.so to the 'modules' target if

the libs they depend on are available
(This used to be commit 018a44055d6a8435528279523567f9a86b2f3069)

3 files changed, 13 insertions, 9 deletions

diff --git a/source3/Makefile.in b/source3/Makefile.in
index a43ea93908..8538bd56d6 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -116,7 +116,7 @@ SCRIPTS = $(srcdir)/script/smbtar $(srcdir)/script/addtosmbpass $(srcdir)/script
 
 QUOTAOBJS=@QUOTAOBJS@
 
-MODULES = bin/vfs_audit.so bin/vfs_recycle.so bin/vfs_netatalk.so
+MODULES = bin/vfs_audit.so bin/vfs_recycle.so bin/vfs_netatalk.so @MODULE_PDB_MYSQL@ @MODULE_PDB_XML@
 
 ######################################################################
 # object file lists
diff --git a/source3/configure b/source3/configure
index 8d160b87b3..964b3d5dba 100755
--- a/source3/configure
+++ b/source3/configure
@@ -306,7 +306,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS configdir lockdir piddir logfilebase privatedir swatdir RUNPROG MPROGS LDSHFLAGS SONAMEFLAG SHLD HOST_OS PAM_MOD WRAP WRAP32 WRAPPROG PICFLAG PICSUFFIX POBAD_CC SHLIBEXT LIBSMBCLIENT_SHARED LIBSMBCLIENT PRINTLIBS AUTHLIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK BROKEN_CC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CPP EGREP CUPS_CONFIG LIBOBJS TERMLIBS TERMLDFLAGS ROFF DYNEXP MYSQL_CONFIG MYSQL_CFLAGS MYSQL_LIBS XML2_CONFIG XML_CFLAGS XML_LIBS QUOTAOBJS manlangs WINBIND_TARGETS WINBIND_STARGETS WINBIND_LTARGETS WINBIND_PAM_TARGETS WINBIND_NSS_EXTRA_OBJS WINBIND_NSS_EXTRA_LIBS BUILD_POPT FLAGS1 PYTHON builddir LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS configdir lockdir piddir logfilebase privatedir swatdir RUNPROG MPROGS LDSHFLAGS SONAMEFLAG SHLD HOST_OS PAM_MOD WRAP WRAP32 WRAPPROG PICFLAG PICSUFFIX POBAD_CC SHLIBEXT LIBSMBCLIENT_SHARED LIBSMBCLIENT PRINTLIBS AUTHLIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK BROKEN_CC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CPP EGREP CUPS_CONFIG LIBOBJS TERMLIBS TERMLDFLAGS ROFF DYNEXP MYSQL_CONFIG MYSQL_CFLAGS MYSQL_LIBS MODULE_PDB_MYSQL XML2_CONFIG XML_CFLAGS XML_LIBS MODULE_PDB_XML QUOTAOBJS manlangs WINBIND_TARGETS WINBIND_STARGETS WINBIND_LTARGETS WINBIND_PAM_TARGETS WINBIND_NSS_EXTRA_OBJS WINBIND_NSS_EXTRA_LIBS BUILD_POPT FLAGS1 PYTHON builddir LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -20360,7 +20360,7 @@ fi
   if test "x$no_mysql" = x ; then
      echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-     :
+     MODULE_PDB_MYSQL=bin/pdb_mysql.so
   else
      echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
@@ -20432,7 +20432,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
      fi
      MYSQL_CFLAGS=""
      MYSQL_LIBS=""
-     :
+     MODULE_PDB_MYSQL=
   fi
 
 
@@ -20654,7 +20654,7 @@ fi
   if test "x$no_xml" = x ; then
      echo "$as_me:$LINENO: result: yes (version $xml_config_major_version.$xml_config_minor_version.$xml_config_micro_version)" >&5
 echo "${ECHO_T}yes (version $xml_config_major_version.$xml_config_minor_version.$xml_config_micro_version)" >&6
-     :
+     MODULE_PDB_XML=bin/pdb_xml.so
   else
      echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
@@ -20722,7 +20722,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
      XML_CFLAGS=""
      XML_LIBS=""
-     :
+     MODULE_PDB_XML=
   fi
 
 
@@ -20730,6 +20730,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 CFLAGS="$CFLAGS $XML_CFLAGS"
 
+
 #################################################
 # check for automount support
 echo "$as_me:$LINENO: checking whether to use AUTOMOUNT" >&5
@@ -23963,9 +23964,11 @@ s,@DYNEXP@,$DYNEXP,;t t
 s,@MYSQL_CONFIG@,$MYSQL_CONFIG,;t t
 s,@MYSQL_CFLAGS@,$MYSQL_CFLAGS,;t t
 s,@MYSQL_LIBS@,$MYSQL_LIBS,;t t
+s,@MODULE_PDB_MYSQL@,$MODULE_PDB_MYSQL,;t t
 s,@XML2_CONFIG@,$XML2_CONFIG,;t t
 s,@XML_CFLAGS@,$XML_CFLAGS,;t t
 s,@XML_LIBS@,$XML_LIBS,;t t
+s,@MODULE_PDB_XML@,$MODULE_PDB_XML,;t t
 s,@QUOTAOBJS@,$QUOTAOBJS,;t t
 s,@manlangs@,$manlangs,;t t
 s,@WINBIND_TARGETS@,$WINBIND_TARGETS,;t t
diff --git a/source3/configure.in b/source3/configure.in
index 3a01239dd1..7818f2f0c6 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -2085,14 +2085,15 @@ fi
 
 ########################################################
 # Compile with MySQL support?
-AM_PATH_MYSQL()
+AM_PATH_MYSQL([0.11.0],[MODULE_PDB_MYSQL=bin/pdb_mysql.so],[MODULE_PDB_MYSQL=])
 CFLAGS="$CFLAGS $MYSQL_CFLAGS"
-
+AC_SUBST(MODULE_PDB_MYSQL)
 
 ########################################################
 # Compile with XML support?
-AM_PATH_XML2()
+AM_PATH_XML2([2.0.0],[MODULE_PDB_XML=bin/pdb_xml.so],[MODULE_PDB_XML=])
 CFLAGS="$CFLAGS $XML_CFLAGS"
+AC_SUBST(MODULE_PDB_XML)
 
 #################################################
 # check for automount support