lbalhar / rpms / bind

Forked from rpms/bind 6 years ago
Clone
43f0ac7
diff --git a/configure.in b/configure.in
43f0ac7
index 0bde24d..3272e8e 100644
43f0ac7
--- a/configure.in
43f0ac7
+++ b/configure.in
43f0ac7
@@ -4813,6 +4813,8 @@ DLZ_DRIVER_LIBS=""
43f0ac7
 DLZ_DRIVER_SRCS=""
43f0ac7
 DLZ_DRIVER_OBJS=""
43f0ac7
 DLZ_SYSTEM_TEST=""
43f0ac7
+DLZ_DRIVER_MYSQL_INCLUDES=""
43f0ac7
+DLZ_DRIVER_MYSQL_LIBS=""
43f0ac7
 
43f0ac7
 # 
43f0ac7
 # Configure support for building a shared library object
43f0ac7
@@ -4935,7 +4937,9 @@ if test -n "$CONTRIB_DLZ"
43f0ac7
 then
43f0ac7
 	AC_MSG_RESULT(yes)
43f0ac7
 	DLZ_DRIVER_RULES=contrib/dlz/drivers/rules
43f0ac7
-	AC_CONFIG_FILES([$DLZ_DRIVER_RULES])
43f0ac7
+	AC_CONFIG_FILES([$DLZ_DRIVER_RULES
43f0ac7
+		contrib/dlz/modules/mysql/Makefile
43f0ac7
+		contrib/dlz/modules/mysqldyn/Makefile])
43f0ac7
 else
43f0ac7
 	AC_MSG_RESULT(no)
43f0ac7
 	DLZ_DRIVER_RULES=/dev/null
43f0ac7
@@ -4947,6 +4951,8 @@ AC_SUBST(DLZ_DRIVER_LIBS)
43f0ac7
 AC_SUBST(DLZ_DRIVER_SRCS)
43f0ac7
 AC_SUBST(DLZ_DRIVER_OBJS)
43f0ac7
 AC_SUBST(DLZ_SYSTEM_TEST)
43f0ac7
+AC_SUBST(DLZ_DRIVER_MYSQL_INCLUDES)
43f0ac7
+AC_SUBST(DLZ_DRIVER_MYSQL_LIBS)
43f0ac7
 AC_SUBST_FILE(DLZ_DRIVER_RULES)
43f0ac7
 
43f0ac7
 if test "yes" = "$cross_compiling"; then
43f0ac7
diff --git a/contrib/dlz/config.dlz.in b/contrib/dlz/config.dlz.in
43f0ac7
index db8af01..8a13306 100644
43f0ac7
--- a/contrib/dlz/config.dlz.in
43f0ac7
+++ b/contrib/dlz/config.dlz.in
43f0ac7
@@ -45,10 +45,12 @@ AC_DEFUN(DLZ_ADD_DRIVER, [
43f0ac7
 	if test -n "$3"
43f0ac7
 	then
43f0ac7
 		DLZ_DRIVER_INCLUDES="$DLZ_DRIVER_INCLUDES $3"
43f0ac7
+		DLZ_DRIVER_$1_INCLUDES="$3"
43f0ac7
 	fi
43f0ac7
 	if test -n "$4"
43f0ac7
 	then
43f0ac7
 		DLZ_DRIVER_LIBS="$DLZ_DRIVER_LIBS $4"
43f0ac7
+		DLZ_DRIVER_$1_LIBS="$4"
43f0ac7
 	fi
43f0ac7
 ])
43f0ac7
 
43f0ac7
diff --git a/contrib/dlz/modules/mysql/Makefile b/contrib/dlz/modules/mysql/Makefile.in
43f0ac7
similarity index 81%
43f0ac7
rename from contrib/dlz/modules/mysql/Makefile
43f0ac7
rename to contrib/dlz/modules/mysql/Makefile.in
43f0ac7
index ad3876c..5ab31be 100644
43f0ac7
--- a/contrib/dlz/modules/mysql/Makefile
43f0ac7
+++ b/contrib/dlz/modules/mysql/Makefile.in
43f0ac7
@@ -1,8 +1,8 @@
43f0ac7
 prefix = /usr
43f0ac7
 libdir = $(prefix)/lib/bind9
43f0ac7
 
43f0ac7
-CFLAGS=-fPIC -g -I../include
43f0ac7
-MYSQL_LIBS=-lmysqlclient
43f0ac7
+CFLAGS=-fPIC -Wall -g -I../include @DLZ_DRIVER_MYSQL_INCLUDES@
43f0ac7
+MYSQL_LIBS=@DLZ_DRIVER_MYSQL_LIBS@
43f0ac7
 
43f0ac7
 all: dlz_mysql_dynamic.so
43f0ac7
 
43f0ac7
diff --git a/contrib/dlz/modules/mysqldyn/Makefile b/contrib/dlz/modules/mysqldyn/Makefile.in
43f0ac7
similarity index 81%
43f0ac7
rename from contrib/dlz/modules/mysqldyn/Makefile
43f0ac7
rename to contrib/dlz/modules/mysqldyn/Makefile.in
43f0ac7
index bba91af..248e3da 100644
43f0ac7
--- a/contrib/dlz/modules/mysqldyn/Makefile
43f0ac7
+++ b/contrib/dlz/modules/mysqldyn/Makefile.in
43f0ac7
@@ -1,8 +1,8 @@
43f0ac7
 prefix = /usr
43f0ac7
 libdir = $(prefix)/lib/bind9
43f0ac7
 
43f0ac7
-CFLAGS=-fPIC -Wall -g -I../include
43f0ac7
-MYSQL_LIBS=-lmysqlclient
43f0ac7
+CFLAGS=-fPIC -Wall -g -I../include @DLZ_DRIVER_MYSQL_INCLUDES@
43f0ac7
+MYSQL_LIBS=@DLZ_DRIVER_MYSQL_LIBS@
43f0ac7
 
43f0ac7
 all: dlz_mysqldyn_mod.so
43f0ac7