Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 72210 invoked from network); 1 Jun 2006 11:33:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 1 Jun 2006 11:33:25 -0000 Received: (qmail 57680 invoked by uid 500); 1 Jun 2006 11:33:25 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 57587 invoked by uid 500); 1 Jun 2006 11:33:25 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 57576 invoked by uid 99); 1 Jun 2006 11:33:24 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jun 2006 04:33:24 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME,UPPERCASE_25_50 X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jun 2006 04:33:24 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 2A89E1A983A; Thu, 1 Jun 2006 04:33:04 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r410842 - /apr/apr-util/branches/1.2.x/build/dbd.m4 Date: Thu, 01 Jun 2006 11:33:03 -0000 To: commits@apr.apache.org From: bojan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060601113304.2A89E1A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: bojan Date: Thu Jun 1 04:33:01 2006 New Revision: 410842 URL: http://svn.apache.org/viewvc?rev=410842&view=rev Log: Merge r410841 from the trunk. Original message: Don't configure MySQL if the driver isn't there. Modified: apr/apr-util/branches/1.2.x/build/dbd.m4 Modified: apr/apr-util/branches/1.2.x/build/dbd.m4 URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.2.x/build/dbd.m4?rev=410842&r1=410841&r2=410842&view=diff ============================================================================== --- apr/apr-util/branches/1.2.x/build/dbd.m4 (original) +++ apr/apr-util/branches/1.2.x/build/dbd.m4 Thu Jun 1 04:33:01 2006 @@ -78,97 +78,99 @@ AC_DEFUN([APU_CHECK_DBD_MYSQL], [ apu_have_mysql=0 - AC_ARG_WITH([mysql], [ - --with-mysql=DIR **** SEE INSTALL.MySQL **** - ], [ - apu_have_mysql=0 - if test "$withval" = "yes"; then - old_cppflags="$CPPFLAGS" - old_ldflags="$LDFLAGS" + AC_CHECK_FILES([dbd/apr_dbd_mysql.c],[ + AC_ARG_WITH([mysql], [ + --with-mysql=DIR **** SEE INSTALL.MySQL **** + ], [ + apu_have_mysql=0 + if test "$withval" = "yes"; then + 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`" + 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 + 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 - AC_CHECK_HEADERS(mysql/mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1])) + AC_CHECK_HEADERS(mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1])) + if test "$apu_have_mysql" == "0"; then + AC_CHECK_HEADERS(mysql/mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1])) + else + if test "x$MYSQL_CONFIG" != 'x'; then + APR_ADDTO(APRUTIL_INCLUDES, [$mysql_CPPFLAGS]) + APR_ADDTO(APRUTIL_LDFLAGS, [$mysql_LDFLAGS]) + fi + fi + + CPPFLAGS="$old_cppflags" + LDFLAGS="$old_ldflags" + elif test "$withval" = "no"; then + apu_have_mysql=0 else + old_cppflags="$CPPFLAGS" + old_ldflags="$LDFLAGS" + + AC_PATH_PROG([MYSQL_CONFIG],[mysql_config],,[$withval/bin]) if test "x$MYSQL_CONFIG" != 'x'; then + mysql_CPPFLAGS="`$MYSQL_CONFIG --include`" + mysql_LDFLAGS="`$MYSQL_CONFIG --libs_r`" + else + mysql_CPPFLAGS="-I$withval/include" + mysql_LDFLAGS="-L$withval/lib " + fi + + APR_ADDTO(CPPFLAGS, [$mysql_CPPFLAGS]) + APR_ADDTO(LDFLAGS, [$mysql_LDFLAGS]) + + AC_MSG_NOTICE(checking for mysql in $withval) + AC_CHECK_HEADERS(mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1])) + if test "$apu_have_mysql" != "0"; then APR_ADDTO(APRUTIL_INCLUDES, [$mysql_CPPFLAGS]) APR_ADDTO(APRUTIL_LDFLAGS, [$mysql_LDFLAGS]) fi - fi - CPPFLAGS="$old_cppflags" - LDFLAGS="$old_ldflags" - elif test "$withval" = "no"; then + if test "$apu_have_mysql" != "1"; then + AC_CHECK_HEADERS(mysql/mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1])) + if test "$apu_have_mysql" != "0"; then + APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include/mysql]) + APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib]) + fi + fi + + CPPFLAGS="$old_cppflags" + LDFLAGS="$old_ldflags" + fi + ], [ apu_have_mysql=0 - else + old_cppflags="$CPPFLAGS" old_ldflags="$LDFLAGS" - AC_PATH_PROG([MYSQL_CONFIG],[mysql_config],,[$withval/bin]) + 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`" - else - mysql_CPPFLAGS="-I$withval/include" - mysql_LDFLAGS="-L$withval/lib " - fi - APR_ADDTO(CPPFLAGS, [$mysql_CPPFLAGS]) - APR_ADDTO(LDFLAGS, [$mysql_LDFLAGS]) + APR_ADDTO(CPPFLAGS, [$mysql_CPPFLAGS]) + APR_ADDTO(LDFLAGS, [$mysql_LDFLAGS]) + fi - AC_MSG_NOTICE(checking for mysql in $withval) AC_CHECK_HEADERS(mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1])) - if test "$apu_have_mysql" != "0"; then - APR_ADDTO(APRUTIL_INCLUDES, [$mysql_CPPFLAGS]) - APR_ADDTO(APRUTIL_LDFLAGS, [$mysql_LDFLAGS]) - fi - if test "$apu_have_mysql" != "1"; then - AC_CHECK_HEADERS(mysql/mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1])) - if test "$apu_have_mysql" != "0"; then - APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include/mysql]) - APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib]) + if test "$apu_have_mysql" != "0"; then + if test "x$MYSQL_CONFIG" != 'x'; then + APR_ADDTO(APRUTIL_INCLUDES, [$mysql_CPPFLAGS]) + APR_ADDTO(APRUTIL_LDFLAGS, [$mysql_LDFLAGS]) fi fi 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]) - APR_ADDTO(APRUTIL_LDFLAGS, [$mysql_LDFLAGS]) - fi - fi - - CPPFLAGS="$old_cppflags" - LDFLAGS="$old_ldflags" + ]) ]) AC_SUBST(apu_have_mysql)