From: Rasmus Lerdorf <rasmus@php.net>
Date: Sun, 25 Apr 1999 04:03:36 +0000 (+0000)
Subject: Argh!  That typo took me over an hour to find.  Grr..
X-Git-Tag: BEFORE_PHP4_APACHE_MODULE_CHANGE~168
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0704064cdf3bb26f0915cb3fad685d56ff4fd0f4;p=php

Argh!  That typo took me over an hour to find.  Grr..
---

diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4
index d8c826bfe6..8f2e24ef25 100644
--- a/ext/mysql/config.m4
+++ b/ext/mysql/config.m4
@@ -6,60 +6,60 @@ AC_ARG_WITH(mysql,
                           install directory, defaults to searching through
                           a number of common places for the MySQL files.],
 [
-  if test "$withval" != "no"; then
-    if test "$withval" = "yes"; then
-		if test -f /usr/include/mysql/mysql.h; then
-			MYSQL_INCDIR=/usr/include/mysql
-			MYSQL_LIBDIR=/usr/lib/mysql
-		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  
+	if test "$withval" != "no"; then
+		if test "$withval" = "yes"; then
+			if test -f /usr/include/mysql/mysql.h; then
+				MYSQL_INCDIR=/usr/include/mysql
+				MYSQL_LIBDIR=/usr/lib/mysql
+			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  
+			else
+				AC_MSG_RESULT(no)
+				AC_MSG_ERROR(Invalid MySQL directory - unable to find mysql.h)
+			fi   
 		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
-    if test -n "$APXS"; then
-      MYSQL_LFLAGS="'${apxs_runpath_switch}$MYSQL_LIBDIR' -L$MYSQL_LIBDIR"
-    else
-      MYSQL_LFLAGS="${ld_runpath_switch}$MYSQL_LIBDIR -L$MYSQL_LIBDIR"
-    fi
-    MYSQL_LIBS=-lmysqlclient
+			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
+		if test -n "$APXS"; then
+			MYSQL_LFLAGS="'${apxs_runpath_switch}$MYSQL_LIBDIR' -L$MYSQL_LIBDIR"
+		else
+			MYSQL_LFLAGS="${ld_runpath_switch}$MYSQL_LIBDIR -L$MYSQL_LIBDIR"
+		fi
+		MYSQL_LIBS=-lmysqlclient
 
-    AC_DEFINE(HAVE_MYSQL)
-    AC_MSG_RESULT(yes)
+		AC_DEFINE(HAVE_MYSQL)
+		AC_MSG_RESULT(yes)
 
-    EXTRA_LIBS="$EXTRA_LIBS $MYSQL_LFLAGS $MYSQL_LIBS"
-    INCLUDES="$INCLUDES $MYSQL_INCLUDE"
-    PHP_EXTENSION(mysql)
+		EXTRA_LIBS="$EXTRA_LIBS $MYSQL_LFLAGS $MYSQL_LIBS"
+		INCLUDES="$INCLUDES $MYSQL_INCLUDE"
+		PHP_EXTENSION(mysql)
 
-    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)
 ])
diff --git a/ext/standard/config.m4 b/ext/standard/config.m4
index b965fdc251..9796b201da 100644
--- a/ext/standard/config.m4
+++ b/ext/standard/config.m4
@@ -111,7 +111,7 @@ AC_CHECK_LIB(pam, pam_start, [
   AC_DEFINE(HAVE_LIBPAM) ], []) 
 
 AC_CHECK_LIB(bind, inet_aton, [
-  EXTRA_LIBS="$LIBS -lbind"
+  EXTRA_LIBS="$EXTRA_LIBS -lbind"
   AC_DEFINE(HAVE_LIBBIND) ], [])