Changeset 692

Timestamp:

10/30/08 11:18:01 (2 months ago)

Author:

weyrick

Message:

another mingw patch from jean-francois

Location:

trunk/pcc

Files:

• Makefile.config.in (modified) (1 diff)
• configure (modified) (6 diffs)
• configure.in (modified) (2 diffs)

trunk/pcc/Makefile.config.in

@@ -30 +30 @@
 endif
 
+#jfcouic 2008-10-30 begin
+RUNTIME_LIB = -lphp-runtime_$(SU)-$(BIGLOOVERSION)
+PROFILER_LIB = -lprofiler_$(SU)-$(BIGLOOVERSION)
+WEBCONNECT_LIB = -lwebconnect_$(SU)-$(BIGLOOVERSION)
+PHPEVAL_LIB = -lphpeval_$(SU)-$(BIGLOOVERSION)
+
 PCC_LINK_OPTIONS = @PCC_LINK_OPTIONS@
-RUNTIME_DLL_LIBS = $(BIGLOO_LIBS)
-COMPILER_DLL_LIBS = $(BIGLOO_LIBS)
-WEBCONNECT_DLL_LIBS = $(BIGLOO_LIBS)
-EXTENSION_DLL_LIBS = $(BIGLOO_LIBS)
-PROFILER_DLL_LIBS = $(BIGLOO_LIBS)
-DOTEST_LIBS = 
+RUNTIME_DLL_LIBS = $(BIGLOO_LIBS) @RUNTIME_DLL_LIBS@
+COMPILER_DLL_LIBS = $(BIGLOO_LIBS) @COMPILER_DLL_LIBS@
+WEBCONNECT_DLL_LIBS = $(BIGLOO_LIBS) @WEBCONNECT_DLL_LIBS@
+EXTENSION_DLL_LIBS = $(BIGLOO_LIBS) @EXTENSION_DLL_LIBS@
+PROFILER_DLL_LIBS = $(BIGLOO_LIBS) @PROFILER_DLL_LIBS@
+FASTCGI_DLL_LIBS = $(BIGLOO_LIBS) @FASTCGI_DLL_LIBS@
+CGI_DLL_LIBS = $(BIGLOO_LIBS) @CGI_DLL_LIBS@
+MHTTPD_DLL_LIBS = $(BIGLOO_LIBS) @MHTTPD_DLL_LIBS@
+DOTEST_LIBS =  @DOTEST_LIBS@
+#jfcouic 2008-10-30 end
 
 RESOLVER_LIBRARY = @RESOLVER_LIB@

trunk/pcc/configure

@@ -703 +703 @@
 PCC_OS
 PCC_LINK_OPTIONS
+RUNTIME_DLL_LIBS
+COMPILER_DLL_LIBS
+WEBCONNECT_DLL_LIBS
+EXTENSION_DLL_LIBS
+FASTCGI_DLL_LIBS
+CGI_DLL_LIBS
+MHTTPD_DLL_LIBS
+PROFILER_DLL_LIBS
+DOTEST_LIBS
 EXT_LIST
 PHP_EXT_LIST
@@ -4553 +4562 @@
         SO_EXT="dll"
         RESOLVER_LIB=""
