[master] use mysql_config if available

4763.	[contrib]	Improve compatibility when building MySQL DLZ
			module by using mysql_config if available.
			[RT #45558]

diff --git a/CHANGES b/CHANGES
index 1fa182cffc027de398020f3b4872bafbafce5048..6b37e06ffd61ec6b0adae137896cd5950f75aeab 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+4763.  [contrib]       Improve compatibility when building MySQL DLZ
+                       module by using mysql_config if available.
+                       [RT #45558]
+
 4762.  [func]          "update-policy local" is now restricted to updates
                        from local addresses. (Previously, other addresses
                        were allowed so long as updates were signed by the

diff --git a/configure b/configure
index 8960eb0f8a7108f879acfa2dc0acd607b8c0785c..350949cbf3fd331815e07526d60628b47584b050 100755 (executable)
--- a/configure
+++ b/configure
@@ -646,12 +646,15 @@ BUILD_LDFLAGS
 BUILD_CPPFLAGS
 BUILD_CFLAGS
 BUILD_CC
+DLZ_DRIVER_MYSQL_LIBS
+DLZ_DRIVER_MYSQL_INCLUDES
 DLZ_SYSTEM_TEST
 DLZ_DRIVER_OBJS
 DLZ_DRIVER_SRCS
 DLZ_DRIVER_LIBS
 DLZ_DRIVER_INCLUDES
 CONTRIB_DLZ
+MYSQL_CONFIG
 PG_CONFIG
 SO_TARGETS
 SO_STRIP
@@ -937,6 +940,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -1100,6 +1104,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1352,6 +1357,15 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1489,7 +1503,7 @@ fi
 for ac_var in  exec_prefix prefix bindir sbindir libexecdir datarootdir \
                datadir sysconfdir sharedstatedir localstatedir includedir \
                oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-               libdir localedir mandir
+               libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1642,6 +1656,7 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -22475,6 +22490,8 @@ DLZ_DRIVER_LIBS=""
 DLZ_DRIVER_SRCS=""
 DLZ_DRIVER_OBJS=""
 DLZ_SYSTEM_TEST=""
+DLZ_DRIVER_MYSQL_INCLUDES=""
+DLZ_DRIVER_MYSQL_LIBS=""
 
 #
 # Configure support for building a shared library object
@@ -22851,10 +22868,12 @@ $as_echo "no" >&6; }
        if test -n "-I$use_dlz_postgres"
        then
                DLZ_DRIVER_INCLUDES="$DLZ_DRIVER_INCLUDES -I$use_dlz_postgres"
+               DLZ_DRIVER_POSTGRES_INCLUDES="-I$use_dlz_postgres"
        fi
        if test -n "-L$use_dlz_postgres_lib -lpq"
        then
                DLZ_DRIVER_LIBS="$DLZ_DRIVER_LIBS -L$use_dlz_postgres_lib -lpq"
+               DLZ_DRIVER_POSTGRES_LIBS="-L$use_dlz_postgres_lib -lpq"
        fi
 
 
@@ -22879,38 +22898,89 @@ else
 fi
 
 
+for ac_prog in mysql_config
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_MYSQL_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$MYSQL_CONFIG"; then
+  ac_cv_prog_MYSQL_CONFIG="$MYSQL_CONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_MYSQL_CONFIG="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+MYSQL_CONFIG=$ac_cv_prog_MYSQL_CONFIG
+if test -n "$MYSQL_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MYSQL_CONFIG" >&5
+$as_echo "$MYSQL_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$MYSQL_CONFIG" && break
+done
+
+
 mysql_include=""
 mysql_lib=""
 if test "$use_dlz_mysql" = "yes"
 then
-       # User did not specify a path - guess it
-       mysqldirs="/usr /usr/local /usr/local/mysql /usr/pkg"
-       for d in $mysqldirs
-       do
-               if test -f $d/include/mysql/mysql.h
-               then
-                       use_dlz_mysql=$d
-                       mysql_include=$d/include/mysql
-                       if test -d $d/lib/mysql
+       if test -n "$MYSQL_CONFIG"
+       then
+               mysql_include=`${MYSQL_CONFIG} --include`
+               mysql_lib=`${MYSQL_CONFIG} --libs`
+               use_dlz_mysql="config"
+
+       else
+               # User did not specify a path - guess it
+               mysqldirs="/usr /usr/local /usr/local/mysql /usr/pkg"
+               for d in $mysqldirs
+               do
+                       if test -f $d/include/mysql/mysql.h
                        then
-                               mysql_lib=$d/lib/mysql
-                       else
-                               mysql_lib=$d/lib
-                       fi
-                       break
-               elif test -f $d/include/mysql.h
-               then
-                       use_dlz_mysql=$d
-                       mysql_include=$d/include
+                               use_dlz_mysql=$d
+                               mysql_include=$d/include/mysql
                        if test -d $d/lib/mysql
-                       then
+                               then
                                mysql_lib=$d/lib/mysql
-                       else
-                               mysql_lib=$d/lib
+                               else
+                                       mysql_lib=$d/lib
+                               fi
+                               break
+                       elif test -f $d/include/mysql.h
+                       then
+                               use_dlz_mysql=$d
+                               mysql_include=$d/include
+                               if test -d $d/lib/mysql
+                               then
+                                       mysql_lib=$d/lib/mysql
+                               else
+                                       mysql_lib=$d/lib
+                               fi
+                               break
                        fi
-                       break
-               fi
-       done
+               done
+       fi
 elif test "$use_dlz_mysql" != "no"
 then
        d=$use_dlz_mysql
@@ -22947,6 +23017,29 @@ case "$use_dlz_mysql" in
                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
                ;;
+       config)
+
+       CONTRIB_DLZ="$CONTRIB_DLZ -DDLZ_MYSQL"
+       for i in dlz_mysql_driver
+       do
+               DLZ_DRIVER_SRCS="$DLZ_DRIVER_SRCS $dlzdir/$i.c"
+               DLZ_DRIVER_OBJS="$DLZ_DRIVER_OBJS $i.$O"
+       done
+       if test -n "${mysql_include}"
+       then
+               DLZ_DRIVER_INCLUDES="$DLZ_DRIVER_INCLUDES ${mysql_include}"
+               DLZ_DRIVER_MYSQL_INCLUDES="${mysql_include}"
+       fi
+       if test -n "${mysql_lib}"
+       then
+               DLZ_DRIVER_LIBS="$DLZ_DRIVER_LIBS ${mysql_lib}"
+               DLZ_DRIVER_MYSQL_LIBS="${mysql_lib}"
+       fi
+
+
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: using mysql with libs ${mysql_lib} and includes ${mysql_include}" >&5
+$as_echo "using mysql with libs ${mysql_lib} and includes ${mysql_include}" >&6; }
+               ;;
        *)
 
        CONTRIB_DLZ="$CONTRIB_DLZ -DDLZ_MYSQL"
