2008-06-02 Alp Toker <alp@nuanti.com>
authoralp@webkit.org <alp@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 3 Jun 2008 00:30:19 +0000 (00:30 +0000)
committeralp@webkit.org <alp@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 3 Jun 2008 00:30:19 +0000 (00:30 +0000)
        GTK+/autotools Windows build system fixes.

        * GNUmakefile.am:
        * configure.ac:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@34329 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
GNUmakefile.am
configure.ac

index beb37a8..53cae8d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-06-02  Alp Toker  <alp@nuanti.com>
+
+        GTK+/autotools Windows build system fixes.
+
+        * GNUmakefile.am:
+        * configure.ac:
+
 2008-06-02  Jan Michael Alonzo  <jmalonzo@webkit.org>
 
         Reviewed by Alp Toker.
index 8b21fb0..87d4747 100644 (file)
@@ -72,6 +72,12 @@ global_cxxflags += \
        -fno-rtti
 endif
 
+# -no-undefined required for building DLLs on Windows
+# It breaks the build on other platforms, so we use it conditionally
+if OS_WIN32
+no_undefined = -no-undefined
+endif
+
 # Shared libraries
 lib_LTLIBRARIES = \
        libwebkit-1.0.la
@@ -237,7 +243,8 @@ libwebkit_1_0_la_CPPFLAGS = \
 
 libwebkit_1_0_la_LDFLAGS = \
        $(COVERAGE_LDFLAGS) \
-       -version-info @LIBWEBKITGTK_VERSION@
+       -version-info @LIBWEBKITGTK_VERSION@ \
+       $(no_undefined)
 
 libwebkit_1_0_la_LIBADD = \
        libWebCore.la
@@ -259,6 +266,10 @@ global_cppflags += -DXP_UNIX
 webcore_libadd += -lXt
 endif
 
+# Used for symbol exports on Windows
+webcoregtk_cppflags += \
+       -DBUILDING_WEBKIT
+
 if !ENABLE_DEBUG
 global_cppflags += -DNDEBUG
 else
index e5d9a8e..e871aae 100644 (file)
@@ -48,14 +48,14 @@ if test -z "$CFLAGS"; then
    CFLAGS="-O2"
 fi
 
-# programs
-AC_DISABLE_STATIC
-AM_PROG_LIBTOOL
-DOLT
-AC_PROG_INSTALL
 AM_PROG_CC_STDC
-AC_PROG_CXX
 AM_PROG_CC_C_O
+AC_PROG_CXX
+AC_PROG_INSTALL
+AC_DISABLE_STATIC
+AC_LIBTOOL_WIN32_DLL
+AC_PROG_LIBTOOL
+DOLT
 
 # check for -fvisibility=hidden compiler support (GCC >= 4)
 saved_CFLAGS="$CFLAGS"