Added wx.GetTopLevelWindows() function which returns a copy of the

[wxWidgets.git] / configure

diff --git a/configure b/configure
index c7d4f82cf95a386acd090e5ec9637ef8d1503b5c..121c36154622b9c80f633e91f4da834c010a1fe8 100755 (executable)
--- a/configure
+++ b/configure
@@ -25090,8 +25090,8 @@ equivalent variable and GTK+ is version 1.2.3 or above.
         if test "$WXGTK20" = 1; then
             save_CFLAGS="$CFLAGS"
             save_LIBS="$LIBS"
         if test "$WXGTK20" = 1; then
             save_CFLAGS="$CFLAGS"
             save_LIBS="$LIBS"

-            CFLAGS="$CFLAGS $GTK_CFLAGS"
-            LIBS="$LIBS $GTK_LIBS"
+            CFLAGS="$CFLAGS $wx_cv_cflags_gtk"
+            LIBS="$LIBS $wx_cv_lib_gtk"

 
 
 for ac_func in pango_font_family_is_monospace
 
 
 for ac_func in pango_font_family_is_monospace


@@ -31544,9 +31544,9 @@ main ()
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1


@@ -31559,7 +31559,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&

-        { ac_try='test -s conftest.$ac_objext'
+        { ac_try='test -s conftest$ac_exeext'

   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?


@@ -31573,7 +31573,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
 wx_cv_func_cxa_demangle=no
 
 fi
 wx_cv_func_cxa_demangle=no
 
 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext

 
 
 fi
 
 
 fi


@@ -36485,11 +36486,17 @@ _ACEOF
 fi
 
 if test "$wxUSE_DEBUGREPORT" = "yes"; then
 fi
 
 if test "$wxUSE_DEBUGREPORT" = "yes"; then

-    cat >>confdefs.h <<\_ACEOF
+    if test "$USE_OS2" = "1"; then
+        { echo "$as_me:$LINENO: WARNING: Creating debug reports not supported under OS/2 yet, disabled" >&5
+echo "$as_me: WARNING: Creating debug reports not supported under OS/2 yet, disabled" >&2;}
+        wxUSE_DEBUGREPORT=no
+    else
+        cat >>confdefs.h <<\_ACEOF

 #define wxUSE_DEBUGREPORT 1
 _ACEOF
 
 #define wxUSE_DEBUGREPORT 1
 _ACEOF
 

-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS debugrpt"
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS debugrpt"
+    fi

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


@@ -40412,32 +40419,29 @@ fi
 WXCONFIG_EXTRALIBS="$LIBS"
 
 if test "$wxUSE_REGEX" = "builtin" ; then
 WXCONFIG_EXTRALIBS="$LIBS"
 
 if test "$wxUSE_REGEX" = "builtin" ; then

-    wxconfig_3rdparty="$wxconfig_3rdparty regex${lib_unicode_suffix}"
+    wxconfig_3rdparty="regex${lib_unicode_suffix} $wxconfig_3rdparty"

 fi
 if test "$wxUSE_EXPAT" = "builtin" ; then
 fi
 if test "$wxUSE_EXPAT" = "builtin" ; then

-    wxconfig_3rdparty="$wxconfig_3rdparty expat"
+    wxconfig_3rdparty="expat $wxconfig_3rdparty"

 fi
 if test "$wxUSE_ODBC" = "builtin" ; then
 fi
 if test "$wxUSE_ODBC" = "builtin" ; then

-    wxconfig_3rdparty="$wxconfig_3rdparty odbc"
+    wxconfig_3rdparty="odbc $wxconfig_3rdparty"

 fi
 if test "$wxUSE_LIBTIFF" = "builtin" ; then
 fi
 if test "$wxUSE_LIBTIFF" = "builtin" ; then

-    wxconfig_3rdparty="$wxconfig_3rdparty tiff"
+    wxconfig_3rdparty="tiff $wxconfig_3rdparty"

 fi
 if test "$wxUSE_LIBJPEG" = "builtin" ; then
 fi
 if test "$wxUSE_LIBJPEG" = "builtin" ; then

-    wxconfig_3rdparty="$wxconfig_3rdparty jpeg"
+    wxconfig_3rdparty="jpeg $wxconfig_3rdparty"

 fi
 if test "$wxUSE_LIBPNG" = "builtin" ; then
 fi
 if test "$wxUSE_LIBPNG" = "builtin" ; then

-    wxconfig_3rdparty="$wxconfig_3rdparty png"
+    wxconfig_3rdparty="png $wxconfig_3rdparty"

 fi
 if test "$wxUSE_ZLIB" = "builtin" ; then
 fi
 if test "$wxUSE_ZLIB" = "builtin" ; then

-    wxconfig_3rdparty="$wxconfig_3rdparty zlib"
-fi
-if test "$wxUSE_ODBC" = "builtin" ; then
-    wxconfig_3rdparty="$wxconfig_3rdparty odbc"
+    wxconfig_3rdparty="zlib $wxconfig_3rdparty"

 fi
 
 for i in $wxconfig_3rdparty ; do
 fi
 
 for i in $wxconfig_3rdparty ; do

-    WXCONFIG_EXTRALIBS="$WXCONFIG_EXTRALIBS -lwx${i}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
+    WXCONFIG_EXTRALIBS="-lwx${i}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX} $WXCONFIG_EXTRALIBS"

 done
 
 
 done