X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/223e7fbf29d6240c2fc563815009cb7d3fd3285e..d48ad9bd84a5ce6f74ed37633e9d4519e43973a6:/configure.in?ds=sidebyside

diff --git a/configure.in b/configure.in
index bc8c5bfdf3..fd74dbb549 100644
--- a/configure.in
+++ b/configure.in
@@ -1951,7 +1951,7 @@ if test "$wxUSE_GUI" = "yes"; then
                 dnl stupid GTK+ AM macros produce their own messages, so we
                 dnl have to pass to the next line
                 gtk_version_cached=0
-                AC_MSG_RESULT("")
+                AC_MSG_RESULT()
 
                 wx_cv_lib_gtk=
                 if test "x$wxUSE_GTK2" = "xyes"; then
@@ -2234,7 +2234,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
         ALL_OBJECTS="\$(GUIOBJS)"
     fi
 
-    ALL_OBJECTS="${ALL_OBJECTS} \$(COMMONOBJS)"
+    ALL_OBJECTS="${ALL_OBJECTS} \$(COMMONOBJS) \$(GENERICOBJECTS)"
 
     if test "$TOOLKIT" != "MSW"; then
         ALL_OBJECTS="${ALL_OBJECTS} \$(UNIXOBJS)"
@@ -2514,11 +2514,6 @@ if test "$wxUSE_SHARED" = "yes"; then
 
         WX_LIBRARY_IMPORTLIB="${WX_LIBRARY_NAME_SHARED}.a"
 
-        dnl  FIXME: this is a hack..  do we need a --static flag to wx-config?
-        dnl  or is this just plain wrong?
-        dnl  This is NOT compatible with both static and dynamic linking
-        WXCONFIG_LIBS="${WXCONFIG_LIBS}.${SO_SUFFIX}"
-
         SHARED_LD="${CXX} -shared -Wl,--out-implib,lib/${WX_LIBRARY_IMPORTLIB} -o"
         TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DWXUSINGDLL=1"