Put $(GENERICOBJECTS) back into configure.in for a while, there are still

[wxWidgets.git] / configure.in

diff --git a/configure.in b/configure.in
index be2d7171b5e1e17206ae2846de028133a449c8af..5bf3e59d42edc4d325dc8ca760f227e53161c1ab 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2027,12 +2027,14 @@ equivalent variable and GTK+ is version 1.2.3 or above.
         mgl_lib_type=""
 
         if test "$wxUSE_DEBUG_FLAG" = yes ; then
         mgl_lib_type=""
 
         if test "$wxUSE_DEBUG_FLAG" = yes ; then

-            if test -f $MGL_ROOT/lib/debug/$mgl_os/libmgl.a ; then
+            if test -f $MGL_ROOT/lib/debug/$mgl_os/libmgl.a -o \
+                    -f $MGL_ROOT/lib/debug/$mgl_os/libmgl.so; then

                 mgl_lib_type=debug
             fi
         fi
         if test "x$mgl_lib_type" = x ; then
                 mgl_lib_type=debug
             fi
         fi
         if test "x$mgl_lib_type" = x ; then

-            if test -f $MGL_ROOT/lib/release/$mgl_os/libmgl.a ; then
+            if test -f $MGL_ROOT/lib/release/$mgl_os/libmgl.a -o \
+                    -f $MGL_ROOT/lib/release/$mgl_os/libmgl.so; then

                 mgl_lib_type=release
             else
                 AC_MSG_ERROR([Cannot find MGL libraries, make sure they are compiled.])
                 mgl_lib_type=release
             else
                 AC_MSG_ERROR([Cannot find MGL libraries, make sure they are compiled.])


@@ -2232,7 +2234,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
         ALL_OBJECTS="\$(GUIOBJS)"
     fi
 
         ALL_OBJECTS="\$(GUIOBJS)"
     fi
 

-    ALL_OBJECTS="${ALL_OBJECTS} \$(COMMONOBJS) \$(GENERICOBJS)"
+    ALL_OBJECTS="${ALL_OBJECTS} \$(COMMONOBJS) \$(GENERICOBJECTS)"

 
     if test "$TOOLKIT" != "MSW"; then
         ALL_OBJECTS="${ALL_OBJECTS} \$(UNIXOBJS)"
 
     if test "$TOOLKIT" != "MSW"; then
         ALL_OBJECTS="${ALL_OBJECTS} \$(UNIXOBJS)"


@@ -2512,11 +2514,6 @@ if test "$wxUSE_SHARED" = "yes"; then
 
         WX_LIBRARY_IMPORTLIB="${WX_LIBRARY_NAME_SHARED}.a"
 
 
         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"
 
         SHARED_LD="${CXX} -shared -Wl,--out-implib,lib/${WX_LIBRARY_IMPORTLIB} -o"
         TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DWXUSINGDLL=1"