Switches libmysqlclient/mysqlnd apache2/cgi build options to include …

…mysqlnd.h in php5-dev

Some users need to build mysqlnd plugins

Closes #21

debian/changelog

@@ -2,6 +2,7 @@ php5 (5.4.10-1~dotdeb.0) stable; urgency=low
 
   * New upstream release
   * Sync with Debian
+  * mysqlnd.h is now included in php5-dev
 
  -- Guillaume Plessis <gui@dotdeb.org>  Sun, 30 Dec 2012 12:58:42 +0100
 

debian/rules

@@ -168,13 +168,14 @@ ifeq (yes,$(RUN_TESTS))
 	mkdir -p temp_session_store
 	# start our own mysql server for the tests
 	$(SHELL) -x debian/setup-mysql.sh $(MYSQL_PORT) $(MYSQL_DATA_DIR)
-	extensions=""; \
+	extensions=" -d extension=mysqlnd.so"; \
 	for f in $(CURDIR)/apache2-build/modules/*.so; do \
 	    ext=`basename "$$f"`; \
 	    test -d "$(CURDIR)/ext/$${ext%.so}/tests" || continue; \
 	    test "$$ext" != "imap.so" || continue; \
 	    test "$$ext" != "interbase.so" || continue; \
 	    test "$$ext" != "ldap.so" || continue; \
+	    test "$$ext" != "mysqlnd.so" || continue; \
 	    test "$$ext" != "odbc.so" || continue; \
 	    test "$$ext" != "pgsql.so" || continue; \
 	    test "$$ext" != "pdo_dblib.so" || continue; \
@@ -293,8 +294,9 @@ configure-apache2-stamp: prepared-stamp
 		--with-ldap=shared,/usr \
 		--with-ldap-sasl=/usr \
 		--with-mcrypt=shared,/usr \
-		--with-mysql=shared,/usr \
-		--with-mysqli=shared,/usr/bin/mysql_config \
+		--enable-mysqlnd=shared \
+		--with-mysql=shared,mysqlnd \
+		--with-mysqli=shared,mysqlnd \
 		--with-pspell=shared,/usr \
 		--with-unixODBC=shared,/usr \
 		--with-recode=shared,/usr \
@@ -307,7 +309,7 @@ configure-apache2-stamp: prepared-stamp
 		--with-pgsql=shared,/usr PGSQL_INCLUDE=`pg_config --includedir` \
 		--enable-pdo=shared \
 		--without-pdo-dblib \
-		--with-pdo-mysql=shared,/usr \
+		--with-pdo-mysql=shared,mysqlnd \
 		--with-pdo-odbc=shared,unixODBC,/usr \
 		--with-pdo-pgsql=shared,/usr/bin/pg_config \
 		--with-pdo-sqlite=shared,/usr \
@@ -353,10 +355,9 @@ configure-cgi-stamp: prepared-stamp
 		$(COMMON_CONFIG) \
 		--without-mm \
 		--enable-pdo=shared \
-		--enable-mysqlnd=shared \
-		--with-mysql=shared,mysqlnd \
-		--with-mysqli=shared,mysqlnd \
-		--with-pdo-mysql=shared,mysqlnd \
+		--with-mysql=shared,/usr \
+		--with-mysqli=shared,/usr/bin/mysql_config \
+		--with-pdo-mysql=shared,/usr \
 		--without-pdo-sqlite \
 		--without-sybase-ct --without-mssql \
 		--without-sqlite3 \
@@ -556,7 +557,7 @@ install: build
 		mkdir -p debian/$$i/$${ext}; \
 	done; \
 	cat debian/modulelist debian/extramodulelist | while read package extname dsoname priority; do \
-		if [ "$$package" = "mysqlnd" ]; then \
+		if [ "$$package" = "mysql" ]; then \
 			modulepath=cgi-build/modules; \
 		else \
 			modulepath=debian/libapache2-mod-php5/$${ext}; \