Further work on autoconf-2.5x support

3 files changed, 14 insertions, 12 deletions

diff --git a/configure.in b/configure.in
index 90b0578855..aee8243cd8 100644
--- a/configure.in
+++ b/configure.in
@@ -122,6 +122,7 @@ AC_PROG_LN_S
 AC_PROG_LEX
 if test -n "$LEX"; then
   AC_DECL_YYTEXT
+  :
 fi
 
 dnl ## Make flex scanners use const if they can, even if __STDC__ is not
@@ -934,7 +935,7 @@ pear/scripts/pearize pear/scripts/phptar TSRM/Makefile $PHP_OUTPUT_FILES"
 
 AC_OUTPUT($ALL_OUTPUT_FILES, [], [
 
-if test "\$CONFIG_FILES" = "$ALL_OUTPUT_FILES"; then
+if test "\$CONFIG_FILES" = "$ALL_OUTPUT_FILES" || test -z "\$CONFIG_FILES"; then
   REDO_ALL=yes
 fi
 
@@ -953,9 +954,10 @@ fi
 # Create configuration headers
 #
 
-if test -d TSRM; then
-  echo '#include "../main/php_config.h"' > TSRM/tsrm_config.h
-fi
+test -d TSRM || mkdir TSRM
+echo '#include "../main/php_config.h"' > TSRM/tsrm_config.h
+
+test -d Zend || mkdir Zend
 
 cat >Zend/zend_config.h <<FEO
 #include "../main/php_config.h"
diff --git a/ext/cpdf/config.m4 b/ext/cpdf/config.m4
index 724092403d..4d89c5041e 100644
--- a/ext/cpdf/config.m4
+++ b/ext/cpdf/config.m4
@@ -13,7 +13,7 @@ AC_ARG_WITH(cpdflib,
       AC_MSG_RESULT(yes)
       PHP_EXTENSION(cpdf)
       AC_CHECK_LIB(cpdf, cpdf_open, [AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib])],
-        [AC_MSG_ERROR(Cpdf module requires cpdflib >= 2.)])
+        [AC_MSG_ERROR([Cpdf module requires cpdflib >= 2.])])
       PHP_ADD_LIBRARY(cpdf)
       PHP_ADD_LIBRARY(tiff)
       PHP_ADD_LIBRARY(jpeg)
@@ -59,7 +59,7 @@ AC_ARG_WITH(cpdflib,
 
           LIBS="$LIBS -L$withval/lib"
         AC_CHECK_LIB(cpdf, cpdf_open, [AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib])],
-          [AC_MSG_ERROR(Cpdflib module requires cpdflib >= 2.)])
+          [AC_MSG_ERROR([Cpdflib module requires cpdflib >= 2.])])
         LIBS=$old_LIBS
         PHP_ADD_LIBRARY_WITH_PATH(cpdf, $withval/lib)
         PHP_ADD_INCLUDE($CPDFLIB_INCLUDE)
diff --git a/ext/pdf/config.m4 b/ext/pdf/config.m4
index 9936bff519..834236be48 100644
--- a/ext/pdf/config.m4
+++ b/ext/pdf/config.m4
@@ -18,7 +18,7 @@ if test "$PHP_PDFLIB" != "no"; then
       AC_CHECK_LIB(pdf, PDF_show_boxed, [
         AC_DEFINE(HAVE_PDFLIB,1,[ ])
       ],[
-        AC_MSG_ERROR(pdflib extension requires at least pdflib 3.x. You may also need libtiff and libjpeg. If so, use the options --with-tiff-dir=<DIR> and --with-jpeg-dir=<DIR>)
+        AC_MSG_ERROR([pdflib extension requires at least pdflib 3.x. You may also need libtiff and libjpeg. If so, use the options --with-tiff-dir=<DIR> and --with-jpeg-dir=<DIR>])
       ],[
         -ltiff -ljpeg -lpng -lz
       ])
@@ -34,7 +34,7 @@ if test "$PHP_PDFLIB" != "no"; then
       if test -n "$PDFLIB_INCLUDE" ; then
 
         if test "$PHP_ZLIB_DIR" = "no"; then
-          AC_MSG_ERROR(PDF extension requires ZLIB. Use --with-zlib-dir=<DIR>)
+          AC_MSG_ERROR([PDF extension requires ZLIB. Use --with-zlib-dir=<DIR>])
         fi
 
         PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, PDFLIB_SHARED_LIBADD)
@@ -47,7 +47,7 @@ if test "$PHP_PDFLIB" != "no"; then
           [
             PHP_ADD_LIBRARY_WITH_PATH(jpeg, $PHP_JPEG_DIR/lib, PDFLIB_SHARED_LIBADD)
           ],[
-            AC_MSG_ERROR(libjpeg not found!)
+            AC_MSG_ERROR([libjpeg not found!])
           ],[
             -L$PHP_JPEG_DIR/lib
           ])
@@ -69,7 +69,7 @@ if test "$PHP_PDFLIB" != "no"; then
           [
             PHP_ADD_LIBRARY_WITH_PATH(png, $PHP_PNG_DIR/lib, PDFLIB_SHARED_LIBADD)
           ],[
-            AC_MSG_ERROR(libpng not found!)
+            AC_MSG_ERROR([libpng not found!])
           ],[
             -L$PHP_PNG_DIR/lib
           ])
@@ -91,7 +91,7 @@ if test "$PHP_PDFLIB" != "no"; then
           [
             PHP_ADD_LIBRARY_WITH_PATH(tiff, $PHP_TIFF_DIR/lib, PDFLIB_SHARED_LIBADD)
           ],[
-            AC_MSG_ERROR(libtiff not found!)
+            AC_MSG_ERROR([libtiff not found!])
           ],[
             -L$PHP_TIFF_DIR/lib
           ])
@@ -111,7 +111,7 @@ if test "$PHP_PDFLIB" != "no"; then
           PHP_ADD_LIBRARY_WITH_PATH(pdf, $PHP_PDFLIB/lib, PDFLIB_SHARED_LIBADD)
           PHP_ADD_INCLUDE($PDFLIB_INCLUDE)
         ],[
-          AC_MSG_ERROR(pdflib extension requires at least pdflib 3.x.)
+          AC_MSG_ERROR([pdflib extension requires at least pdflib 3.x.])
         ],[
           -L$PHP_PDFLIB/lib
         ])