-#-future version with the car-type selection : variable $SU have to be resolve
-#   STD_LIBS="-lws2_32 -lbigloo_$SU-$BIGLOO_VERSION -lbigloogc-$BIGLOO_VERSION"
+#jfcouic 2008-10-30 begin : report Makefile.mingw
+#on windows, the DLLs cannot have unresolved symbols
+    RUNTIME_DLL_LIBS="-lws2_32 -liberty"
+    COMPILER_DLL_LIBS="-L../libs/ \$(RUNTIME_LIB) \$(PROFILER_LIB) \$(WEBCONNECT_LIB) -lws2_32"
+    WEBCONNECT_DLL_LIBS="-L../libs/ \$(RUNTIME_LIB) \$(PROFILER_LIB) -lws2_32"
+    FASTCGI_DLL_LIBS="-L../../libs/ \$(RUNTIME_LIB) \$(PROFILER_LIB) \$(PHPEVAL_LIB) \$(WEBCONNECT_LIB) -L/usr/local/lib -lfcgi -lws2_32"
+    CGI_DLL_LIBS="-L../../libs/ \$(RUNTIME_LIB) \$(PROFILER_LIB) \$(PHPEVAL_LIB) \$(WEBCONNECT_LIB) -lws2_32"
+    MHTTPD_DLL_LIBS="-L../../libs/ \$(RUNTIME_LIB) \$(PROFILER_LIB) \$(PHPEVAL_LIB) \$(WEBCONNECT_LIB) -L/usr/local/lib -lwebserver -lws2_32"
+    EXTENSION_DLL_LIBS="-L\$(LIB) \$(RUNTIME_LIB) \$(PROFILER_LIB) \$(PHPEVAL_LIB) -lws2_32 -lm"
+    PROFILER_DLL_LIBS="-L/usr/local/lib -lgw32c -lole32 -luuid"
+    DOTEST_LIBS="-L/usr/local/lib -lgw32c -lws2_32"
+#jfcouic 2008-10-30 end
+#-future version with the SU SUV selection
+#   STD_LIBS="-lws2_32 \$(BIGLOO_LIBS)"
 #-ugly-current for testing
         STD_LIBS="-lws2_32 -lbigloo_u-3.0c -lbigloogc-3.0c"
@@ -5530 +5551 @@
 PCC_LINK_OPTIONS=$PCC_LINK_OPTIONS
 
+#jfcouic 2008-10-30 begin
+RUNTIME_DLL_LIBS=$RUNTIME_DLL_LIBS
+
+COMPILER_DLL_LIBS=$COMPILER_DLL_LIBS
+
+WEBCONNECT_DLL_LIBS=$WEBCONNECT_DLL_LIBS
+
+EXTENSION_DLL_LIBS=$EXTENSION_DLL_LIBS
+
+FASTCGI_DLL_LIBS=$FASTCGI_DLL_LIBS
+
+CGI_DLL_LIBS=$CGI_DLL_LIBS
+
+MHTTPD_DLL_LIBS=$MHTTPD_DLL_LIBS
+
+PROFILER_DLL_LIBS=$PROFILER_DLL_LIBS
+
+DOTEST_LIBS=$DOTEST_LIBS
+
+#jfcouic 2008-10-30 end
 EXT_LIST=$EXT_LIST
 
@@ -6338 +6379 @@
 PCC_OS!$PCC_OS$ac_delim
 PCC_LINK_OPTIONS!$PCC_LINK_OPTIONS$ac_delim
-EXT_LIST!$EXT_LIST$ac_delim
-PHP_EXT_LIST!$PHP_EXT_LIST$ac_delim
-BE_LIST!$BE_LIST$ac_delim
-SO_EXT!$SO_EXT$ac_delim
-BIGLOO_VERSION!$BIGLOO_VERSION$ac_delim
-BIGLOO_LIB_PATH!$BIGLOO_LIB_PATH$ac_delim
-RESOLVER_LIB!$RESOLVER_LIB$ac_delim
-MYSQL_CFLAGS!$MYSQL_CFLAGS$ac_delim
-MYSQL_LIBS!$MYSQL_LIBS$ac_delim
+RUNTIME_DLL_LIBS!$RUNTIME_DLL_LIBS$ac_delim
+COMPILER_DLL_LIBS!$COMPILER_DLL_LIBS$ac_delim
+WEBCONNECT_DLL_LIBS!$WEBCONNECT_DLL_LIBS$ac_delim
+EXTENSION_DLL_LIBS!$EXTENSION_DLL_LIBS$ac_delim
+FASTCGI_DLL_LIBS!$FASTCGI_DLL_LIBS$ac_delim
+CGI_DLL_LIBS!$CGI_DLL_LIBS$ac_delim
+MHTTPD_DLL_LIBS!$MHTTPD_DLL_LIBS$ac_delim
+PROFILER_DLL_LIBS!$PROFILER_DLL_LIBS$ac_delim
+DOTEST_LIBS!$DOTEST_LIBS$ac_delim
 _ACEOF
 
