X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cf44735628cecb0326b953c4872260f223fc8769..b823f5a145f4823ce823591824855c34204936e4:/install/gtk/configure.in

diff --git a/install/gtk/configure.in b/install/gtk/configure.in
index 460a2a4c86..9c1dfefdba 100644
--- 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
@@ -593,7 +550,7 @@ USE_GTK=1
 USE_UNIX=1
 
 TOOLKIT=GTK
-TOOLKIT_DEF=__GTK__
+TOOLKIT_DEF=__WXGTK__
 
 USE_LINUX=
 USE_SGI=
@@ -741,11 +698,11 @@ AC_OVERRIDES(shared,shared,
 USE_SHARED)
 
 AC_OVERRIDES(optimise,optimise,
-**--without-optimise      create unoptimised code,
+**--with-optimise      create optimised code,
 USE_OPTIMISE)
 
 AC_OVERRIDES(debug_flag,debug_flag,
-**--with-debug_flag       create code with DEBUG define set to 1,
+**--with-debug_flag       create code with WXDEBUG define set to 1,
 USE_DEBUG_FLAG)
 
 AC_OVERRIDES(debug_info,debug_info,
@@ -784,8 +741,8 @@ dnl ----------------------------------------------------------------
 dnl user options for code features (no choice yet)
 dnl ----------------------------------------------------------------
 
-AC_OVERRIDES(apple-ieee, apple-ieee,
-**--with-apple-ieee	  use the Apple IEEE codec,
+AC_OVERRIDES(apple_ieee, apple_ieee,
+**--with_apple_ieee	  use the Apple IEEE codec,
 USE_APPLE_IEEE)
 
 AC_OVERRIDES(storable,storable,
@@ -921,6 +878,11 @@ if test "$USE_LIBPNG" = 1 ; then
   LIBPNG="LIBPNG"
 fi
 
+APPLE_IEEE=NONE
+if test "$USE_APPLE_IEEE" = 1 ; then
+  APPLE_IEEE="APPLE_IEEE"
+  AC_DEFINE_UNQUOTED(USE_APPLE_IEEE,$USE_APPLE_IEEE)
+fi
 
 STORABLE=NONE
 if test "$USE_STORABLE_CLASSES" = 1 ; then
@@ -934,14 +896,16 @@ if test "$USE_AUTOTRANS" = 1 ; then
   AC_DEFINE_UNQUOTED(USE_AUTOTRANS,$USE_AUTOTRANS)
 fi
 
-DEBUG=
+WXDEBUG=
 if test "$USE_DEBUG_INFO" = 1 ; then
-  DEBUG="-g"
+  WXDEBUG="-g"
 fi
-AC_SUBST(DEBUG)
+AC_SUBST(WXDEBUG)
 
 if test "$USE_DEBUG_FLAG" = 1 ; then
-  AC_DEFINE_UNQUOTED(DEBUG,$USE_DEBUG_FLAG)
+  AC_DEFINE_UNQUOTED(WXDEBUG,$USE_DEBUG_FLAG)
+  WXDEBUG_DEFINE="-D__WXDEBUG__"
+  AC_SUBST(WXDEBUG_DEFINE)
 fi
 
 if test "$USE_MEM_TRACING" = 1 ; then
@@ -1175,7 +1139,7 @@ if test "$USE_GTK" = 1; then
        GUI_TK_INCLUDE="$GTK_CFLAGS"
        GUI_TK_LIBRARY="$GTK_LIBS"
   ], AC_MSG_ERROR(Are gtk-config and the GTK in path and up-to-date?))
-  AC_DEFINE(__GTK__)
+  AC_DEFINE(__WXGTK__)
 fi
 AC_SUBST(GUI_TK_INCLUDE)
 AC_SUBST(GUI_TK_LIBRARY)
@@ -1184,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 ----------------------------------------------------------------