@@ -22958,10 +23051,12 @@ $as_echo "no" >&6; }
        if test -n "-I${mysql_include}"
        then
                DLZ_DRIVER_INCLUDES="$DLZ_DRIVER_INCLUDES -I${mysql_include}"
+               DLZ_DRIVER_MYSQL_INCLUDES="-I${mysql_include}"
        fi
        if test -n "-L${mysql_lib} -lmysqlclient -lz -lcrypt -lm"
        then
                DLZ_DRIVER_LIBS="$DLZ_DRIVER_LIBS -L${mysql_lib} -lmysqlclient -lz -lcrypt -lm"
+               DLZ_DRIVER_MYSQL_LIBS="-L${mysql_lib} -lmysqlclient -lz -lcrypt -lm"
        fi
 
 
@@ -23145,10 +23240,12 @@ $as_echo "not found" >&6; }
        if test -n "$dlz_bdb_inc"
        then
                DLZ_DRIVER_INCLUDES="$DLZ_DRIVER_INCLUDES $dlz_bdb_inc"
+               DLZ_DRIVER_BDB_INCLUDES="$dlz_bdb_inc"
        fi
        if test -n "$dlz_bdb_libs"
        then
                DLZ_DRIVER_LIBS="$DLZ_DRIVER_LIBS $dlz_bdb_libs"
