applied the bit's of #473508 that were still relevant, and fixed a couple of

[wxWidgets.git] / configure.in

diff --git a/configure.in b/configure.in
index af6c8d3e127c8da22719c5ef9ad97bc9af4838d6..7aafc547e25b7abedd6073ccfab44f00427facd2 100644 (file)
--- 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
@@ -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
-            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
-            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.])
@@ -2387,6 +2389,7 @@ case "${host}" in
 
         dnl If we are cross compiling we want to use the 'full' unix type name for the
         dnl lib, but for a native install use the windows style naming convention.
+        dnl (excepting again that we strip the ELF style version numbers off it).
 
         dnl FIXME: is this GL stuff actually even used for wxMSW?  should it be??
 
@@ -2395,6 +2398,9 @@ case "${host}" in
             WX_LIBRARY_GL="wxmsw_gl${WX_MSW_VERSION}${lib_unicode_suffix}${lib_debug_suffix}"
             WX_LIBRARY_NAME_SHARED="${WX_LIBRARY}.${SO_SUFFIX}"
             WX_LIBRARY_NAME_SHARED_GL="${WX_LIBRARY_GL}.${SO_SUFFIX}"
+        else
+            WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}"
+            WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
         fi
 
 esac
@@ -2506,16 +2512,12 @@ if test "$wxUSE_SHARED" = "yes"; then
 
       *-*-cygwin* | *-*-mingw32* )
 
-        WX_LIBRARY_IMPORTLIB="lib${WX_LIBRARY}.lib"
-
-        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="${WX_LIBRARY_IMPORTLIB}"
+        WX_LIBRARY_IMPORTLIB="${WX_LIBRARY_NAME_SHARED}.a"
 
         SHARED_LD="${CXX} -shared -Wl,--out-implib,lib/${WX_LIBRARY_IMPORTLIB} -o"
         TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DWXUSINGDLL=1"
-        WXMSW_DLL_DEFINES="-UWXUSINGDLL -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1"
+
+        PIC_FLAG="-UWXUSINGDLL -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1"
 
         dnl install shared libs without symlinks
         if test "$wxUSE_OPENGL" = "yes"; then
@@ -2524,9 +2526,6 @@ if test "$wxUSE_SHARED" = "yes"; then
         else
             WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}"
         fi
-        dnl -fPIC is not required for mingw build -- all code is already
-        dnl position independent.
-        PIC_FLAG=
       ;;
 
       *-pc-os2_emx | *-pc-os2-emx )
@@ -4764,7 +4763,6 @@ AC_SUBST(OPENGL_LIBS)
 AC_SUBST(EXTRADEFS)
 AC_SUBST(LIBS)
 AC_SUBST(LD_LIBS)
-AC_SUBST(WXMSW_DLL_DEFINES)
 
 dnl additional resurces settings
 AC_SUBST(RESCOMP)