Using the best visual is now an option.

[wxWidgets.git] / configure.in

diff --git a/configure.in b/configure.in
index 574f55538556ad73eebc6f2bb5a1c932ad589188..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`
   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"
     ac_save_CFLAGS="$CFLAGS"
     ac_save_LIBS="$LIBS"
     CFLAGS="$CFLAGS $GTK_CFLAGS"


@@ -569,11 +569,13 @@ case "${host}" in
     AC_DEFINE(__GNUWIN32__)
     AC_DEFINE(STRICT)
     AC_DEFINE(WINVER, 0x0400)
     AC_DEFINE(__GNUWIN32__)
     AC_DEFINE(STRICT)
     AC_DEFINE(WINVER, 0x0400)

+    PROGRAM_EXT=".exe"

     DEFAULT_DEFAULT_wxUSE_MSW=1
   ;;
 
   *-pc-os2_emx )
     AC_DEFINE(__EMX__)
     DEFAULT_DEFAULT_wxUSE_MSW=1
   ;;
 
   *-pc-os2_emx )
     AC_DEFINE(__EMX__)

+    PROGRAM_EXT=".exe"

     DEFAULT_DEFAULT_wxUSE_PM=1
   ;;
 
     DEFAULT_DEFAULT_wxUSE_PM=1
   ;;
 


@@ -762,7 +764,7 @@ else
   DEFAULT_wxUSE_LIBPNG=yes
   DEFAULT_wxUSE_LIBJPEG=yes
   DEFAULT_wxUSE_LIBTIFF=yes
   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
 
   DEFAULT_wxUSE_STD_IOSTREAM=no
   DEFAULT_wxUSE_FILE=yes


@@ -1202,7 +1204,6 @@ case "${host}" in
     NUM_TOOLKITS=`expr ${NUM_TOOLKITS} + ${wxUSE_PM:-0}`
     # PATH_IFS is autodetected by OS/2's configure (usually ';')
     LEX_STEM="lexyy"
     NUM_TOOLKITS=`expr ${NUM_TOOLKITS} + ${wxUSE_PM:-0}`
     # PATH_IFS is autodetected by OS/2's configure (usually ';')
     LEX_STEM="lexyy"

-    PROGRAM_EXT=".exe"

   ;;
   *)
     PATH_IFS=':'
   ;;
   *)
     PATH_IFS=':'


@@ -1239,6 +1240,7 @@ done
 
 dnl from "if wxUSE_GUI"
 else
 
 dnl from "if wxUSE_GUI"
 else

+    PATH_IFS=':'

     AC_MSG_RESULT(base only)
 fi
 
     AC_MSG_RESULT(base only)
 fi
 


@@ -1507,7 +1509,6 @@ if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then
     GENERICOBJS="\$(MSW_GENERICOBJS)"
     UNIXOBJS=
     GUIDIST=MSW_DIST
     GENERICOBJS="\$(MSW_GENERICOBJS)"
     UNIXOBJS=
     GUIDIST=MSW_DIST

-    PROGRAM_EXT=.exe

 fi
 
 if test "$wxUSE_GTK" = 1; then
 fi
 
 if test "$wxUSE_GTK" = 1; then


@@ -1524,7 +1525,20 @@ dnl        )
 dnl    )
 
     TOOLKIT_INCLUDE="$GTK_CFLAGS"
 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
     TOOLKIT=GTK
 
     AFMINSTALL=afminstall


@@ -3304,6 +3318,7 @@ AC_OUTPUT([
             Makefile
             demos/Makefile
             demos/bombs/Makefile
             Makefile
             demos/Makefile
             demos/bombs/Makefile

+            demos/dbbrowse/Makefile

             demos/forty/Makefile
             demos/fractal/Makefile
             demos/life/Makefile
             demos/forty/Makefile
             demos/fractal/Makefile
             demos/life/Makefile