+               DLZ_DRIVER_BDB_LIBS="$dlz_bdb_libs"
        fi
 
 
@@ -23192,10 +23289,12 @@ $as_echo "no" >&6; }
        if test -n ""
        then
                DLZ_DRIVER_INCLUDES="$DLZ_DRIVER_INCLUDES "
+               DLZ_DRIVER_FILESYSTEM_INCLUDES=""
        fi
        if test -n ""
        then
                DLZ_DRIVER_LIBS="$DLZ_DRIVER_LIBS "
+               DLZ_DRIVER_FILESYSTEM_LIBS=""
        fi
 
                DLZ_SYSTEM_TEST=filesystem
@@ -23257,10 +23356,12 @@ $as_echo "no" >&6; }
        if test -n "-I$use_dlz_ldap/include"
        then
                DLZ_DRIVER_INCLUDES="$DLZ_DRIVER_INCLUDES -I$use_dlz_ldap/include"
+               DLZ_DRIVER_LDAP_INCLUDES="-I$use_dlz_ldap/include"
        fi
        if test -n "-L$use_dlz_ldap/lib -lldap -llber"
        then
                DLZ_DRIVER_LIBS="$DLZ_DRIVER_LIBS -L$use_dlz_ldap/lib -lldap -llber"
+               DLZ_DRIVER_LDAP_LIBS="-L$use_dlz_ldap/lib -lldap -llber"
        fi
 
 
@@ -23378,10 +23479,12 @@ $as_echo "not found" >&6; }
        if test -n "$dlz_odbc_include"
        then
                DLZ_DRIVER_INCLUDES="$DLZ_DRIVER_INCLUDES $dlz_odbc_include"
+               DLZ_DRIVER_ODBC_INCLUDES="$dlz_odbc_include"
        fi
        if test -n "$dlz_odbc_libs"
        then
                DLZ_DRIVER_LIBS="$DLZ_DRIVER_LIBS $dlz_odbc_libs"
+               DLZ_DRIVER_ODBC_LIBS="$dlz_odbc_libs"
        fi
 
 
@@ -23423,10 +23526,12 @@ $as_echo "no" >&6; }
        if test -n ""
        then
                DLZ_DRIVER_INCLUDES="$DLZ_DRIVER_INCLUDES "
+               DLZ_DRIVER_STUB_INCLUDES=""
        fi
        if test -n ""
        then
                DLZ_DRIVER_LIBS="$DLZ_DRIVER_LIBS "
+               DLZ_DRIVER_STUB_LIBS=""
        fi
 
 
@@ -23465,7 +23570,7 @@ then
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
        DLZ_DRIVER_RULES=contrib/dlz/drivers/rules
-       ac_config_files="$ac_config_files $DLZ_DRIVER_RULES"
+       ac_config_files="$ac_config_files $DLZ_DRIVER_RULES contrib/dlz/modules/mysql/Makefile contrib/dlz/modules/mysqldyn/Makefile"
 
 else
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -23481,6 +23586,8 @@ fi
 
 
 
+
+
 if test "yes" = "$cross_compiling"; then
        if test -z "$BUILD_CC"; then
                as_fn_error $? "BUILD_CC not set" "$LINENO" 5
