- MFH: odd shell fixes

- MFH: PHP_LIBDIR

diff --git a/config9.m4 b/config9.m4
index 81d6eda2d08d21667804375b125dab04d4b79302..e7b68b72128a31f64d5303ff5760ca646e998d0e 100644 (file)
--- a/config9.m4
+++ b/config9.m4
@@ -70,11 +70,11 @@ if test "$PHP_HTTP" != "no"; then
        AC_DEFUN([HTTP_HAVE_PHP_EXT], [
                extname=$1
                haveext=$[PHP_]translit($1,a-z_-,A-Z__)
-               ishared=$[PHP_]translit($1,a-z_-,A-Z__)_SHARED
                
                AC_MSG_CHECKING([for ext/$extname support])
                if test -x "$PHP_EXECUTABLE"; then
-                       if test "`$PHP_EXECUTABLE -m | $EGREP ^$extname\$`" = "$extname"; then
+                       grepext=`$PHP_EXECUTABLE -m | $EGREP ^$extname\$`
+                       if test "$grepext" = "$extname"; then
                                [HTTP_HAVE_EXT_]translit($1,a-z_-,A-Z__)=1
                                AC_MSG_RESULT([yes])
                                $2
@@ -93,6 +93,13 @@ if test "$PHP_HTTP" != "no"; then
                        $3
                fi
        ])
+       
+       dnl
+       dnl odd PHP4 fix
+       dnl
+       if test "x$PHP_LIBDIR" = "x"; then
+               PHP_LIBDIR=lib
+       fi
 
 dnl ----
 dnl STDC
@@ -115,7 +122,7 @@ dnl ----
                                break;
                        fi
                done
-               if test -z "$ZLIB_DIR"; then
+               if test "x$ZLIB_DIR" = "x"; then
                        AC_MSG_RESULT([not found])
                        AC_MSG_ERROR([could not find zlib.h])
                else
@@ -145,7 +152,7 @@ dnl ----
                                break
                        fi
                done
-               if test -z "$CURL_DIR"; then
+               if test "x$CURL_DIR" = "x"; then
                        AC_MSG_RESULT([not found])
                        AC_MSG_ERROR([could not find curl/curl.h])
                else
@@ -160,7 +167,7 @@ dnl ----
                                break
                        fi
                done
-               if test -z "$CURL_CONFIG"; then
+               if test "x$CURL_CONFIG" = "x"; then
                        AC_MSG_RESULT([not found])
                        AC_MSG_ERROR([could not find curl-config])
                else
@@ -184,9 +191,10 @@ dnl ----
                save_LIBS="$LIBS"
                LIBS=
                save_CFLAGS="$CFLAGS"
-               CFLAGS="`$CURL_CONFIG --cflags`"
+               CFLAGS=`$CURL_CONFIG --cflags`
                save_LDFLAGS="$LDFLAGS"
-               LDFLAGS="`$CURL_CONFIG --libs` $ld_runpath_switch$CURL_DIR/$PHP_LIBDIR"
+               LDFLAGS=`$CURL_CONFIG --libs`
+               LDFLAGS="$LDFLAGS $ld_runpath_switch$CURL_DIR/$PHP_LIBDIR"
                
                AC_MSG_CHECKING([for SSL support in libcurl])
                CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL`
@@ -258,7 +266,7 @@ dnl ----
                                break
                        fi
                done
-               if test -z "$CURL_CAINFO"; then
+               if test "x$CURL_CAINFO" = "x"; then
                        AC_MSG_RESULT([not found])
                else
                        AC_MSG_RESULT([$CURL_CAINFO])
@@ -313,7 +321,7 @@ dnl ----
                                break
                        fi
                done
-               if test -z "$MAGIC_DIR"; then
+               if test "x$MAGIC_DIR" = "x"; then
                        AC_MSG_RESULT([not found])
                        AC_MSG_ERROR([could not find magic.h])
                else
@@ -342,7 +350,7 @@ dnl ----
                                fi
                        fi
                done
-               if test -z "$HTTP_EXT_HASH_INCDIR"; then
+               if test "x$HTTP_EXT_HASH_INCDIR" = "x"; then
                        AC_MSG_RESULT([not found])
                else
                        AC_MSG_RESULT([$HTTP_EXT_HASH_INCDIR])