@@ -6388 +6429 @@
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+EXT_LIST!$EXT_LIST$ac_delim
+PHP_EXT_LIST!$PHP_EXT_LIST$ac_delim
+BE_LIST!$BE_LIST$ac_delim
+SO_EXT!$SO_EXT$ac_delim
+BIGLOO_VERSION!$BIGLOO_VERSION$ac_delim
+BIGLOO_LIB_PATH!$BIGLOO_LIB_PATH$ac_delim
+RESOLVER_LIB!$RESOLVER_LIB$ac_delim
+MYSQL_CFLAGS!$MYSQL_CFLAGS$ac_delim
+MYSQL_LIBS!$MYSQL_LIBS$ac_delim
 ODBC_CFLAGS!$ODBC_CFLAGS$ac_delim
 ODBC_LIBS!$ODBC_LIBS$ac_delim
@@ -6409 +6459 @@
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 19; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 28; then
     break
   elif $ac_last_try; then

trunk/pcc/configure.in

@@ -330 +330 @@
         SO_EXT="dll"
         RESOLVER_LIB=""
-#-future version with the car-type selection : variable $SU have to be resolve
-#   STD_LIBS="-lws2_32 -lbigloo_$SU-$BIGLOO_VERSION -lbigloogc-$BIGLOO_VERSION"
+#jfcouic 2008-10-30 begin : report Makefile.mingw
+#on windows, the DLLs cannot have unresolved symbols
+    RUNTIME_DLL_LIBS="-lws2_32 -liberty"
+    COMPILER_DLL_LIBS="-L../libs/ \$(RUNTIME_LIB) \$(PROFILER_LIB) \$(WEBCONNECT_LIB) -lws2_32"
+    WEBCONNECT_DLL_LIBS="-L../libs/ \$(RUNTIME_LIB) \$(PROFILER_LIB) -lws2_32"
+    FASTCGI_DLL_LIBS="-L../../libs/ \$(RUNTIME_LIB) \$(PROFILER_LIB) \$(PHPEVAL_LIB) \$(WEBCONNECT_LIB) -L/usr/local/lib -lfcgi -lws2_32"
+    CGI_DLL_LIBS="-L../../libs/ \$(RUNTIME_LIB) \$(PROFILER_LIB) \$(PHPEVAL_LIB) \$(WEBCONNECT_LIB) -lws2_32"
+    MHTTPD_DLL_LIBS="-L../../libs/ \$(RUNTIME_LIB) \$(PROFILER_LIB) \$(PHPEVAL_LIB) \$(WEBCONNECT_LIB) -L/usr/local/lib -lwebserver -lws2_32"
+    EXTENSION_DLL_LIBS="-L\$(LIB) \$(RUNTIME_LIB) \$(PROFILER_LIB) \$(PHPEVAL_LIB) -lws2_32 -lm"
+    PROFILER_DLL_LIBS="-L/usr/local/lib -lgw32c -lole32 -luuid"
+    DOTEST_LIBS="-L/usr/local/lib -lgw32c -lws2_32"
+#jfcouic 2008-10-30 end
+#-future version with the SU SUV selection
+#   STD_LIBS="-lws2_32 \$(BIGLOO_LIBS)"
 #-ugly-current for testing
         STD_LIBS="-lws2_32 -lbigloo_u-3.0c -lbigloogc-3.0c"
@@ -391 +403 @@
 AC_SUBST(PCC_OS, $PCC_OS)
 AC_SUBST(PCC_LINK_OPTIONS, $PCC_LINK_OPTIONS)
+#jfcouic 2008-10-30 begin
+AC_SUBST(RUNTIME_DLL_LIBS, $RUNTIME_DLL_LIBS)
+AC_SUBST(COMPILER_DLL_LIBS, $COMPILER_DLL_LIBS)
+AC_SUBST(WEBCONNECT_DLL_LIBS, $WEBCONNECT_DLL_LIBS)
+AC_SUBST(EXTENSION_DLL_LIBS, $EXTENSION_DLL_LIBS)
+AC_SUBST(FASTCGI_DLL_LIBS, $FASTCGI_DLL_LIBS)
+AC_SUBST(CGI_DLL_LIBS, $CGI_DLL_LIBS)
+AC_SUBST(MHTTPD_DLL_LIBS, $MHTTPD_DLL_LIBS)
+AC_SUBST(PROFILER_DLL_LIBS, $PROFILER_DLL_LIBS)
+AC_SUBST(DOTEST_LIBS, $DOTEST_LIBS)
+#jfcouic 2008-10-30 end
 AC_SUBST(EXT_LIST, $EXT_LIST)
 AC_SUBST(PHP_EXT_LIST, $PHP_EXT_LIST)