@@ -24627,6 +24734,8 @@ do
     "atf-config") CONFIG_COMMANDS="$CONFIG_COMMANDS atf-config" ;;
     "contrib/dlz/bin/dlzbdb/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/dlz/bin/dlzbdb/Makefile" ;;
     "$DLZ_DRIVER_RULES") CONFIG_FILES="$CONFIG_FILES $DLZ_DRIVER_RULES" ;;
+    "contrib/dlz/modules/mysql/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/dlz/modules/mysql/Makefile" ;;
+    "contrib/dlz/modules/mysqldyn/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/dlz/modules/mysqldyn/Makefile" ;;
     "chmod") CONFIG_COMMANDS="$CONFIG_COMMANDS chmod" ;;
     "make/Makefile") CONFIG_FILES="$CONFIG_FILES make/Makefile" ;;
     "make/mkdep") CONFIG_FILES="$CONFIG_FILES make/mkdep" ;;

diff --git a/configure.in b/configure.in
index db3000bceaad5e455f0797afa81e1c655c82703d..bd745d14156f174abb4af8b09681ca8a05aecd82 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4944,6 +4944,8 @@ DLZ_DRIVER_LIBS=""
 DLZ_DRIVER_SRCS=""
 DLZ_DRIVER_OBJS=""
 DLZ_SYSTEM_TEST=""
+DLZ_DRIVER_MYSQL_INCLUDES=""
+DLZ_DRIVER_MYSQL_LIBS=""
 
 # 
 # Configure support for building a shared library object
@@ -5066,7 +5068,9 @@ if test -n "$CONTRIB_DLZ"
 then
        AC_MSG_RESULT(yes)
        DLZ_DRIVER_RULES=contrib/dlz/drivers/rules
-       AC_CONFIG_FILES([$DLZ_DRIVER_RULES])
+       AC_CONFIG_FILES([$DLZ_DRIVER_RULES
+               contrib/dlz/modules/mysql/Makefile
+               contrib/dlz/modules/mysqldyn/Makefile])
 else
        AC_MSG_RESULT(no)
        DLZ_DRIVER_RULES=/dev/null
@@ -5078,6 +5082,8 @@ AC_SUBST(DLZ_DRIVER_LIBS)
 AC_SUBST(DLZ_DRIVER_SRCS)
 AC_SUBST(DLZ_DRIVER_OBJS)
 AC_SUBST(DLZ_SYSTEM_TEST)
+AC_SUBST(DLZ_DRIVER_MYSQL_INCLUDES)
+AC_SUBST(DLZ_DRIVER_MYSQL_LIBS)
 AC_SUBST_FILE(DLZ_DRIVER_RULES)
 
 if test "yes" = "$cross_compiling"; then

diff --git a/contrib/dlz/config.dlz.in b/contrib/dlz/config.dlz.in
index 01f7788c644e16ac4d9b636c5d629f8bd1412178..b4d8976d65dd319f3df280c0ea08097d968fd859 100644 (file)
--- a/contrib/dlz/config.dlz.in
+++ b/contrib/dlz/config.dlz.in
@@ -38,10 +38,12 @@ AC_DEFUN(DLZ_ADD_DRIVER, [
        if test -n "$3"
        then
                DLZ_DRIVER_INCLUDES="$DLZ_DRIVER_INCLUDES $3"
+               DLZ_DRIVER_$1_INCLUDES="$3"
        fi
        if test -n "$4"
        then
                DLZ_DRIVER_LIBS="$DLZ_DRIVER_LIBS $4"
+               DLZ_DRIVER_$1_LIBS="$4"
        fi
 ])
 
@@ -128,38 +130,48 @@ AC_ARG_WITH(dlz_mysql,
                               (Required to use MySQL with DLZ)],
     use_dlz_mysql="$withval", use_dlz_mysql="no")
 
+AC_CHECK_PROGS(MYSQL_CONFIG, mysql_config)
+
 mysql_include=""
 mysql_lib=""
 if test "$use_dlz_mysql" = "yes"
 then
