Better fix for wxX11 linking problems than r74499.

[wxWidgets.git] / configure

diff --git a/configure b/configure
index afab0708064b150ede0551312838a7a12e0aeeab..04e98042bb7be9953ca69a3be335e023ff53cb63 100755 (executable)
--- a/configure
+++ b/configure
@@ -634,8 +634,6 @@ POSTLINK_COMMAND
 LIBWXMACRES
 WX_RESOURCES_MACOSX_DATA
 WX_RESOURCES_MACOSX_ASCII
 LIBWXMACRES
 WX_RESOURCES_MACOSX_DATA
 WX_RESOURCES_MACOSX_ASCII

-RESPROGRAMOBJ
-RESFLAGS

 RESCOMP
 WX_VERSION_TAG
 DMALLOC_LIBS
 RESCOMP
 WX_VERSION_TAG
 DMALLOC_LIBS


@@ -662,8 +660,6 @@ TOOLCHAIN_FULLNAME
 TOOLCHAIN_NAME
 TOOLKIT_DIR
 TOOLKIT
 TOOLCHAIN_NAME
 TOOLKIT_DIR
 TOOLKIT

-WIN32INSTALL
-AFMINSTALL

 USE_GUI
 WX_LIBRARY_BASENAME_GUI
 WX_LIBRARY_BASENAME_NOGUI
 USE_GUI
 WX_LIBRARY_BASENAME_GUI
 WX_LIBRARY_BASENAME_NOGUI


@@ -706,6 +702,8 @@ COND_USE_EXCEPTIONS_1
 COND_USE_EXCEPTIONS_0
 COND_USE_CAIRO_1
 COND_UNICODE_1
 COND_USE_EXCEPTIONS_0
 COND_USE_CAIRO_1
 COND_UNICODE_1

+COND_TOOLKIT_X11_WXUNIV_1
+COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1

 COND_TOOLKIT_X11_USE_GUI_1
 COND_TOOLKIT_X11
 COND_TOOLKIT_WINCE_WXUNIV_0
 COND_TOOLKIT_X11_USE_GUI_1
 COND_TOOLKIT_X11
 COND_TOOLKIT_WINCE_WXUNIV_0


@@ -737,7 +735,9 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_WXUNIV_0
 COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0
 COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1
 COND_TOOLKIT_GTK_TOOLKIT_VERSION_3
 COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0
 COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1
 COND_TOOLKIT_GTK_TOOLKIT_VERSION_3

+COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_1

 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0
 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0

+COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1

 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0
 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1
 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2
 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0
 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1
 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2


@@ -19762,8 +19762,6 @@ if test "$wants_win32" = 1 ; then
     USE_WIN32=1
     $as_echo "#define __WIN32__ 1" >>confdefs.h
 
     USE_WIN32=1
     $as_echo "#define __WIN32__ 1" >>confdefs.h
 

-    $as_echo "#define __WIN95__ 1" >>confdefs.h
-

     $as_echo "#define __WINDOWS__ 1" >>confdefs.h
 
     $as_echo "#define __GNUWIN32__ 1" >>confdefs.h
     $as_echo "#define __WINDOWS__ 1" >>confdefs.h
 
     $as_echo "#define __GNUWIN32__ 1" >>confdefs.h


@@ -19825,8 +19823,6 @@ if test "x$ac_cv_lib_cExt_drand48" = xyes; then :
   LIBS="$LIBS -lcExt"
 fi
 
   LIBS="$LIBS -lcExt"
 fi
 

-      else
-                    RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res"

       fi
                                     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc/libc version" >&5
 $as_echo_n "checking for gcc/libc version... " >&6; }
       fi
                                     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc/libc version" >&5
 $as_echo_n "checking for gcc/libc version... " >&6; }


@@ -23249,9 +23245,6 @@ fi
 
 
 
 
 
 

-AFMINSTALL=
-WIN32INSTALL=
-

 TOOLKIT=
 TOOLKIT_INCLUDE=
 WIDGET_SET=
 TOOLKIT=
 TOOLKIT_INCLUDE=
 WIDGET_SET=


