Miscellaneous, mostly cosmetic changes. wxPen/wxFont/wxBrush altered so Set...

[wxWidgets.git] / install / gtk / configure.in

diff --git a/install/gtk/configure.in b/install/gtk/configure.in
index 77032b17eb22ce0128373a321e3d27537446db32..9c1dfefdba1df081ced38180a5213b48e890e41f 100644 (file)
--- a/install/gtk/configure.in
+++ b/install/gtk/configure.in
@@ -498,49 +498,6 @@ dnl ##########################
 dnl # checks system services #
 dnl ##########################
 
-
-dnl ##### Threads #####
-USE_THREADS=1
-THREADS_LINK=""
-UNIX_THREAD=""
-
-AC_ARG_WITH(threads,
-[  --without-threads       Force disabling threads ],
-[USE_THREADS="$withval"])
-
-if test "$USE_THREADS" = "1"; then
-  UNIX_THREAD="gtk/threadno.cpp"
-
-  dnl For glibc 2 users who have the old libc 5 too
-
-  AC_CHECK_LIB(pthread-0.7, pthread_create, [
-     UNIX_THREAD="gtk/threadpsx.cpp"
-     THREADS_LINK="-lpthread-0.7"
-     AC_DEFINE(USE_THREADS)
-  ],[
-    AC_CHECK_LIB(pthread, pthread_create, [
-       UNIX_THREAD="gtk/threadpsx.cpp"
-       THREADS_LINK="-lpthread"
-       AC_DEFINE(USE_THREADS)
-    ])
-  ])
-  AC_CHECK_LIB(pthreads, pthread_create, [
-     UNIX_THREAD="gtk/threadpsx.cpp"
-     THREADS_LINK="-lpthreads"
-     AC_DEFINE(USE_THREADS)
-  ])
-  AC_CHECK_HEADER(sys/prctl.h, [
-     UNIX_THREAD="gtk/threadsgi.cpp"
-     AC_DEFINE(USE_THREADS)
-  ])
-fi
-
-AC_SUBST(UNIX_THREAD)
-AC_SUBST(THREADS_LINK)
-dnl   defines UNIX_THREAD it contains the source file to use for threads. (GL)
-dnl   defines THREADS_LINK it contains the thread library to link with. (GL)
-dnl   defines USE_THREADS if thread support is activated. (GL)
-
 AC_SYS_LONG_FILE_NAMES
 dnl   defines HAVE_LONG_FILENAMES if filenames longer then
 dnl                               14 chars are supported
@@ -695,7 +652,6 @@ DEFAULT_USE_MEM_TRACING=0
 DEFAULT_USE_ZLIB=1
 DEFAULT_USE_GDK_IMLIB=1
 DEFAULT_USE_LIBPNG=1
-DEFAULT_USE_ODBC=1
 
 DEFAULT_USE_APPLE_IEEE=1
 DEFAULT_USE_STORABLE_CLASSES=1
@@ -777,10 +733,6 @@ AC_OVERRIDES(libpng,libpng,
 **--with-libpng           use libpng (PNG image format),
 USE_LIBPNG)
 
-AC_OVERRIDES(odbc,odbc,
-**--with-odbc           use iODBC,
-USE_ODBC)
-
 AC_OVERRIDES(opengl,opengl,
 **--with-opengl           use opengl (OpenGL or Mesa),
 USE_OPENGL)
@@ -926,11 +878,6 @@ if test "$USE_LIBPNG" = 1 ; then
   LIBPNG="LIBPNG"
 fi
 
-ODBC=NONE
-if test "$USE_ODBC" = 1 ; then
-  ODBC="ODBC"
-fi
-
 APPLE_IEEE=NONE
 if test "$USE_APPLE_IEEE" = 1 ; then
   APPLE_IEEE="APPLE_IEEE"
@@ -1201,6 +1148,60 @@ AC_SUBST(GUI_TK_LINK)
 AC_SUBST(TOOLKIT)
 AC_SUBST(TOOLKIT_DEF)
 
+dnl ----------------------------------------------------------------
+dnl select  dynamic loader (used by iODBC to load drivers)
+dnl ----------------------------------------------------------------
+
+DL_LIBRARY=-ldl
+
+AC_SUBST(DL_LIBRARY)
+
+dnl ----------------------------------------------------------------
+dnl thread support
+dnl ----------------------------------------------------------------
+
+USE_THREADS=1
+THREADS_LINK=""
+UNIX_THREAD=""
+
+AC_ARG_WITH(threads,
+[  --without-threads       Force disabling threads ],
+[USE_THREADS="$withval"])
+
+if test "$USE_THREADS" = "1"; then
+  UNIX_THREAD="gtk/threadno.cpp"
+
+  dnl For glibc 2 users who have the old libc 5 too
+
+  AC_CHECK_LIB(pthread-0.7, pthread_create, [
+     UNIX_THREAD="gtk/threadpsx.cpp"
+     THREADS_LINK="-lpthread-0.7"
+     AC_DEFINE(USE_THREADS)
+  ],[
+    AC_CHECK_LIB(pthread, pthread_create, [
+       UNIX_THREAD="gtk/threadpsx.cpp"
+       THREADS_LINK="-lpthread"
+       AC_DEFINE(USE_THREADS)
+    ])
+  ])
+  AC_CHECK_LIB(pthreads, pthread_create, [
+     UNIX_THREAD="gtk/threadpsx.cpp"
+     THREADS_LINK="-lpthreads"
+     AC_DEFINE(USE_THREADS)
+  ])
+  AC_CHECK_HEADER(sys/prctl.h, [
+     UNIX_THREAD="gtk/threadsgi.cpp"
+     AC_DEFINE(USE_THREADS)
+  ])
+fi
+
+AC_SUBST(UNIX_THREAD)
+AC_SUBST(THREADS_LINK)
+
+dnl   defines UNIX_THREAD it contains the source file to use for threads. (GL)
+dnl   defines THREADS_LINK it contains the thread library to link with. (GL)
+dnl   defines USE_THREADS if thread support is activated. (GL)
+
 dnl ----------------------------------------------------------------
 dnl search for opengl
 dnl ----------------------------------------------------------------
@@ -1356,15 +1357,11 @@ dnl AC_SUBST(LIBPNG_LIBRARY)
 dnl AC_SUBST(LIBPNG_LINK)
 
 dnl ----------------------------------------------------------------
-dnl search for iODBC
+dnl search for Python
 dnl ----------------------------------------------------------------
-dnl 
-    if test "$USE_ODBC" = 1; then
-      AC_DEFINE_UNQUOTED(USE_ODBC,$USE_ODBC) 
-    fi
 
 dnl ----------------------------------------------------------------
-dnl search for Python
+dnl search for ODBC
 dnl ----------------------------------------------------------------
 
 dnl ----------------------------------------------------------------