apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From field...@apache.org
Subject svn commit: r655174 - /apr/apr-util/trunk/build/dbd.m4
Date Sat, 10 May 2008 20:43:59 GMT
Author: fielding
Date: Sat May 10 13:43:59 2008
New Revision: 655174

URL: http://svn.apache.org/viewvc?rev=655174&view=rev
Log:
MySQL MUST NOT be linked in by default!  Remove check for mysql
when --with-mysql is not given.

Modified:
    apr/apr-util/trunk/build/dbd.m4

Modified: apr/apr-util/trunk/build/dbd.m4
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/build/dbd.m4?rev=655174&r1=655173&r2=655174&view=diff
==============================================================================
--- apr/apr-util/trunk/build/dbd.m4 (original)
+++ apr/apr-util/trunk/build/dbd.m4 Sat May 10 13:43:59 2008
@@ -77,7 +77,7 @@
 AC_DEFUN([APU_CHECK_DBD_MYSQL], [
   apu_have_mysql=0
 
-  AC_ARG_WITH([mysql], APR_HELP_STRING([--with-mysql=DIR], [specify MySQL location]),
+  AC_ARG_WITH([mysql], APR_HELP_STRING([--with-mysql=DIR], [enable MySQL DBD driver]),
   [
     apu_have_mysql=0
     if test "$withval" = "yes"; then
@@ -138,31 +138,6 @@
       CPPFLAGS="$old_cppflags"
       LDFLAGS="$old_ldflags"
     fi
-  ], [
-    apu_have_mysql=0
-
-    old_cppflags="$CPPFLAGS"
-    old_ldflags="$LDFLAGS"
-
-    AC_PATH_PROG([MYSQL_CONFIG],[mysql_config])
-    if test "x$MYSQL_CONFIG" != 'x'; then
-      mysql_CPPFLAGS="`$MYSQL_CONFIG --include`"
-      mysql_LDFLAGS="`$MYSQL_CONFIG --libs_r`"
-
-      APR_ADDTO(CPPFLAGS, [$mysql_CPPFLAGS])
-      APR_ADDTO(LDFLAGS, [$mysql_LDFLAGS])
-    fi
-
-    AC_CHECK_HEADERS(mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]))
-
-    if test "$apu_have_mysql" != "0"; then
-      if test "x$MYSQL_CONFIG" != 'x'; then
-        APR_ADDTO(APRUTIL_INCLUDES, [$mysql_CPPFLAGS])
-      fi
-    fi
-
-    CPPFLAGS="$old_cppflags"
-    LDFLAGS="$old_ldflags"
   ])
 
   AC_SUBST(apu_have_mysql)



Mime
View raw message