Merge HEAD changes

9 files changed, 46 insertions, 26 deletions

diff --git a/ext/bcmath/config.m4 b/ext/bcmath/config.m4
index 8289624dc4..ed5677416d 100644
--- a/ext/bcmath/config.m4
+++ b/ext/bcmath/config.m4
@@ -1,7 +1,7 @@
 dnl $Id$
 
-PHP_ARG_WITH(bcmath, for bc style precision math functions,
-[  --without-bcmath         Compile without bc style precision math functions. ], yes)
+PHP_ARG_ENABLE(bcmath, for bc style precision math functions,
+[  --enable-bcmath         Enable bc style precision math functions.])
 
 if test "$PHP_BCMATH" != "no"; then
   AC_DEFINE(WITH_BCMATH, 1, [Whether you have bcmath])
diff --git a/ext/ccvs/config.m4 b/ext/ccvs/config.m4
index aea9e1a893..ef347ffe9c 100644
--- a/ext/ccvs/config.m4
+++ b/ext/ccvs/config.m4
@@ -3,9 +3,8 @@ dnl config.m4 for PHP4 CCVS Extension
 
 AC_MSG_CHECKING(CCVS Support)
 AC_ARG_WITH(ccvs,
-[  --with-ccvs[=DIR]       Compile CCVS support into PHP4. 
-                          Please specify your CCVS base install directory as DIR.
-],
+[  --with-ccvs[=DIR]       Compile CCVS support into PHP4. Please specify your 
+                          CCVS base install directory as DIR.],
 [
   if test "$withval" != "no"; then
      CCVS_DIR="$withval"
diff --git a/ext/ctype/config.m4 b/ext/ctype/config.m4
index 9bcdcdb2c6..774047b9b9 100644
--- a/ext/ctype/config.m4
+++ b/ext/ctype/config.m4
@@ -14,7 +14,8 @@ dnl [  --with-ctype             Include ctype support])
 
 dnl Otherwise use enable:
 
-PHP_ARG_ENABLE(ctype, whether to enable ctype support,[  --enable-ctype           Enable ctype support])
+PHP_ARG_ENABLE(ctype, whether to enable ctype support,
+[  --enable-ctype          Enable ctype support])
 
 if test "$PHP_CTYPE" != "no"; then
   dnl If you will not be testing anything external, like existence of
diff --git a/ext/domxml/config.m4 b/ext/domxml/config.m4
index 31aeb9d4d1..604f6185b3 100644
--- a/ext/domxml/config.m4
+++ b/ext/domxml/config.m4
@@ -2,7 +2,7 @@ dnl $Id$
 dnl config.m4 for extension domxml
 
 PHP_ARG_WITH(dom, for DOM support,
-[  --with-dom[=DIR]       Include DOM support (requires libxml >= 2.0).
+[  --with-dom[=DIR]        Include DOM support (requires libxml >= 2.0).
                           DIR is the libxml install directory,
                           defaults to /usr.])
 
diff --git a/ext/fribidi/config.m4 b/ext/fribidi/config.m4
index b05bf395ca..8af1b6a979 100644
--- a/ext/fribidi/config.m4
+++ b/ext/fribidi/config.m4
@@ -5,9 +5,9 @@ dnl don't forget to call PHP_EXTENSION(fribidi)
 
 
 PHP_ARG_WITH(fribidi, whether to add fribidi support,
-[  --with-fribidi[=DIR]             Include fribidi support (requires FriBidi >=0.1.12).
-                                    DIR is the fribidi installation directory - 
-                                    default /usr/local/],"no")
+[  --with-fribidi[=DIR]    Include fribidi support (requires FriBidi >=0.1.12).
+                          DIR is the fribidi installation directory - 
+                          default /usr/local/])
 
 
 
diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
index f2add0eee3..78713a917d 100644
--- a/ext/gd/config.m4
+++ b/ext/gd/config.m4
@@ -6,11 +6,16 @@ AC_DEFUN(PHP_GD_JPEG,[
           if test "$withval" = "yes"; then
             withval="/usr/local"
           fi
-          old_LIBS=$LIBS
+          jold_LIBS=$LIBS
           LIBS="$LIBS -L$withval/lib"
           AC_CHECK_LIB(jpeg,jpeg_read_header, [LIBS="$LIBS -ljpeg"],[AC_MSG_RESULT(no)],)
-          LIBS=$old_LIBS
-          AC_ADD_LIBRARY_WITH_PATH(jpeg, $withval/lib)
+          LIBS=$jold_LIBS
+          if test "$shared" = "yes"; then
+            GD_LIBS="$GD_LIBS -ljpeg"
+            GD_LFLAGS="$GD_LFLAGS -L$withval/lib"
+          else
+            AC_ADD_LIBRARY_WITH_PATH(jpeg, $withval/lib)
+          fi
           LIBS="$LIBS -L$withval/lib -ljpeg"
         ],[
           AC_MSG_RESULT(no)
@@ -58,7 +63,7 @@ AC_DEFUN(PHP_GD_CHECK_VERSION,[
 
 AC_MSG_CHECKING(whether to enable truetype string function in gd)
 AC_ARG_ENABLE(gd-native-ttf,
-[  --enable-gd-imgstrttf  Enable TrueType string function in gd],[
+[  --enable-gd-imgstrttf   Enable TrueType string function in gd],[
   if test "$enableval" = "yes" ; then
     AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ])
     AC_MSG_RESULT(yes)
@@ -72,8 +77,7 @@ AC_ARG_ENABLE(gd-native-ttf,
 
 shared=no
 AC_ARG_WITH(gd,
-[  
-  --with-gd[=DIR]         Include GD support (DIR is GD's install dir).
+[  --with-gd[=DIR]         Include GD support (DIR is GD's install dir).
                           Set DIR to "shared" to build as a dl, or 
                           "shared,DIR" to build as a dl and still specify DIR.],
 [
@@ -93,7 +97,7 @@ AC_ARG_WITH(gd,
       AC_DEFINE(HAVE_LIBGD,1,[ ])
       if test "$shared" = "yes"; then
         AC_MSG_RESULT(yes (shared))
-        GD_LIBS="-lgd"
+        GD_LIBS="-lgd $GD_LIBS"
       else
         AC_MSG_RESULT(yes (static))
         AC_ADD_LIBRARY(gd)
@@ -110,6 +114,9 @@ dnl Check the capabilities of GD lib...
       if test "$ac_cv_lib_gd_gdImageCreateFromPng" = "yes"; then
         AC_ADD_LIBRARY(png)
         AC_ADD_LIBRARY(z)
+        if test "$shared" = "yes"; then
+          GD_LIBS="$GD_LIBS -lpng -lz"
+        fi
       fi
 
       ac_cv_lib_gd_gdImageLine=yes
@@ -142,8 +149,8 @@ dnl A whole whack of possible places where this might be
         AC_DEFINE(HAVE_LIBGD,1,[ ])
         if test "$shared" = "yes"; then
           AC_MSG_RESULT(yes (shared))
-          GD_LIBS="-lgd"
-          GD_LFLAGS="-L$GD_LIB"
+          GD_LIBS="-lgd $GD_LIBS"
+          GD_LFLAGS="-L$GD_LIB $GD_LFLAGS"
         else
           AC_MSG_RESULT(yes (static))
           AC_ADD_LIBRARY_WITH_PATH(gd, $GD_LIB)
@@ -160,6 +167,9 @@ dnl Check the capabilities of GD lib...
         if test "$ac_cv_lib_gd_gdImageCreateFromPng" = "yes"; then
           AC_ADD_LIBRARY(z)
           AC_ADD_LIBRARY(png)
+          if test "$shared" = "yes"; then
+            GD_LIBS="$GD_LIBS -lpng -lz"
+          fi
         fi
 
         ac_cv_lib_gd_gdImageLine=yes
@@ -222,16 +232,26 @@ if test "$with_gd" != "no" && test "$ac_cv_lib_gd_gdImageLine" = "yes"; then
       if test "$withval" = "yes"; then
         for i in /usr/local /usr; do
           if test -f "$i/include/t1lib.h"; then
-            AC_ADD_LIBRARY_WITH_PATH(t1, "$i/lib")
-            AC_ADD_INCLUDE("$i/include")
+            T1_DIR="$i"
           fi
         done
       else
         if test -f "$withval/include/t1lib.h"; then
-          AC_ADD_LIBRARY_WITH_PATH(t1, "$withval/lib")
-          AC_ADD_INCLUDE("$withval/include")
+          T1_DIR="$withval"
         fi
       fi
+      
+      if test "$T1_DIR" != "no"; then
+        AC_ADD_INCLUDE("$T1_DIR/include")
+        if test "$shared" = "yes"; then
+          GD_LIBS="$GD_LIBS -lt1"
+          GD_LFLAGS="$GD_LFLAGS -L$T1_DIR/lib"
+        else
+          AC_ADD_LIBRARY_WITH_PATH(t1, "$T1_DIR/lib")
+        fi
+        LIBS="$LIBS -L$T1_DIR/lib -lt1"
+      fi 
+
       AC_MSG_RESULT(yes)
       AC_CHECK_LIB(t1, T1_GetExtend, [AC_DEFINE(HAVE_LIBT1,1,[ ])])
     else
diff --git a/ext/gmp/config.m4 b/ext/gmp/config.m4
index d7b54e495c..4dea939c99 100644
--- a/ext/gmp/config.m4
+++ b/ext/gmp/config.m4
@@ -5,7 +5,7 @@ dnl If your extension references something external, use with:
 
 PHP_ARG_WITH(gmp, for gmp support,
 dnl Make sure that the comment is aligned:
-[  --with-gmp        Include gmp support])
+[  --with-gmp              Include gmp support])
 
 if test "$PHP_GMP" != "no"; then
 
diff --git a/ext/qtdom/config.m4 b/ext/qtdom/config.m4
index 8ca444b1f5..4cb52771fc 100644
--- a/ext/qtdom/config.m4
+++ b/ext/qtdom/config.m4
@@ -4,7 +4,7 @@ dnl don't forget to call PHP_EXTENSION(qtdom)
 
 AC_MSG_CHECKING(whether to include QDOM support)
 AC_ARG_WITH(qtdom,
-[  --with-qtdom        Include QtDOM support (requires Qt >= 2.2.0).],
+[  --with-qtdom            Include QtDOM support (requires Qt >= 2.2.0).],
 [
 case "$withval" in
     no)
diff --git a/sapi/thttpd/config.m4 b/sapi/thttpd/config.m4
index d9a11d1dbe..d125b8768e 100644
--- a/sapi/thttpd/config.m4
+++ b/sapi/thttpd/config.m4
@@ -1,5 +1,5 @@
 AC_ARG_WITH(thttpd,
-[  --with-thttpd=SRCDIR],[
+[  --with-thttpd=SRCDIR    Build PHP as thttpd module],[
   test -d $withval || AC_MSG_RESULT(thttpd directory does not exist ($withval))
   AC_EXPAND_PATH($withval, THTTPD)
   INSTALL_IT="\