summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSascha Schumann <sas@php.net>1999-04-24 20:43:58 +0000
committerSascha Schumann <sas@php.net>1999-04-24 20:43:58 +0000
commitbec518a62da5a8c809097093f766b3b59d4579d1 (patch)
tree97b7989f17e929b1a5fcbe329242ca979526e327
parent8036c5fbf199dbeee188b007acb44d54fcd5cb4a (diff)
downloadphp-git-bec518a62da5a8c809097093f766b3b59d4579d1.tar.gz
port from PHP3
-rw-r--r--acconfig.h.in3
-rw-r--r--configure.in.in27
2 files changed, 30 insertions, 0 deletions
diff --git a/acconfig.h.in b/acconfig.h.in
index a06baf28d2..101a7e5c6e 100644
--- a/acconfig.h.in
+++ b/acconfig.h.in
@@ -4,6 +4,9 @@
#undef PACKAGE
#undef VERSION
+#undef HAVE_STRUCT_FLOCK
+#undef HAVE_TM_GMTOFF
+
#define CONFIGURATION_FILE_PATH "php3.ini"
#define USE_CONFIG_FILE 1
diff --git a/configure.in.in b/configure.in.in
index 97d356b82e..baa390efa1 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -206,6 +206,33 @@ dnl Checks for typedefs, structures, and compiler characteristics.
AC_STRUCT_TM
AC_STRUCT_TIMEZONE
+AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff,
+[AC_TRY_COMPILE([#include <sys/types.h>
+#include <$ac_cv_struct_tm>], [struct tm tm; tm.tm_gmtoff;],
+ ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no)])
+
+if test "$ac_cv_struct_tm_gmtoff" = yes; then
+ AC_DEFINE(HAVE_TM_GMTOFF)
+fi
+
+AC_CACHE_CHECK(for struct flock,php_struct_flock,
+ AC_TRY_COMPILE([
+#include <unistd.h>
+#include <fcntl.h>
+ ],
+ [struct flock x;],
+ [
+ php_struct_flock=yes
+ ],[
+ php_struct_flock=no
+ ])
+)
+if test "$php_struct_flock" = "yes" ; then
+ AC_DEFINE(HAVE_STRUCT_FLOCK, 1)
+else
+ AC_DEFINE(HAVE_STRUCT_FLOCK, 0)
+fi
+
dnl Check for members of the stat structure
AC_STRUCT_ST_BLKSIZE
dnl AC_STRUCT_ST_BLOCKS will screw QNX because fileblocks.o does not exists