Merge pull request #231 from viest/master

Style(Build): win32
SeasX · Sep 18, 2018 · fe0c9fa · fe0c9fa
2 parents c5dc878 + 6bb0bb2
commit fe0c9fa
Showing 1 changed file with 28 additions and 35 deletions.
diff --git a/config.w32 b/config.w32
@@ -3,40 +3,33 @@
 ARG_ENABLE("seaslog", "enable seaslog support", "yes");
 
 if (PHP_SEASLOG != "no") {
-    seaslog_source_file="Performance.c \
-        Analyzer.c \
-        StreamWrapper.c \
-        TemplateFormatter.c \
-        ExceptionHook.c \
-        Appender.c \
-        Datetime.c \
-        Logger.c \
-        Buffer.c \
-        ErrorHook.c \
-        Request.c \
-        Common.c"
-
-    seaslog_headers=" include/Analyzer.h \
-        include/Appender.h \
-        include/Buffer.h \
-        include/Common.h \
-        include/Datetime.h \
-        include/ErrorHook.h \
-        include/ExceptionHook.h \
-        include/Logger.h \
-        include/Performance.h \
-        include/php7_wrapper.h \
-        include/Request.h \
-        include/SeasLog.h \
-        include/StreamWrapper.h \
-        include/TemplateFormatter.h"
-
-	EXTENSION("seaslog", "seaslog.c", true, "/I" + configure_module_dirname + "/include /I" + configure_module_dirname);
-
-    ADD_SOURCES(configure_module_dirname + "\\src", seaslog_source_file, "seaslog");
-
-    PHP_INSTALL_HEADERS(configure_module_dirname, "php_seaslog.h" + seaslog_headers);
-
-	AC_DEFINE("HAVE_SEASLOG", 1, "Have Seaslog Support");
+
+    if (CHECK_HEADER_ADD_INCLUDE("SeasLog.h", "CFLAGS_SEASLOG", configure_module_dirname + "\\include;" + PHP_EXTRA_INCLUDES)) {
+
+        seaslog_source_file="Performance.c \
+            Analyzer.c \
+            StreamWrapper.c \
+            TemplateFormatter.c \
+            ExceptionHook.c \
+            Appender.c \
+            Datetime.c \
+            Logger.c \
+            Buffer.c \
+            ErrorHook.c \
+            Request.c \
+            Common.c"
+
+        EXTENSION("seaslog", "seaslog.c");
+
+        ADD_SOURCES(configure_module_dirname + "\\src", seaslog_source_file, "seaslog");
+
+        ADD_FLAG("CFLAGS_SEASLOG", ' /I "' + configure_module_dirname + '" ');
+
+	    AC_DEFINE("HAVE_SEASLOG", 1, "Have Seaslog Support");
+
+    } else {
+        WARNING("seaslog not enabled, headers not found");
+    }
+
 }