From 809198b9162cbef4af420e5ae3e74b3c3adcc3f3 Mon Sep 17 00:00:00 2001
From: Stig Bakken <ssb@php.net>
Date: Mon, 13 Sep 1999 17:17:51 +0000
Subject: Added PHP_WITH_SHARED for checking "shared,*" prefix when configuring
 extensions.

---
 ext/mysql/config.m4 | 134 ++++++++++++++++++++++++----------------------------
 1 file changed, 61 insertions(+), 73 deletions(-)

(limited to 'ext/mysql')

diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4
index bce0671fd5..ceda6acf4b 100644
--- a/ext/mysql/config.m4
+++ b/ext/mysql/config.m4
@@ -8,82 +8,70 @@ AC_ARG_WITH(mysql,
 			  Set DIR to "shared" to build as a dl, or "shared,DIR"
 			  to build as a dl and still specify DIR.],
 [
-  	case $withval in
-	    shared)
-		shared=yes
-		withval=yes
-		;;
-	    shared,*)
-		shared=yes
-		withval=`echo $withval | sed -e 's/^shared,//'`      
-		;;
-	    *)
-		shared=no
-		;;
-	esac
-	if test "$withval" != "no"; then
-		if test "$withval" = "yes"; then
-			if test -f /usr/include/mysql/mysql.h; then
-				MYSQL_INCDIR=/usr/include/mysql
-				if test -d /usr/lib/mysql; then
-					MYSQL_LIBDIR=/usr/lib/mysql
-				else
-					MYSQL_LIBDIR=/usr/lib
-				fi
-			elif test -f /usr/include/mysql.h; then
-				MYSQL_INCDIR=/usr/include
-				MYSQL_LIBDIR=/usr/lib
-			elif test -f /usr/local/include/mysql/mysql.h; then
-				MYSQL_INCDIR=/usr/local/include/mysql
-				MYSQL_LIBDIR=/usr/local/lib/mysql
-		    elif test -f /usr/local/include/mysql.h; then
-				MYSQL_INCDIR=/usr/local/include
-				MYSQL_LIBDIR=/usr/local/lib 
-            elif test -f /usr/local/mysql/include/mysql/mysql.h; then
-				MYSQL_INCDIR=/usr/local/mysql/include/mysql
-				MYSQL_LIBDIR=/usr/local/mysql/lib/mysql
-			else
-				AC_MSG_RESULT(no)
-				AC_MSG_ERROR(Invalid MySQL directory - unable to find mysql.h)
-			fi   
-		else
-			if test -f $withval/include/mysql/mysql.h; then
-				MYSQL_INCDIR=$withval/include/mysql
-				MYSQL_LIBDIR=$withval/lib/mysql
-			elif test -f $withval/include/mysql.h; then
-				MYSQL_INCDIR=$withval/include
-				MYSQL_LIBDIR=$withval/lib
-			else
-				AC_MSG_RESULT(no)
-				AC_MSG_ERROR(Invalid MySQL directory - unable to find mysql.h under $withval)
-			fi
-		fi
-		MYSQL_INCLUDE=-I$MYSQL_INCDIR
+    PHP_WITH_SHARED
+    if test "$withval" != "no"; then
+        if test "$withval" = "yes"; then
+            if test -f /usr/include/mysql/mysql.h; then
+                MYSQL_INCDIR=/usr/include/mysql
+                if test -d /usr/lib/mysql; then
+                    MYSQL_LIBDIR=/usr/lib/mysql
+                else
+                    MYSQL_LIBDIR=/usr/lib
+                fi
+            elif test -f /usr/include/mysql.h; then
+                MYSQL_INCDIR=/usr/include
+                MYSQL_LIBDIR=/usr/lib
+            elif test -f /usr/local/include/mysql/mysql.h; then
+                MYSQL_INCDIR=/usr/local/include/mysql
+                MYSQL_LIBDIR=/usr/local/lib/mysql
+            elif test -f /usr/local/include/mysql.h; then
+                MYSQL_INCDIR=/usr/local/include
+                MYSQL_LIBDIR=/usr/local/lib 
+        elif test -f /usr/local/mysql/include/mysql/mysql.h; then
+                MYSQL_INCDIR=/usr/local/mysql/include/mysql
+                MYSQL_LIBDIR=/usr/local/mysql/lib/mysql
+            else
+                AC_MSG_RESULT(no)
+                AC_MSG_ERROR(Invalid MySQL directory - unable to find mysql.h)
+            fi   
+        else
+            if test -f $withval/include/mysql/mysql.h; then
+                MYSQL_INCDIR=$withval/include/mysql
+                MYSQL_LIBDIR=$withval/lib/mysql
+            elif test -f $withval/include/mysql.h; then
+                MYSQL_INCDIR=$withval/include
+                MYSQL_LIBDIR=$withval/lib
+            else
+                AC_MSG_RESULT(no)
+                AC_MSG_ERROR(Invalid MySQL directory - unable to find mysql.h under $withval)
+            fi
+        fi
+        MYSQL_INCLUDE=-I$MYSQL_INCDIR
 
-		AC_DEFINE(HAVE_MYSQL)
-                if test "$shared" = "yes"; then
-      			AC_MSG_RESULT(yes (shared))
-			MYSQL_LFLAGS="-L$MYSQL_LIBDIR"
-			MYSQL_SHARED="mysql.la"
-    		else
-   			AC_MSG_RESULT(yes (static))
-			AC_ADD_LIBRARY_WITH_PATH(mysqlclient, $MYSQL_LIBDIR)
-		        AC_ADD_INCLUDE($MYSQL_INCDIR)
-			MYSQL_STATIC="libphpext_mysql.a"
-		fi
-		PHP_EXTENSION(mysql, $shared)
+        AC_DEFINE(HAVE_MYSQL)
+        if test "$shared" = "yes"; then
+            AC_MSG_RESULT(yes (shared))
+            MYSQL_LFLAGS="-L$MYSQL_LIBDIR"
+            MYSQL_SHARED="mysql.la"
+        else
+            AC_MSG_RESULT(yes (static))
+            AC_ADD_LIBRARY_WITH_PATH(mysqlclient, $MYSQL_LIBDIR)
+            AC_ADD_INCLUDE($MYSQL_INCDIR)
+            MYSQL_STATIC="libphpext_mysql.a"
+        fi
+        PHP_EXTENSION(mysql, $shared)
 
-		dnl check for errmsg.h, which isn't installed by some versions of 3.21
-		old_CPPFLAGS="$CPPFLAGS"
-		CPPFLAGS="$CPPFLAGS $MYSQL_INCLUDE"
-		AC_CHECK_HEADERS(errmsg.h mysql.h)
-		CPPFLAGS="$old_CPPFLAGS"
-	else
-		AC_MSG_RESULT(no)
-		AC_DEFINE(HAVE_MYSQL, 0)
-	fi
+        dnl check for errmsg.h, which isn't installed by some versions of 3.21
+        old_CPPFLAGS="$CPPFLAGS"
+        CPPFLAGS="$CPPFLAGS $MYSQL_INCLUDE"
+        AC_CHECK_HEADERS(errmsg.h mysql.h)
+        CPPFLAGS="$old_CPPFLAGS"
+    else
+        AC_MSG_RESULT(no)
+        AC_DEFINE(HAVE_MYSQL, 0)
+    fi
 ],[
-  AC_MSG_RESULT(no)
+    AC_MSG_RESULT(no)
 ])
 AC_SUBST(MYSQL_STATIC)
 AC_SUBST(MYSQL_SHARED)
-- 
cgit v1.2.1