* header file cleanup

* fixed --enable-thread-safety build for UNIX

I don't have a Win32 environment available, could someone please try
compiling on Win32 to see if I got all the header file stuff right there?

1 files changed, 27 insertions, 19 deletions

diff --git a/Zend/configure.in b/Zend/configure.in
index 8f3c3fad1c..a947b35a2a 100644
--- a/Zend/configure.in
+++ b/Zend/configure.in
@@ -24,6 +24,7 @@ else
     AC_MSG_RESULT($1.$2 (ok))
 fi
 AC_PROG_CC
+AC_PROG_CXX
 AC_PROG_RANLIB
 AC_PROG_CC_C_O
 AM_PROG_LEX
@@ -56,25 +57,20 @@ AC_CHECK_LIB(c, dlopen, [
   LIBS="-ldl $LIBS"
   AC_DEFINE(HAVE_LIBDL) ], []) ])
 
-dnl The sin may be in a library which need not be specifed
-dnl as well as res_search resides in libsocket
-AC_CHECK_LIB(c, sin, [:], [
- AC_CHECK_LIB(m, sin) ])
-
 dnl Checks for header files.
 AC_HEADER_STDC
 
-dnl In QNX opendir resides in libc but dirent.h is still required
-if test "`uname -s 2>/dev/null`" != "QNX"; then
-	AC_HEADER_DIRENT
-else
-	AC_CHECK_HEADERS(dirent.h)
-fi
 dnl QNX requires unix.h to allow functions in libunix to work properly
-AC_CHECK_HEADERS(fcntl.h unistd.h crypt.h sys/file.h memory.h pwd.h grp.h sys/socket.h sys/wait.h syslog.h string.h sys/varargs.h stdarg.h sys/resource.h sys/time.h signal.h netinet/in.h dlfcn.h limits.h sys/types.h sys/statvfs.h sys/statfs.h unix.h db.h ndbm.h)
+AC_CHECK_HEADERS(limits.h malloc.h string.h unistd.h stdarg.h sys/types.h signal.h unix.h dlfcn.h)
+
+dnl C++ specific header files
+AC_LANG_CPLUSPLUS
+AC_CHECK_HEADER(stdiostream.h, [ AC_DEFINE(HAVE_STDIOSTREAM_H) ])
+AC_LANG_C
 
 dnl Checks for types
 AC_TYPE_SIZE_T
+AC_TYPE_SIGNAL
 
 dnl This is required for QNX and may be some BSD derived systems
 AC_CHECK_TYPE( uint, unsigned int )
@@ -82,11 +78,10 @@ AC_CHECK_TYPE( ulong, unsigned long )
 
 dnl Checks for library functions.
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS(memcpy memmove strdup strerror strcasecmp strstr flock lockf putenv tempnam usleep setlocale gettimeofday setvbuf srand48 lrand48 srandom random link symlink regcomp getlogin cuserid vsnprintf snprintf gcvt utime crypt setitimer rint unsetenv strftime setsockopt tzset statvfs statfs inet_aton getpid kill)
-AC_FUNC_UTIME_NULL
+AC_FUNC_MEMCMP
 AC_FUNC_ALLOCA
-AC_BROKEN_SPRINTF
-AC_REPLACE_FUNCS(getopt)
+AC_CHECK_FUNCS(memcpy strdup getpid kill strtod strtol)
+AC_ZEND_BROKEN_SPRINTF
 
 AC_MSG_CHECKING(whether to include debugging symbols)
 AC_ARG_ENABLE(debug,
@@ -129,22 +124,35 @@ AC_ARG_ENABLE(memory-limit,
 ]) 
 
 
+dnl Sigh. This will probably break automake's automatic dependencies..
 AC_MSG_CHECKING(whether to build Zend thread-safe)
 AC_ARG_ENABLE(thread-safety,
 [  --enable-thread-safety  Whether to build Zend thread-safe.],[
-  AC_DEFINE(ZTS)
-  AC_MSG_RESULT(yes)
+  if test "$enableval" = "yes"; then
+    AC_DEFINE(ZTS)
+    ZEND_SCANNER_SRC=zend-scanner.cc
+    ZEND_SCANNER_COMPILE='$(CXXCOMPILE) -c $< -o $@'
+    AC_MSG_RESULT(yes)
+  else
+    ZEND_SCANNER_SRC=zend-scanner.c
+    ZEND_SCANNER_COMPILE='$(COMPILE) -c $<'
+    AC_MSG_RESULT(no)
+  fi
 ],[
+  ZEND_SCANNER_SRC=zend-scanner.c
+  ZEND_SCANNER_COMPILE='$(COMPILE) -c $<'
   AC_MSG_RESULT(no)
 ])
 AC_SUBST(TSRM_DIR)
 AC_SUBST(TSRM_LIB)
+AC_SUBST(ZEND_SCANNER_SRC)
+AC_SUBST(ZEND_SCANNER_COMPILE)
 
 AC_SUBST(CFLAGS_SHLIB)
 AC_SUBST(LDFLAGS_SHLIB)
 AC_SUBST(LDFLAGS_SHLIB_EXPORT)
 
-AC_OUTPUT(Makefile, [], [])
+AC_OUTPUT(Makefile)
 
 
 # Local Variables: