Move dl stuff from acconfig.h into zend.h. That allows us finer control

when it comes to suppressing dlfcn.h.

diff --git a/Zend/acconfig.h b/Zend/acconfig.h
index 2ddee4eb166a01cf8eb94dfe42947107cbf2f91e..a6de7d427cdb0a2fa8b3305572b3c790aac0c1d3 100644 (file)
--- a/Zend/acconfig.h
+++ b/Zend/acconfig.h
@@ -25,9 +25,6 @@
 
 #undef ZEND_DEBUG
 
-/* Define if you want to enable bc style precision math support */
-#define WITH_BCMATH 0
-
 /* Define if you want to enable memory limit support */
 #define MEMORY_LIMIT 0
 
@@ -55,21 +52,6 @@
 /* Define if you have stdiostream.h */
 #undef HAVE_STDIOSTREAM_H
 
-#ifdef HAVE_DLFCN_H
-# include <dlfcn.h>
-#endif
-
-#if defined(HAVE_LIBDL) && defined(RTLD_NOW)
-# define DL_LOAD(libname)      dlopen(libname, RTLD_NOW)
-# define DL_UNLOAD             dlclose
-# define DL_FETCH_SYMBOL       dlsym
-# define DL_HANDLE             void *
-# define ZEND_EXTENSIONS_SUPPORT 1
-#else
-# define DL_HANDLE             void *
-# define ZEND_EXTENSIONS_SUPPORT 0
-#endif
-
 #if ZEND_BROKEN_SPRINTF
 int zend_sprintf(char *buffer, const char *format, ...);
 #else

diff --git a/Zend/zend.h b/Zend/zend.h
index 34cdab42129016032a1da81c6571eb5218aac19f..ef39a00ebe89c2833429b516aaa950d089f2dea3 100644 (file)
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -53,6 +53,21 @@
 # include <stdarg.h>
 #endif
 
+#ifdef HAVE_DLFCN_H
+# include <dlfcn.h>
+#endif
+
+#if defined(HAVE_LIBDL) && defined(RTLD_NOW)
+# define DL_LOAD(libname)      dlopen(libname, RTLD_NOW)
+# define DL_UNLOAD             dlclose
+# define DL_FETCH_SYMBOL       dlsym
+# define DL_HANDLE             void *
+# define ZEND_EXTENSIONS_SUPPORT 1
+#else
+# define DL_HANDLE             void *
+# define ZEND_EXTENSIONS_SUPPORT 0
+#endif
+
 #if ZEND_DEBUG
 #define ZEND_FILE_LINE_D                               char *__zend_filename, uint __zend_lineno
 #define ZEND_FILE_LINE_DC                              , ZEND_FILE_LINE_D