-       # User did not specify a path - guess it
-       mysqldirs="/usr /usr/local /usr/local/mysql /usr/pkg"
-       for d in $mysqldirs
-       do
-               if test -f $d/include/mysql/mysql.h
-               then
-                       use_dlz_mysql=$d
-                       mysql_include=$d/include/mysql
-                       if test -d $d/lib/mysql
+       if test -n "$MYSQL_CONFIG"
+       then
+               mysql_include=`${MYSQL_CONFIG} --include`
+               mysql_lib=`${MYSQL_CONFIG} --libs`
+               use_dlz_mysql="config"
+
+       else
+               # User did not specify a path - guess it
+               mysqldirs="/usr /usr/local /usr/local/mysql /usr/pkg"
+               for d in $mysqldirs
+               do
+                       if test -f $d/include/mysql/mysql.h
                        then
-                               mysql_lib=$d/lib/mysql
-                       else
-                               mysql_lib=$d/lib
-                       fi
-                       break
-               elif test -f $d/include/mysql.h
-               then
-                       use_dlz_mysql=$d
-                       mysql_include=$d/include
+                               use_dlz_mysql=$d
+                               mysql_include=$d/include/mysql
                        if test -d $d/lib/mysql
-                       then
+                               then
                                mysql_lib=$d/lib/mysql
-                       else
-                               mysql_lib=$d/lib
+                               else
+                                       mysql_lib=$d/lib
+                               fi
+                               break
+                       elif test -f $d/include/mysql.h
+                       then
+                               use_dlz_mysql=$d
+                               mysql_include=$d/include
+                               if test -d $d/lib/mysql
+                               then
+                                       mysql_lib=$d/lib/mysql
+                               else
+                                       mysql_lib=$d/lib
+                               fi
+                               break
                        fi
-                       break
-               fi
-       done
+               done
+       fi
 elif test "$use_dlz_mysql" != "no"
 then
        d=$use_dlz_mysql
@@ -195,6 +207,14 @@ case "$use_dlz_mysql" in
        no)
                AC_MSG_RESULT(no)
                ;;
