X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c0c22f7f4f32bdc6eaf5b3663404327ccd039c0a..15965b8b1156721bf7ef2bdcbcc09c57fd5d0c0e:/configure.in diff --git a/configure.in b/configure.in index ad4b955b30..ca2a5c4e4e 100644 --- a/configure.in +++ b/configure.in @@ -62,7 +62,7 @@ main () exit(1); } - if (gtk_minor_version > 0) return FALSE; + if (gtk_minor_version == 1) return FALSE; return !((gtk_major_version > major) || ((gtk_major_version == major) && (gtk_minor_version > minor)) || @@ -867,7 +867,7 @@ DEFAULT_wxUSE_WX_RESOURCES=1 DEFAULT_wxUSE_RPC=0 DEFAULT_wxUSE_HELP=1 -DEFAULT_wxUSE_UNICODE=1 +DEFAULT_wxUSE_UNICODE=0 DEFAULT_wxUSE_WCSRTOMBS=0 dnl ---------------------------------------------------------------- @@ -1101,10 +1101,10 @@ WX_LINK= MAKEINCLUDE= if test "$wxUSE_GTK" = 1; then - AM_PATH_GTK(1.0.4, [ + AM_PATH_GTK(1.0.0, [ GUI_TK_INCLUDE="$GTK_CFLAGS" GUI_TK_LIBRARY="$GTK_LIBS" - ], AC_MSG_ERROR(Is gtk-config in path and GTK+ is version 1.0.4 up-to 1.0.6?)) + ], AC_MSG_ERROR(Is gtk-config in path and GTK+ is version 1.2.X or 1.0.X?)) TOOLKIT=GTK TOOLKIT_DEF=__WXGTK__ WX_LINK=-lwx_gtk2 @@ -1494,13 +1494,10 @@ UNIX_THREAD="" if test "$wxUSE_THREADS" = "1"; then dnl find if POSIX threads are available - dnl For glibc 2 users who have the old libc 5 too check pthread-0.7 first - AC_CHECK_LIB(pthread-0.7, pthread_create, [ - UNIX_THREAD="unix/threadpsx.cpp" - THREADS_LINK="pthread-0.7" - ],[ - dnl standard lib name is pthread - AC_CHECK_LIB(pthread, pthread_create, [ + dnl standard lib name is pthread + dnl We no longer test for pthread-0.7 as it breaks compilation on some + dnl glibc2 systems, especially for static linkage. + AC_CHECK_LIB(pthread, pthread_create, [ UNIX_THREAD="unix/threadpsx.cpp" THREADS_LINK="pthread" ], [ @@ -1515,8 +1512,6 @@ if test "$wxUSE_THREADS" = "1"; then ]) ]) ]) - ]) - if test "$THREADS_LINK" != ""; then AC_DEFINE(wxUSE_THREADS) else