Using the best visual is now an option.

[wxWidgets.git] / configure.in

diff --git a/configure.in b/configure.in
index 59b5c3450477bff66e092a19e986acc72152535e..17f158dfd95fbfbfe70b24f7a8ae40bb631c50b1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -38,7 +38,7 @@ AC_DEFUN(AM_PATH_GTK,
   no_gtk=""
   if test "$GTK_CONFIG" != "no" ; then
     GTK_CFLAGS=`$GTK_CONFIG --cflags`
-    GTK_LIBS=`$GTK_CONFIG --libs`
+    GTK_LIBS=`$GTK_CONFIG --libs gthread`
     ac_save_CFLAGS="$CFLAGS"
     ac_save_LIBS="$LIBS"
     CFLAGS="$CFLAGS $GTK_CFLAGS"
@@ -409,7 +409,7 @@ dnl WX_INTERFACE_AGE = 0
 
 WX_MAJOR_VERSION_NUMBER=2
 WX_MINOR_VERSION_NUMBER=1
-WX_RELEASE_NUMBER=12
+WX_RELEASE_NUMBER=13
 
 WX_INTERFACE_AGE=0
 WX_BINARY_AGE=0
@@ -569,11 +569,13 @@ case "${host}" in
     AC_DEFINE(__GNUWIN32__)
     AC_DEFINE(STRICT)
     AC_DEFINE(WINVER, 0x0400)
+    PROGRAM_EXT=".exe"
     DEFAULT_DEFAULT_wxUSE_MSW=1
   ;;
 
   *-pc-os2_emx )
     AC_DEFINE(__EMX__)
+    PROGRAM_EXT=".exe"
     DEFAULT_DEFAULT_wxUSE_PM=1
   ;;
 
@@ -762,7 +764,7 @@ else
   DEFAULT_wxUSE_LIBPNG=yes
   DEFAULT_wxUSE_LIBJPEG=yes
   DEFAULT_wxUSE_LIBTIFF=yes
-  DEFAULT_wxUSE_ODBC=yes
+  DEFAULT_wxUSE_ODBC=no
 
   DEFAULT_wxUSE_STD_IOSTREAM=no
   DEFAULT_wxUSE_FILE=yes
@@ -1192,6 +1194,11 @@ fi
 
 dnl we suppose that expr exists...
 NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_WINE:-0} + ${wxUSE_MINGW:-0} + ${wxUSE_CYGWIN:-0}`
+
+dnl Allow wxUSE_PM only for OS/2 with EMX.
+dnl Path separator; ':' for unix.
+dnl Stem for flex output; lexyy for OS/2, lex.yy otherwise
+dnl Extension for programs; '.exe' for OS/2 and msw builds (set later).
 case "${host}" in
   *-pc-os2_emx )
     NUM_TOOLKITS=`expr ${NUM_TOOLKITS} + ${wxUSE_PM:-0}`
@@ -1201,6 +1208,7 @@ case "${host}" in
   *)
     PATH_IFS=':'
     LEX_STEM="lex.yy"
+    PROGRAM_EXT=
   ;;
 esac
 
@@ -1232,6 +1240,7 @@ done
 
 dnl from "if wxUSE_GUI"
 else
+    PATH_IFS=':'
     AC_MSG_RESULT(base only)
 fi
 
@@ -1409,6 +1418,7 @@ SEARCH_INCLUDE="\
     /usr/x386/include         \
     /usr/XFree86/include/X11  \
                               \
+    X:/XFree86/include        \
     X:/XFree86/include/X11    \
                               \
     /usr/include/gtk          \
@@ -1466,9 +1476,6 @@ WXGTK13=
 
 WXWINE=
 
-dnl Extension for programs; '.exe' for msw builds
-PROGRAM_EXT=
-
 if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then
     if test "$cross_compiling" = "yes" ; then
         AC_MSG_WARN(Cross compiling --- skipping windows.h check)
@@ -1502,7 +1509,6 @@ if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then
     GENERICOBJS="\$(MSW_GENERICOBJS)"
     UNIXOBJS=
     GUIDIST=MSW_DIST
-    PROGRAM_EXT=.exe
 fi
 
 if test "$wxUSE_GTK" = 1; then
@@ -1519,7 +1525,20 @@ dnl        )
 dnl    )
 
     TOOLKIT_INCLUDE="$GTK_CFLAGS"
-    GUI_TK_LIBRARY="$GTK_LIBS -lgthread"
+
+dnl Appending gthreads as it was done here is not portable, instead
+dnl we now call "gtk-config --libs gthread" which sets the right library
+dnl name for us. The following hacks are no longer required.
+
+    GUI_TK_LIBRARY="$GTK_LIBS"
+
+dnl dnl On FreeBSD, the libs are called gtk12 etc, so we must append gthread12
+dnl    echo $GTK_LIBS | fgrep -q "glib12"
+dnl    if test $? = 0  ; then
+dnl       GUI_TK_LIBRARY="$GTK_LIBS -gthread12"
+dnl    else
+dnl       GUI_TK_LIBRARY="$GTK_LIBS -lgthread"
+dnl    fi
     TOOLKIT=GTK
 
     AFMINSTALL=afminstall
@@ -3299,6 +3318,7 @@ AC_OUTPUT([
             Makefile
             demos/Makefile
             demos/bombs/Makefile
+            demos/dbbrowse/Makefile
             demos/forty/Makefile
             demos/fractal/Makefile
             demos/life/Makefile
@@ -3316,11 +3336,13 @@ AC_OUTPUT([
             samples/docvwmdi/Makefile
             samples/dnd/Makefile
             samples/drawing/Makefile
+            samples/exec/Makefile
             samples/font/Makefile
             samples/grid/Makefile
             samples/help/Makefile
             samples/image/Makefile
             samples/internat/Makefile
+            samples/ipc/Makefile
             samples/layout/Makefile
             samples/listctrl/Makefile
             samples/mdi/Makefile