+       config)
+               DLZ_ADD_DRIVER(MYSQL, dlz_mysql_driver,
+                               [${mysql_include}],
+                               [${mysql_lib}])
+
+               AC_MSG_RESULT(
+[using mysql with libs ${mysql_lib} and includes ${mysql_include}])
+               ;;
        *)
                DLZ_ADD_DRIVER(MYSQL, dlz_mysql_driver,
                                [-I${mysql_include}],

diff --git a/contrib/dlz/modules/mysql/Makefile b/contrib/dlz/modules/mysql/Makefile.in
similarity index 81%
rename from contrib/dlz/modules/mysql/Makefile
rename to contrib/dlz/modules/mysql/Makefile.in
index ad3876c08e23ab0296397fa14f1c6c3abae54aa6..5ab31be516e4d8866e4fd2f7150ab51cf2aa3be3 100644 (file)
--- a/contrib/dlz/modules/mysql/Makefile
+++ b/contrib/dlz/modules/mysql/Makefile.in
@@ -1,8 +1,8 @@
 prefix = /usr
 libdir = $(prefix)/lib/bind9
 
-CFLAGS=-fPIC -g -I../include
-MYSQL_LIBS=-lmysqlclient
+CFLAGS=-fPIC -Wall -g -I../include @DLZ_DRIVER_MYSQL_INCLUDES@
+MYSQL_LIBS=@DLZ_DRIVER_MYSQL_LIBS@
 
 all: dlz_mysql_dynamic.so
 

diff --git a/contrib/dlz/modules/mysql/testing/dlz.data b/contrib/dlz/modules/mysql/testing/dlz.data
index e0b191c78f39613557f5a122ee8814cce910a917..cef3e13a3c4aa6e9abe9d84acd0246c66dfa0804 100644 (file)
--- a/contrib/dlz/modules/mysql/testing/dlz.data
+++ b/contrib/dlz/modules/mysql/testing/dlz.data
@@ -1,11 +1,12 @@
 use BindDB;
 INSERT INTO `records` (`id`, `zone`, `ttl`, `type`, `host`, `mx_priority`, `data`, `primary_ns`, `resp_contact`, `serial`, `refresh`, `retry`, `expire`, `minimum`) VALUES
-('', 'example.com', 86400, 'SOA', '@', NULL, NULL, 'ns1.example.com.', 'info.example.com.', 2011043001, 10800, 7200, 604800, 86400),
-('', 'example.com', 86400, 'NS', '@', NULL, 'ns1.example.com.', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-('', 'example.com', 86400, 'NS', '@', NULL, 'ns2.example.com.', NULL, NULL, NULL, NULL, NULL, NULL, NULL), ('', 'example.com', 86400, 'MX', '@',
-10, 'mail.example.com.', NULL, NULL, NULL, NULL, NULL, NULL, NULL), ('', 'example.com', 86400, 'A', '@', NULL, '192.168.0.2', NULL, NULL,
-NULL, NULL, NULL, NULL, NULL), ('', 'example.com', 86400, 'CNAME', 'www', NULL, '@', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-('', 'example.com', 86400, 'A', 'ns1', NULL, '192.168.0.111', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-('', 'example.com', 86400, 'A', 'ns2', NULL, '192.168.0.222', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-('', 'example.com', 86400, 'A', 'mail', NULL, '192.168.0.3', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-('', 'example.com', 86400, 'TXT', '@', NULL, 'v=spf1 ip:192.168.0.3 ~all', NULL, NULL, NULL, NULL, NULL, NULL, NULL)
+(1, 'example.com', 86400, 'SOA', '@', NULL, NULL, 'ns1.example.com.', 'info.example.com.', 2011043001, 10800, 7200, 604800, 86400),
+(2, 'example.com', 86400, 'NS', '@', NULL, 'ns1.example.com.', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(3, 'example.com', 86400, 'NS', '@', NULL, 'ns2.example.com.', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(4, 'example.com', 86400, 'MX', '@', 10, 'mail.example.com.', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(5, 'example.com', 86400, 'A', '@', NULL, '192.168.0.2', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(6, 'example.com', 86400, 'CNAME', 'www', NULL, '@', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(7, 'example.com', 86400, 'A', 'ns1', NULL, '192.168.0.111', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(8, 'example.com', 86400, 'A', 'ns2', NULL, '192.168.0.222', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(9, 'example.com', 86400, 'A', 'mail', NULL, '192.168.0.3', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(10, 'example.com', 86400, 'TXT', '@', NULL, 'v=spf1 ip:192.168.0.3 ~all', NULL, NULL, NULL, NULL, NULL, NULL, NULL)

diff --git a/contrib/dlz/modules/mysqldyn/Makefile b/contrib/dlz/modules/mysqldyn/Makefile.in
similarity index 81%
rename from contrib/dlz/modules/mysqldyn/Makefile
rename to contrib/dlz/modules/mysqldyn/Makefile.in
index bba91afc35b4a6c27c632a0fb504d147880bce58..248e3dafecedef0f673583fd2b9d10a1e02cc33e 100644 (file)
--- a/contrib/dlz/modules/mysqldyn/Makefile
+++ b/contrib/dlz/modules/mysqldyn/Makefile.in
@@ -1,8 +1,8 @@
 prefix = /usr
 libdir = $(prefix)/lib/bind9
 
-CFLAGS=-fPIC -Wall -g -I../include
-MYSQL_LIBS=-lmysqlclient
+CFLAGS=-fPIC -Wall -g -I../include @DLZ_DRIVER_MYSQL_INCLUDES@
+MYSQL_LIBS=@DLZ_DRIVER_MYSQL_LIBS@
 
 all: dlz_mysqldyn_mod.so