@@ -23297,12 +23290,7 @@ fi
                         LIBS="$LIBS -lkernel32 -luser32"
     esac
 
                         LIBS="$LIBS -lkernel32 -luser32"
     esac
 

-        RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE"
-    RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
-
-                WXCONFIG_RESFLAGS="--define __WIN32__ --define __WIN95__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE"
-
-        WIN32INSTALL=win32install
+        WXCONFIG_RESFLAGS="--define __WIN32__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE"

 fi
 
 if test "$wxUSE_GUI" = "yes"; then
 fi
 
 if test "$wxUSE_GUI" = "yes"; then


@@ -24646,7 +24634,6 @@ done
 
         TOOLKIT_INCLUDE="$wx_cv_cflags_gtk"
         GUI_TK_LIBRARY="$wx_cv_libs_gtk $GUI_TK_LIBRARY"
 
         TOOLKIT_INCLUDE="$wx_cv_cflags_gtk"
         GUI_TK_LIBRARY="$wx_cv_libs_gtk $GUI_TK_LIBRARY"

-        AFMINSTALL=afminstall

         TOOLKIT=GTK
         GUIDIST=GTK_DIST
 
         TOOLKIT=GTK
         GUIDIST=GTK_DIST
 


@@ -24916,7 +24903,6 @@ $as_echo "MicroWindows' libraries found." >&6; }
 
         wxUSE_UNIVERSAL="yes"
 
 
         wxUSE_UNIVERSAL="yes"
 

-        AFMINSTALL=afminstall

         TOOLKIT=MICROWIN
         GUIDIST=MICROWIN_DIST
 
         TOOLKIT=MICROWIN
         GUIDIST=MICROWIN_DIST
 


@@ -25614,7 +25600,6 @@ fi
 
                                 GUI_TK_LIBRARY=`echo $X_LIBS | sed 's/ -LNONE//' | sed 's/ -RNONE//'`
         TOOLKIT_INCLUDE=`echo $X_CFLAGS | sed 's/ -INONE//'`
 
                                 GUI_TK_LIBRARY=`echo $X_LIBS | sed 's/ -LNONE//' | sed 's/ -RNONE//'`
         TOOLKIT_INCLUDE=`echo $X_CFLAGS | sed 's/ -INONE//'`

-        AFMINSTALL=afminstall

         COMPILED_X_PROGRAM=0
 
     fi
         COMPILED_X_PROGRAM=0
 
     fi


@@ -40821,11 +40806,21 @@ EOF
         COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0=""
     fi
 
         COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0=""
     fi
 

+    COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1="#"
+    if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then
+        COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1=""
+    fi
+

     COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0="#"
     if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$WXUNIV" = "x0" ; then
         COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0=""
     fi
 
     COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0="#"
     if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$WXUNIV" = "x0" ; then
         COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0=""
     fi
 

+    COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_1="#"
+    if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$WXUNIV" = "x1" ; then
+        COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_1=""
+    fi
+

     COND_TOOLKIT_GTK_TOOLKIT_VERSION_3="#"
     if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" ; then
         COND_TOOLKIT_GTK_TOOLKIT_VERSION_3=""
     COND_TOOLKIT_GTK_TOOLKIT_VERSION_3="#"
     if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" ; then
         COND_TOOLKIT_GTK_TOOLKIT_VERSION_3=""


@@ -40981,6 +40976,16 @@ EOF
         COND_TOOLKIT_X11_USE_GUI_1=""
     fi
 
         COND_TOOLKIT_X11_USE_GUI_1=""
     fi
 

+    COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1="#"
+    if test "x$TOOLKIT" = "xX11" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then
+        COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1=""
+    fi
+
+    COND_TOOLKIT_X11_WXUNIV_1="#"
+    if test "x$TOOLKIT" = "xX11" -a "x$WXUNIV" = "x1" ; then
+        COND_TOOLKIT_X11_WXUNIV_1=""
+    fi
+

     COND_UNICODE_1="#"
     if test "x$UNICODE" = "x1" ; then
         COND_UNICODE_1=""
     COND_UNICODE_1="#"
     if test "x$UNICODE" = "x1" ; then
         COND_UNICODE_1=""


@@ -41396,10 +41401,6 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq
 
 
 
 
 
 

-
-
-
-