this code is now common (src/unix)

[wxWidgets.git] / configure.in

diff --git a/configure.in b/configure.in
index 1447c47dea1ef015f038a29490a5d466ce2acb56..30088adaf45820eb77a893a043070c2a786f37e0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4,14 +4,14 @@ dnl Top-level configure.in for wxWindows by Robert Roebling, Wolfram Gloger
 dnl and Martin Sperl.
 dnl
 dnl This script is under the wxWindows licence.
 dnl and Martin Sperl.
 dnl
 dnl This script is under the wxWindows licence.

-dnl
+dnl $Id$

 dnl ////////////////////////////////////////////////////////////////////////
 
 dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
 dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
 dnl
 AC_DEFUN(AM_PATH_GTK,
 dnl ////////////////////////////////////////////////////////////////////////
 
 dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
 dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
 dnl
 AC_DEFUN(AM_PATH_GTK,

-[dnl 
+[dnl

 dnl Get the cflags and libraries from the gtk-config script
 dnl
 AC_ARG_WITH(gtk-prefix,[**--with-gtk-prefix=PFX       Prefix where GTK is installed],
 dnl Get the cflags and libraries from the gtk-config script
 dnl
 AC_ARG_WITH(gtk-prefix,[**--with-gtk-prefix=PFX       Prefix where GTK is installed],


@@ -51,7 +51,7 @@ dnl
 #include <gtk/gtk.h>
 #include <stdio.h>
 
 #include <gtk/gtk.h>
 #include <stdio.h>
 

-int 
+int

 main ()
 {
   int major, minor, micro;
 main ()
 {
   int major, minor, micro;


@@ -61,9 +61,11 @@ main ()
      exit(1);
    }
 
      exit(1);
    }
 

+   if (gtk_minor_version > 0) return FALSE;
+

    return !((gtk_major_version > major) ||
    return !((gtk_major_version > major) ||

-           ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
-           ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)));
+           ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
+           ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)));

 }
 ],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
      CFLAGS="$ac_save_CFLAGS"
 }
 ],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
      CFLAGS="$ac_save_CFLAGS"


@@ -73,7 +75,7 @@ main ()
   fi
   if test "x$no_gtk" = x ; then
      AC_MSG_RESULT(yes)
   fi
   if test "x$no_gtk" = x ; then
      AC_MSG_RESULT(yes)

-     ifelse([$2], , :, [$2])     
+     ifelse([$2], , :, [$2])

   else
      AC_MSG_RESULT(no)
      GTK_CFLAGS=""
   else
      AC_MSG_RESULT(no)
      GTK_CFLAGS=""


@@ -183,7 +185,7 @@ AC_DEFUN(AC_INCLUDE_PATH_EXIST,
   if test $result = 0; then
     ac_path_to_include=""
   else
   if test $result = 0; then
     ac_path_to_include=""
   else

-    ac_path_to_include="-I$1"    
+    ac_path_to_include="-I$1"

   fi
 ])
 
   fi
 ])
 


@@ -195,7 +197,7 @@ AC_DEFUN(AC_LINK_PATH_EXIST,
   if test $result = 0; then
     ac_path_to_link=""
   else
   if test $result = 0; then
     ac_path_to_link=""
   else

-    ac_path_to_link="-L$1"    
+    ac_path_to_link="-L$1"

   fi
 ])
 
   fi
 ])
 


@@ -233,13 +235,26 @@ dnl ------------------------------------------------------------------------
 dnl search path for includes and libraries
 dnl ------------------------------------------------------------------------
 
 dnl search path for includes and libraries
 dnl ------------------------------------------------------------------------
 

+dnl VZ: added standard locations for Xm.h for Irix, HP-UX and SunOS (19.02.99)

 SEARCH_INCLUDE="\
 SEARCH_INCLUDE="\

+    /usr/Motif-1.2/include    \
+    /usr/Motif-2.1/include    \
+                              \
+    /usr/include/Motif1.2     \
+    /opt/xpm/include/X11      \
+                              \

     /usr/Motif1.2/include     \
     /usr/Motif1.2/include     \

-                             \
+    /usr/dt/include           \
+    /usr/include/Xm           \
+                              \

     /usr/X11R6/include        \
     /usr/X11R5/include        \
     /usr/X11R4/include        \
                               \
     /usr/X11R6/include        \
     /usr/X11R5/include        \
     /usr/X11R4/include        \
                               \

+    /usr/X11R6/lib            \
+    /usr/X11R5/lib            \
+    /usr/X11R4/lib            \
+                              \

     /usr/include/X11R6        \
     /usr/include/X11R5        \
     /usr/include/X11R4        \
     /usr/include/X11R6        \
     /usr/include/X11R5        \
     /usr/include/X11R4        \


@@ -262,6 +277,9 @@ SEARCH_INCLUDE="\
     /usr/XFree86/include/X11  \
                               \
     /usr/include              \
     /usr/XFree86/include/X11  \
                               \
     /usr/include              \

+    /usr/include/gtk          \
+    /usr/include/gdk          \
+    /usr/include/glib         \

     /usr/local/include        \
     /usr/unsupported/include  \
     /usr/athena/include       \
     /usr/local/include        \
     /usr/unsupported/include  \
     /usr/athena/include       \


@@ -269,16 +287,14 @@ SEARCH_INCLUDE="\
     /usr/lpp/Xamples/include  \
                               \
     /usr/local/include/gtk    \
     /usr/lpp/Xamples/include  \
                               \
     /usr/local/include/gtk    \

-    /usr/X11R6/include/Xm     \
-    /usr/X11/include/Xm       \
+    /usr/local/include/qt     \

     /usr/include/qt           \
                               \
     /usr/openwin/include      \
     /usr/openwin/share/include \
     "
 
     /usr/include/qt           \
                               \
     /usr/openwin/include      \
     /usr/openwin/share/include \
     "
 

-SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` \
-    "
+SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` "

 
 dnl ------------------------------------------------------------------------
 dnl standard checks
 
 dnl ------------------------------------------------------------------------
 dnl standard checks


@@ -301,7 +317,7 @@ CFLAGS=`echo "$CFLAGS" | sed 's/-g//g'`
 
 dnl does compiler support -c and -o simultaniously
 AC_PROG_CC_C_O
 
 dnl does compiler support -c and -o simultaniously
 AC_PROG_CC_C_O

-dnl   defines NO_MINUS_C_MINUS_O if compiler does not accept 
+dnl   defines NO_MINUS_C_MINUS_O if compiler does not accept

 dnl                              both switches simultaniously
 dnl what is the c-preprocessor
 AC_PROG_CPP
 dnl                              both switches simultaniously
 dnl what is the c-preprocessor
 AC_PROG_CPP


@@ -371,8 +387,8 @@ fi
 echo dummy > sub/file
 ${MAKE-make} -f confMake VPATH=sub 2> config.log > /dev/null
 RESULT=$?
 echo dummy > sub/file
 ${MAKE-make} -f confMake VPATH=sub 2> config.log > /dev/null
 RESULT=$?

-rm -f sub/file check final_file config.log confMake
-rmdir sub 
+rm -f sub/file check final_file confMake
+rmdir sub

 if test "$RESULT" = 0; then
   AC_MSG_RESULT(yes)
 else
 if test "$RESULT" = 0; then
   AC_MSG_RESULT(yes)
 else


@@ -387,7 +403,7 @@ export MAKE=gmake; ./configure  for sh-type shells
 setenv MAKE gmake; ./configure  for csh-type shells
 Also please do remember to use gmake in this case every time
 you are trying to compile.
 setenv MAKE gmake; ./configure  for csh-type shells
 Also please do remember to use gmake in this case every time
 you are trying to compile.

-) 
+)

 fi
 
 dnl ####################
 fi
 
 dnl ####################


@@ -431,6 +447,26 @@ if test "$ac_cv_header_linux_joystick_h" = "yes"; then
 fi
 AC_SUBST(GTK_JOYSTICK)
 
 fi
 AC_SUBST(GTK_JOYSTICK)
 

+dnl check for vprintf/vsprintf() which are GNU extensions
+AC_FUNC_VPRINTF
+dnl check for vsnprintf() which is another GNU extension
+AC_CHECK_FUNCS(vsnprintf)
+
+dnl check for usleep() and nanosleep() which is better in MT programs
+AC_CHECK_FUNCS(nanosleep,
+        AC_DEFINE(HAVE_NANOSLEEP),
+        [AC_CHECK_LIB(posix4, nanosleep, AC_DEFINE(HAVE_NANOSLEEP))])
+AC_CHECK_FUNCS(usleep)
+
+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
+AC_CHECK_HEADERS(iostream)
+if test "x$HAVE_IOSTREAM" = "x" ; then
+  AC_DEFINE(wxUSE_IOSTREAMH)
+fi
+AC_LANG_RESTORE
+
+dnl   defines HAVE_IOSTREAM

 dnl ###################
 dnl # checks typedefs #
 dnl ###################
 dnl ###################
 dnl # checks typedefs #
 dnl ###################


@@ -454,16 +490,16 @@ dnl # checks structures #
 dnl #####################
 
 AC_HEADER_STAT
 dnl #####################
 
 AC_HEADER_STAT

-dnl   defines STAT_MACROS_BROKEN if S_ISDIR and S_ISREG 
+dnl   defines STAT_MACROS_BROKEN if S_ISDIR and S_ISREG

 dnl                              do not work properly
 AC_HEADER_TIME
 dnl   defines TIME_WITH_SYS_TIME if time.h and sys/time.h can
 dnl                              both be included
 dnl                              do not work properly
 AC_HEADER_TIME
 dnl   defines TIME_WITH_SYS_TIME if time.h and sys/time.h can
 dnl                              both be included

-AC_STRUCT_ST_BLKSIZE 
+AC_STRUCT_ST_BLKSIZE

 dnl   defines HAVE_ST_BLKSIZE if struct stat contains st_blksize
 dnl   defines HAVE_ST_BLKSIZE if struct stat contains st_blksize

-AC_STRUCT_ST_BLOCKS 
+AC_STRUCT_ST_BLOCKS

 dnl   defines HAVE_ST_BLOCKS if struct stat contains st_blocks
 dnl   defines HAVE_ST_BLOCKS if struct stat contains st_blocks

-AC_STRUCT_ST_RDEV 
+AC_STRUCT_ST_RDEV

 dnl   defines HAVE_ST_RDEV if struct stat contains st_rdev
 AC_STRUCT_TM
 dnl   defines TM_IN_SYS_TIME if struct tm is not in time.h
 dnl   defines HAVE_ST_RDEV if struct stat contains st_rdev
 AC_STRUCT_TM
 dnl   defines TM_IN_SYS_TIME if struct tm is not in time.h


@@ -492,6 +528,7 @@ dnl   defines WORDS_BIGENDIAN if system is big endian
 AC_CHECK_SIZEOF(int *)
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(long)
 AC_CHECK_SIZEOF(int *)
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(long)

+AC_CHECK_SIZEOF(long long)

 dnl   defines the size of certain types of variables in SIZEOF_???
 
 dnl ############################
 dnl   defines the size of certain types of variables in SIZEOF_???
 
 dnl ############################


@@ -508,10 +545,10 @@ dnl   defines HAVE_LONG_FILENAMES if filenames longer then
 dnl                               14 chars are supported
 
 dnl AC_SYS_RESTARTABLE_SYSCALLS
 dnl                               14 chars are supported
 
 dnl AC_SYS_RESTARTABLE_SYSCALLS

-dnl   defines HAVE_RESTARTABLE_SYSCALLS if the system restarts a 
+dnl   defines HAVE_RESTARTABLE_SYSCALLS if the system restarts a

 dnl                                     system call that is interrupted
 dnl                                     by a signal
 dnl                                     system call that is interrupted
 dnl                                     by a signal

-                                          
+

 dnl #################
 dnl # checks PARSER #
 dnl #################
 dnl #################
 dnl # checks PARSER #
 dnl #################


@@ -529,9 +566,63 @@ dnl   defines LEXLIB with the appropriate library
 dnl what type is yytext
 AC_DECL_YYTEXT
 dnl   defines YYTEXT_POINTER  if yytext is char*
 dnl what type is yytext
 AC_DECL_YYTEXT
 dnl   defines YYTEXT_POINTER  if yytext is char*

-dnl   defines LEX_OUTPUT_ROOT as to the base of the 
+dnl   defines LEX_OUTPUT_ROOT as to the base of the

 dnl                           filename output by the lexer
 
 dnl                           filename output by the lexer
 

+dnl ###################################
+dnl ##  Check for dynamic load module #
+dnl ###################################
+
+DL_LIBRARY=
+AC_CHECK_FUNCS(dlopen, AC_DEFINE(HAVE_LIBDL),
+[AC_CHECK_LIB(dl, dlopen, [AC_DEFINE(HAVE_LIBDL) DL_LIBRARY="-ldl"],
+ [AC_CHECK_LIB(dld, dld_link, [AC_DEFINE(HAVE_DLD) DL_LIBRARY="-ldld"],
+   [AC_CHECK_FUNCS(shl_load, AC_DEFINE(HAVE_SHL_LOAD) )]
+  )]
+ )]
+)
+AC_SUBST(DL_LIBRARY)
+
+AC_CACHE_CHECK([for underscore before symbols], libltdl_cv_uscore, [
+  echo "main(){int i=1;} fnord(){int i=23; int ltuae=42;}" > conftest.c
+  ${CC} -c conftest.c > /dev/null
+  if (nm conftest.o | grep _fnord) > /dev/null; then
+    libltdl_cv_uscore=yes
+  else
+    libltdl_cv_uscore=no
+  fi
+  rm -f conftest*
+])
+
+if test x"$libltdl_cv_uscore" = xyes; then
+  if test x"$ac_cv_func_dlopen" = xyes ||
+     test x"$ac_cv_lib_dl_dlopen" = xyes ; then
+       AC_CACHE_CHECK([whether we have to add an underscore for dlsym],
+               libltdl_cv_need_uscore, [dnl
+               AC_TRY_RUN([
+#include <dlfcn.h>
+#include <stdio.h>
+fnord() { int i=42;}
+main() { void *self, *ptr1, *ptr2; self=dlopen(NULL,RTLD_LAZY);
+    if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord");
+    if(ptr1 && !ptr2) exit(0); } exit(1); }
+],     libltdl_cv_need_uscore=no, libltdl_cv_need_uscore=yes,
+       libltdl_cv_need_uscore=no
+)])
+  fi
+fi
+
+if test x"$libltdl_cv_need_uscore" = xyes; then
+   AC_DEFINE(NEED_USCORE)
+fi
+
+dnl ##########################################
+dnl ##  Check for specific library functions #
+dnl ##########################################
+
+dnl Checks for library functions.
+AC_CHECK_FUNCS(strerror)
+

 dnl ------------------------------------------------------------------------
 dnl main includes
 dnl ------------------------------------------------------------------------
 dnl ------------------------------------------------------------------------
 dnl main includes
 dnl ------------------------------------------------------------------------


@@ -553,7 +644,6 @@ dnl ------------------------------------------------------------------------
 
 USE_UNIX=1
 
 
 USE_UNIX=1
 

-

 USE_LINUX=
 USE_SGI=
 USE_HPUX=
 USE_LINUX=
 USE_SGI=
 USE_HPUX=


@@ -571,6 +661,7 @@ USE_VMS=
 USE_ULTRIX=
 USE_DATA_GENERAL=
 
 USE_ULTRIX=
 USE_DATA_GENERAL=
 

+AC_DEFINE(__UNIX__)

 case "${canonical}" in
   *-hp-hpux* )
     USE_HPUX=1
 case "${canonical}" in
   *-hp-hpux* )
     USE_HPUX=1


@@ -579,14 +670,20 @@ case "${canonical}" in
   *-*-linux* )
     USE_LINUX=1
     AC_DEFINE(__LINUX__)
   *-*-linux* )
     USE_LINUX=1
     AC_DEFINE(__LINUX__)

+    TMP=`uname -m`
+    if test "x$TMP" = "xalpha"
+    then
+      USE_ALPHA=1
+      AC_DEFINE(__ALPHA__)
+    fi

   ;;
   ;;

-  *-*-irix5* | *-*-irix6* ) 
+  *-*-irix5* | *-*-irix6* )

     USE_SGI=1
     USE_SVR4=1
     AC_DEFINE(__SGI__)
     AC_DEFINE(__SVR4__)
   ;;
     USE_SGI=1
     USE_SVR4=1
     AC_DEFINE(__SGI__)
     AC_DEFINE(__SVR4__)
   ;;

-  *-*-solaris2* ) 
+  *-*-solaris2* )

     USE_SUN=1
     USE_SOLARIS=1
     USE_SVR4=1
     USE_SUN=1
     USE_SOLARIS=1
     USE_SVR4=1


@@ -594,7 +691,7 @@ case "${canonical}" in
     AC_DEFINE(__SOLARIS__)
     AC_DEFINE(__SVR4__)
   ;;
     AC_DEFINE(__SOLARIS__)
     AC_DEFINE(__SVR4__)
   ;;

-  *-*-sunos4* ) 
+  *-*-sunos4* )

     USE_SUN=1
     USE_SUNOS=1
     USE_BSD=1
     USE_SUN=1
     USE_SUNOS=1
     USE_BSD=1


@@ -608,25 +705,25 @@ case "${canonical}" in
     AC_DEFINE(__FREEBSD__)
     AC_DEFINE(__BSD__)
   ;;
     AC_DEFINE(__FREEBSD__)
     AC_DEFINE(__BSD__)
   ;;

-  *-*-osf* ) 
+  *-*-osf* )

     USE_ALPHA=1
     USE_OSF=1
     AC_DEFINE(__ALPHA__)
     AC_DEFINE(__OSF__)
   ;;
     USE_ALPHA=1
     USE_OSF=1
     AC_DEFINE(__ALPHA__)
     AC_DEFINE(__OSF__)
   ;;

-  *-*-dgux5* ) 
+  *-*-dgux5* )

     USE_ALPHA=1
     USE_SVR4=1
     AC_DEFINE(__ALPHA__)
     AC_DEFINE(__SVR4__)
   ;;
     USE_ALPHA=1
     USE_SVR4=1
     AC_DEFINE(__ALPHA__)
     AC_DEFINE(__SVR4__)
   ;;

-  *-*-sysv5* ) 
+  *-*-sysv5* )

     USE_SYSV=1
     USE_SVR4=1
     AC_DEFINE(__SYSV__)
     AC_DEFINE(__SVR4__)
   ;;
     USE_SYSV=1
     USE_SVR4=1
     AC_DEFINE(__SYSV__)
     AC_DEFINE(__SVR4__)
   ;;

-  *-*-aix* ) 
+  *-*-aix* )

     USE_AIX=1
     USE_SYSV=1
     USE_SVR4=1
     USE_AIX=1
     USE_SYSV=1
     USE_SVR4=1


@@ -644,69 +741,56 @@ dnl ------------------------------------------------------------------------
 
 AC_OVERRIDES_PREPARE
 
 
 AC_OVERRIDES_PREPARE
 

-DEFAULT_USE_GTK=1
-DEFAULT_USE_QT=0
-DEFAULT_USE_MOTIF=0
-
-DEFAULT_wxUSE_THREADS=1
-
-DEFAULT_USE_SHARED=1
-DEFAULT_USE_OPTIMISE=1
-DEFAULT_USE_PROFILE=0
-DEFAULT_USE_DEBUG_FLAG=0
-DEFAULT_USE_DEBUG_INFO=0
-DEFAULT_USE_MEM_TRACING=0
-DEFAULT_USE_DMALLOC=0
-DEFAULT_USE_APPLE_IEEE=1
-DEFAULT_USE_IOSTREAMH=1
-
-DEFAULT_USE_ZLIB=1
-DEFAULT_USE_GDK_IMLIB=1
-DEFAULT_USE_LIBPNG=1
-DEFAULT_USE_ODBC=1
-
-DEFAULT_USE_COMBOBOX=1
-DEFAULT_USE_GAUGE=1
-DEFAULT_USE_SCROLLBAR=1
-DEFAULT_USE_LISTCTRL=1
-DEFAULT_USE_TREECTRL=1
-DEFAULT_USE_GRID=1
-DEFAULT_USE_TAB_DIALOG=1
-DEFAULT_USE_NOTEBOOK=1
-
-DEFAULT_USE_TIMEDATE=1
-DEFAULT_USE_FRACTION=1
-DEFAULT_USE_LOG=1
-DEFAULT_USE_INTL=1
-DEFAULT_USE_CONFIG=1
-DEFAULT_USE_STREAMS=1
-DEFAULT_USE_SERIAL=1
-DEFAULT_USE_FILE=1
-DEFAULT_USE_TEXTFILE=1
-
-DEFAULT_USE_AFM_FOR_POSTSCRIPT=1
+DEFAULT_wxUSE_GTK=1
+DEFAULT_wxUSE_QT=0
+DEFAULT_wxUSE_MOTIF=0
+
+DEFAULT_wxUSE_THREADS=0
+
+DEFAULT_wxUSE_SHARED=1
+DEFAULT_wxUSE_OPTIMISE=1
+DEFAULT_wxUSE_PROFILE=0
+DEFAULT_wxUSE_DEBUG_FLAG=0
+DEFAULT_wxUSE_DEBUG_INFO=0
+DEFAULT_wxUSE_MEM_TRACING=0
+DEFAULT_wxUSE_DMALLOC=0
+DEFAULT_wxUSE_APPLE_IEEE=1
+DEFAULT_wxUSE_IOSTREAMH=1
+
+DEFAULT_wxUSE_ZLIB=1
+DEFAULT_wxUSE_LIBPNG=1
+DEFAULT_wxUSE_LIBJPEG=0
+DEFAULT_wxUSE_ODBC=1
+
+DEFAULT_wxUSE_TIMEDATE=1
+DEFAULT_wxUSE_INTL=1
+DEFAULT_wxUSE_CONFIG=1
+DEFAULT_wxUSE_STREAMS=1
+DEFAULT_wxUSE_SOCKETS=1
+DEFAULT_wxUSE_SERIAL=1
+DEFAULT_wxUSE_DYNLIB_CLASS=1
+
+DEFAULT_wxUSE_AFM_FOR_POSTSCRIPT=1

 DEFAULT_WX_NORMALIZED_PS_FONTS=1
 DEFAULT_WX_NORMALIZED_PS_FONTS=1

-DEFAULT_USE_POSTSCRIPT=1
+DEFAULT_wxUSE_POSTSCRIPT=1

 
 

-DEFAULT_USE_IPC=1
-DEFAULT_USE_RESOURCES=1
-DEFAULT_USE_CONSTRAINTS=1
-DEFAULT_USE_CLIPBOARD=0
-DEFAULT_USE_DND=1
+DEFAULT_wxUSE_IPC=1
+DEFAULT_wxUSE_RESOURCES=1
+DEFAULT_wxUSE_CLIPBOARD=1
+DEFAULT_wxUSE_TOOLTIPS=1
+DEFAULT_wxUSE_DRAG_AND_DROP=1

 
 

-DEFAULT_USE_MDI_ARCHITECTURE=1
-DEFAULT_USE_DOC_VIEW_ARCHITECTURE=1
-DEFAULT_USE_PRINTING_ARCHITECTURE=1
+DEFAULT_wxUSE_MDI_ARCHITECTURE=1
+DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=1
+DEFAULT_wxUSE_PRINTING_ARCHITECTURE=1

 
 

-DEFAULT_USE_PROLOGIO=1
-DEFAULT_USE_WX_RESOURCES=1
-DEFAULT_USE_RPC=0
+DEFAULT_wxUSE_PROLOGIO=1
+DEFAULT_wxUSE_WX_RESOURCES=1
+DEFAULT_wxUSE_RPC=0
+DEFAULT_wxUSE_HELP=1

 
 

-DEFAULT_USE_OPENGL=0
-DEFAULT_USE_METAFILE=0
-DEFAULT_USE_WXGRAPH=0
-DEFAULT_USE_WXTREE=0
-DEFAULT_USE_HELP=0
+DEFAULT_wxUSE_UNICODE=1
+DEFAULT_wxUSE_WCSRTOMBS=0

 
 dnl ----------------------------------------------------------------
 dnl toolkit options
 
 dnl ----------------------------------------------------------------
 dnl toolkit options


@@ -714,15 +798,15 @@ dnl ----------------------------------------------------------------
 
 AC_OVERRIDES(gtk,gtk,
 **--with-gtk              use GTK,
 
 AC_OVERRIDES(gtk,gtk,
 **--with-gtk              use GTK,

-USE_GTK)
+wxUSE_GTK)

 
 AC_OVERRIDES(qt,qt,
 **--with-qt               use Qt,
 
 AC_OVERRIDES(qt,qt,
 **--with-qt               use Qt,

-USE_QT)
+wxUSE_QT)

 
 AC_OVERRIDES(motif,motif,
 **--with-motif            use Motif/Lesstif,
 
 AC_OVERRIDES(motif,motif,
 **--with-motif            use Motif/Lesstif,

-USE_MOTIF)
+wxUSE_MOTIF)

 
 dnl ----------------------------------------------------------------
 dnl compile options
 
 dnl ----------------------------------------------------------------
 dnl compile options


@@ -730,35 +814,47 @@ dnl ----------------------------------------------------------------
 
 AC_OVERRIDES(shared,shared,
 **--with-shared           create shared libraries,
 
 AC_OVERRIDES(shared,shared,
 **--with-shared           create shared libraries,

-USE_SHARED)
+wxUSE_SHARED)

 
 AC_OVERRIDES(optimise,optimise,
 **--with-optimise         create optimised code,
 
 AC_OVERRIDES(optimise,optimise,
 **--with-optimise         create optimised code,

-USE_OPTIMISE)
+wxUSE_OPTIMISE)

 
 AC_OVERRIDES(debug_flag,debug_flag,
 **--with-debug_flag       create code with WXDEBUG define set to 1,
 
 AC_OVERRIDES(debug_flag,debug_flag,
 **--with-debug_flag       create code with WXDEBUG define set to 1,

-USE_DEBUG_FLAG)
+wxUSE_DEBUG_FLAG)

 
 AC_OVERRIDES(debug_info,debug_info,
 **--with-debug_info       create code with debuging information,
 
 AC_OVERRIDES(debug_info,debug_info,
 **--with-debug_info       create code with debuging information,

-USE_DEBUG_INFO)
+wxUSE_DEBUG_INFO)
+
+AC_OVERRIDES(debug_gdb,debug_gdb,
+**--with-debug_gdb        create code with extra GDB debuging information,
+wxUSE_DEBUG_GDB)

 
 AC_OVERRIDES(mem_tracing,mem_tracing,
 **--with-mem_traing       create code with memory tracing,
 
 AC_OVERRIDES(mem_tracing,mem_tracing,
 **--with-mem_traing       create code with memory tracing,

-USE_MEM_TRACING)
+wxUSE_MEM_TRACING)

 
 AC_OVERRIDES(dmalloc,dmalloc,
 **--with-dmalloc          use dmalloc memory debug library (www.letters.com/dmalloc/),
 
 AC_OVERRIDES(dmalloc,dmalloc,
 **--with-dmalloc          use dmalloc memory debug library (www.letters.com/dmalloc/),

-USE_DMALLOC)
+wxUSE_DMALLOC)

 
 AC_OVERRIDES(profile,profile,
 **--with-profile          create code with profiling information,
 
 AC_OVERRIDES(profile,profile,
 **--with-profile          create code with profiling information,

-USE_PROFILE)
+wxUSE_PROFILE)

 
 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)
+wxUSE_APPLE_IEEE)
+
+AC_OVERRIDES(threads,threads,
+**--with-threads          for enabling threads,
+wxUSE_THREADS)
+
+AC_OVERRIDES(dynlib,dynlib,
+**--with-dynlib           to compile wxLibrary class,
+wxUSE_DYNLIB_CLASS)

 
 dnl ----------------------------------------------------------------
 dnl user options for libraries
 
 dnl ----------------------------------------------------------------
 dnl user options for libraries


@@ -766,59 +862,19 @@ dnl ----------------------------------------------------------------
 
 AC_OVERRIDES(zlib,zlib,
 **--with-zlib             use zlib for LZW comression,
 
 AC_OVERRIDES(zlib,zlib,
 **--with-zlib             use zlib for LZW comression,

-USE_ZLIB)
-
-AC_OVERRIDES(gdk_imlib,gdk_imlib,
-**--with-gdk_imlib        use Raster's gdk_imlib (Image library),
-USE_GDK_IMLIB)
+wxUSE_ZLIB)

 
 AC_OVERRIDES(libpng,libpng,
 **--with-libpng           use libpng (PNG image format),
 
 AC_OVERRIDES(libpng,libpng,
 **--with-libpng           use libpng (PNG image format),

-USE_LIBPNG)
+wxUSE_LIBPNG)
+
+AC_OVERRIDES(libjpeg,libjpeg,
+**--with-libjpeg          use libjpeg (JPEG image format),
+wxUSE_LIBJPEG)

 
 AC_OVERRIDES(odbc,odbc,
 **--with-odbc             use iODBC and wxODBC classes,
 
 AC_OVERRIDES(odbc,odbc,
 **--with-odbc             use iODBC and wxODBC classes,

-USE_ODBC)
-
-AC_OVERRIDES(opengl,opengl,
-**--with-opengl           use OpenGL (or Mesa),
-USE_OPENGL)
-
-dnl ----------------------------------------------------------------
-dnl user options for GUI control classes
-dnl ----------------------------------------------------------------
-
-AC_OVERRIDES(gauge,gauge,
-**--with-gauge            use wxGauge class,
-USE_GAUGE)
-
-AC_OVERRIDES(combobox,combobox,
-**--with-combobox         use wxComboBox class,
-USE_COMBOBOX)
-
-AC_OVERRIDES(scrollbar,scrollbar,
-**--with-scrollbar        use wxScrollbar class,
-USE_SCROLLBAR)
-
-AC_OVERRIDES(listctrl,listctrl,
-**--with-listctrl         use wxListCtrl class,
-USE_LISTCTRL)
-
-AC_OVERRIDES(treectrl,treectrl,
-**--with-treectrl         use wxTreeCtrl class,
-USE_TREECTRL)
-
-AC_OVERRIDES(grid,grid,
-**--with-grid             use wxGrid class,
-USE_GRID)
-
-AC_OVERRIDES(tab_dialog,tab_dialog,
-**--with-tab_dialog       use wxTabDia class,
-USE_TAB_DIALOG)
-
-AC_OVERRIDES(notebook,notebook,
-**--with-notebook         use wxNotebook class,
-USE_NOTEBOOK)
+wxUSE_ODBC)

 
 dnl ----------------------------------------------------------------
 dnl user options for non-GUI classes
 
 dnl ----------------------------------------------------------------
 dnl user options for non-GUI classes


@@ -826,39 +882,27 @@ dnl ----------------------------------------------------------------
 
 AC_OVERRIDES(timedate, timedate,
 **--with-timedate         use wxTime and wxDate classes,
 
 AC_OVERRIDES(timedate, timedate,
 **--with-timedate         use wxTime and wxDate classes,

-USE_TIMEDATE)
-
-AC_OVERRIDES(fraction,fraction,
-**--with-fraction         use wxFraction class,
-USE_FRACTION)
-
-AC_OVERRIDES(log,log,
-**--with-log              use logging system,
-USE_LOG)
+wxUSE_TIMEDATE)

 
 AC_OVERRIDES(intl,intl,
 **--with-intl             use internationalization system,
 
 AC_OVERRIDES(intl,intl,
 **--with-intl             use internationalization system,

-USE_INTL)
+wxUSE_INTL)

 
 AC_OVERRIDES(config,config,
 **--with-config           use wxConfig class,
 
 AC_OVERRIDES(config,config,
 **--with-config           use wxConfig class,

-USE_CONFIG)
+wxUSE_CONFIG)

 
 AC_OVERRIDES(streams,streams,
 **--with-streams          use wxStream etc classes,
 
 AC_OVERRIDES(streams,streams,
 **--with-streams          use wxStream etc classes,

-USE_STREAMS)
+wxUSE_STREAMS)

 
 AC_OVERRIDES(serial,serial,
 **--with-serial           use class serialization,
 
 AC_OVERRIDES(serial,serial,
 **--with-serial           use class serialization,

-USE_SERIAL)
+wxUSE_SERIAL)

 
 

-AC_OVERRIDES(file,file,
-**--with-file             use wxFile class,
-USE_FILE)
-
-AC_OVERRIDES(textfile,textfile,
-**--with-textfile         use wxTextFile class,
-USE_TEXTFILE)
+AC_OVERRIDES(sockets,sockets,
+**--with-sockets         use wxSocket etc classes,
+wxUSE_SOCKETS)

 
 dnl ----------------------------------------------------------------
 dnl user options for PostScript
 
 dnl ----------------------------------------------------------------
 dnl user options for PostScript


@@ -866,7 +910,7 @@ dnl ----------------------------------------------------------------
 
 AC_OVERRIDES(afmfonts,afmfonts,
 **--with-afmfonts         use Adobe Font Metric Font table,
 
 AC_OVERRIDES(afmfonts,afmfonts,
 **--with-afmfonts         use Adobe Font Metric Font table,

-USE_AFM_FOR_POSTSCRIPT)
+wxUSE_AFM_FOR_POSTSCRIPT)

 
 AC_OVERRIDES(normalized, normalized,
 **--with-PS-normalized    use normalized PS fonts,
 
 AC_OVERRIDES(normalized, normalized,
 **--with-PS-normalized    use normalized PS fonts,


@@ -874,7 +918,19 @@ WX_NORMALIZED_PS_FONTS)
 
 AC_OVERRIDES(postscript, postscript,
 **--with-postscript       use wxPostscriptDC device context,
 
 AC_OVERRIDES(postscript, postscript,
 **--with-postscript       use wxPostscriptDC device context,

-USE_POSTSCRIPT)
+wxUSE_POSTSCRIPT)
+
+dnl ----------------------------------------------------------------
+dnl user options for wxString and Unicode
+dnl ----------------------------------------------------------------
+
+AC_OVERRIDES(unicode,unicode,
+**--with-unicode          compile wxString with Unicode support,
+wxUSE_UNICODE)
+
+AC_OVERRIDES(wcsrtombs,wcsrtombs,
+**--with-wcsrtombs        use wcsrtombs instead of (buggy in GNU libc5) wcstombs,
+wxUSE_WCSRTOMBS)

 
 dnl ----------------------------------------------------------------
 dnl user options for Prolog and Resources
 
 dnl ----------------------------------------------------------------
 dnl user options for Prolog and Resources


@@ -882,15 +938,15 @@ dnl ----------------------------------------------------------------
 
 AC_OVERRIDES(wxresources,wxresources,
 **--with-wxresources      use wxWindows's resources,
 
 AC_OVERRIDES(wxresources,wxresources,
 **--with-wxresources      use wxWindows's resources,

-USE_WX_RESOURCES)
+wxUSE_WX_RESOURCES)

 
 AC_OVERRIDES(prologio,prologio,
 **--with-prologio         use Prolog IO library,
 
 AC_OVERRIDES(prologio,prologio,
 **--with-prologio         use Prolog IO library,

-USE_PROLOGIO)
+wxUSE_PROLOGIO)

 
 AC_OVERRIDES(rpc,RPC,
 **--with-rpc              use Prolog's remote procedure calls,
 
 AC_OVERRIDES(rpc,RPC,
 **--with-rpc              use Prolog's remote procedure calls,

-USE_RPC)
+wxUSE_RPC)

 
 dnl ----------------------------------------------------------------
 dnl user options for misc stuff
 
 dnl ----------------------------------------------------------------
 dnl user options for misc stuff


@@ -898,23 +954,23 @@ dnl ----------------------------------------------------------------
 
 AC_OVERRIDES(ipc,IPC,
 **--with-ipc              use interprocess communication (wxSocket etc.),
 
 AC_OVERRIDES(ipc,IPC,
 **--with-ipc              use interprocess communication (wxSocket etc.),

-USE_IPC)
+wxUSE_IPC)

 
 AC_OVERRIDES(resources,resources,
 **--with-resources        use X resources for saving information,
 
 AC_OVERRIDES(resources,resources,
 **--with-resources        use X resources for saving information,

-USE_RESOURCES)
+wxUSE_RESOURCES)

 
 AC_OVERRIDES(clipboard,clipboard,
 **--with-clipboard        use wxClipboard classes,
 
 AC_OVERRIDES(clipboard,clipboard,
 **--with-clipboard        use wxClipboard classes,

-USE_CLIPBOARD)
+wxUSE_CLIPBOARD)
+
+AC_OVERRIDES(tooltips,tooltips,
+**--with-tooltips         use tooltips,
+wxUSE_TOOLTIPS)

 
 AC_OVERRIDES(dnd,dnd,
 **--with-dnd              use Drag'n'Drop classes,
 
 AC_OVERRIDES(dnd,dnd,
 **--with-dnd              use Drag'n'Drop classes,

-USE_DND)
-
-AC_OVERRIDES(constraints,constrains,
-**--with-constraints      use layout-constraints system,
-USE_CONSTRAINTS)
+wxUSE_DRAG_AND_DROP)

 
 dnl ----------------------------------------------------------------
 dnl user options for architectures
 
 dnl ----------------------------------------------------------------
 dnl user options for architectures


@@ -922,46 +978,35 @@ dnl ----------------------------------------------------------------
 
 AC_OVERRIDES(mdi,mdi,
 **--with-mdi              use multiple document interface architecture,
 
 AC_OVERRIDES(mdi,mdi,
 **--with-mdi              use multiple document interface architecture,

-USE_MDI_ARCHITECTURE)
+wxUSE_MDI_ARCHITECTURE)

 
 AC_OVERRIDES(docview,docview,
 **--with-docview          use document view architecture,
 
 AC_OVERRIDES(docview,docview,
 **--with-docview          use document view architecture,

-USE_DOC_VIEW_ARCHITECTURE)
+wxUSE_DOC_VIEW_ARCHITECTURE)

 
 AC_OVERRIDES(printarch,printarch,
 **--with-printarch        use printing architecture,
 
 AC_OVERRIDES(printarch,printarch,
 **--with-printarch        use printing architecture,

-USE_PRINTING_ARCHITECTURE)
+wxUSE_PRINTING_ARCHITECTURE)
+
+AC_OVERRIDES(help,help,
+**--with-help             use help (using external browser at present),
+wxUSE_HELP)

 
 

-dnl ----------------------------------------------------------------
-dnl user options with no effect yet
-dnl ----------------------------------------------------------------
-dnl
-dnl AC_OVERRIDES(metafile, metafile,
-dnl **--with-metafile         use metafile (no effect),
-dnl wxUSE_METAFILE)
-dnl
-dnl AC_OVERRIDES(help,help,
-dnl **--with-help             use help (no effect),
-dnl wxUSE_HELP)
-dnl
-dnl AC_OVERRIDES(wxgraph,wxgraph,
-dnl **--with-wxgraph          use wxgraph (no effect),
-dnl wxUSE_WXGRAPH)
-dnl
-dnl AC_OVERRIDES(wxtree,wxtree,
-dnl **--with-wxtree           use wxtree (no effect),
-dnl wxUSE_WXTREE)
-dnl
-dnl AC_OVERRIDES(package,message,helpmessage,variable)
-dnl

 dnl ----------------------------------------------------------------
 dnl Unix, obviously
 dnl ----------------------------------------------------------------
 
 dnl ----------------------------------------------------------------
 dnl Unix, obviously
 dnl ----------------------------------------------------------------
 

-if test "$USE_UNIX" = 1 ; then
+if test "$wxUSE_UNIX" = 1 ; then

   AC_DEFINE(__UNIX__)
 fi
 
   AC_DEFINE(__UNIX__)
 fi
 

+dnl ----------------------------------------------------------------
+dnl Linux: test for libc5/glibc2: glibc2 has gettext() included
+dnl ----------------------------------------------------------------
+if test "$USE_LINUX" = 1; then
+  AC_CHECK_LIB(c,gettext,AC_DEFINE(wxHAVE_GLIBC2))
+fi
+

 dnl ----------------------------------------------------------------
 dnl search for toolkit (widget sets)
 dnl ----------------------------------------------------------------
 dnl ----------------------------------------------------------------
 dnl search for toolkit (widget sets)
 dnl ----------------------------------------------------------------


@@ -973,19 +1018,22 @@ GUI_TK_INCLUDE=
 GUI_TK_LIBRARY=
 GUI_TK_LINK=
 
 GUI_TK_LIBRARY=
 GUI_TK_LINK=
 

+WX_LINK=
+

 MAKEINCLUDE=
 
 MAKEINCLUDE=
 

-if test "$USE_GTK" = 1; then
-  AM_PATH_GTK(0.99.7, [
+if test "$wxUSE_GTK" = 1; then
+  AM_PATH_GTK(1.0.4, [

        GUI_TK_INCLUDE="$GTK_CFLAGS"
        GUI_TK_LIBRARY="$GTK_LIBS"
        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_MSG_ERROR(Is gtk-config in path and GTK+ is version 1.0.4 up-to 1.0.6?))

   TOOLKIT=GTK
   TOOLKIT_DEF=__WXGTK__
   TOOLKIT=GTK
   TOOLKIT_DEF=__WXGTK__

+  WX_LINK=-lwx_gtk2

   MAKEINCLUDE=../gtk.inc
 fi
 
   MAKEINCLUDE=../gtk.inc
 fi
 

-if test "$USE_QT" = 1; then
+if test "$wxUSE_QT" = 1; then

    AC_MSG_CHECKING(for Qt includes)
    AC_PATH_FIND_INCLUDES($SEARCH_INCLUDE,qapp.h)
    if test "$ac_find_includes" != "" ; then
    AC_MSG_CHECKING(for Qt includes)
    AC_PATH_FIND_INCLUDES($SEARCH_INCLUDE,qapp.h)
    if test "$ac_find_includes" != "" ; then


@@ -1004,45 +1052,69 @@ if test "$USE_QT" = 1; then
   else
      AC_MSG_ERROR(no)
   fi
   else
      AC_MSG_ERROR(no)
   fi

-  GUI_TK_LINK="-lXext -lX11 -lqt -lm"
+  GUI_TK_LINK="-lX11 -lqt -lm"

   TOOLKIT=QT
   TOOLKIT_DEF=__WXQT__
   TOOLKIT=QT
   TOOLKIT_DEF=__WXQT__

+  WX_LINK=-lwx_qt

   MAKEINCLUDE=../qt.inc
 fi
 
   MAKEINCLUDE=../qt.inc
 fi
 

-if test "$USE_MOTIF" = 1; then
+if test "$wxUSE_MOTIF" = 1; then

    AC_MSG_CHECKING(for Motif/Lesstif includes)
    AC_MSG_CHECKING(for Motif/Lesstif includes)

-   AC_PATH_FIND_INCLUDES($SEARCH_INCLUDE,Xm.h)
+   AC_PATH_FIND_INCLUDES($SEARCH_INCLUDE,Xm/Xm.h)

    if test "$ac_find_includes" != "" ; then
      AC_MSG_RESULT(found $ac_find_includes)
    if test "$ac_find_includes" != "" ; then
      AC_MSG_RESULT(found $ac_find_includes)

-     AC_MSG_CHECKING(for Motif or Lesstif library)
+     AC_MSG_CHECKING(for Motif/Lesstif library)

      AC_PATH_FIND_LIBRARIES($SEARCH_LIB,Xm)
      if test "$ac_find_libraries" != "" ; then
        AC_INCLUDE_PATH_EXIST($ac_find_includes,$CHECK_INCLUDE)
        AC_LINK_PATH_EXIST($ac_find_libraries,$CHECK_LIB)
      AC_PATH_FIND_LIBRARIES($SEARCH_LIB,Xm)
      if test "$ac_find_libraries" != "" ; then
        AC_INCLUDE_PATH_EXIST($ac_find_includes,$CHECK_INCLUDE)
        AC_LINK_PATH_EXIST($ac_find_libraries,$CHECK_LIB)

-       CHECK_LINK="$CHECK_INCLUDE $ac_path_to_link"
+       CHECK_LINK="$CHECK_LIB $ac_path_to_link"

        CHECK_INCLUDE="$CHECK_INCLUDE $ac_path_to_include"
        AC_MSG_RESULT(found at $ac_find_libraries)
        CHECK_INCLUDE="$CHECK_INCLUDE $ac_path_to_include"
        AC_MSG_RESULT(found at $ac_find_libraries)

+       AC_MSG_CHECKING(for Xt library)
+       AC_PATH_FIND_LIBRARIES($SEARCH_LIB,Xt)
+       if test "$ac_find_libraries" != "" ; then
+         AC_LINK_PATH_EXIST($ac_find_libraries,$CHECK_LIB)
+         CHECK_LINK="$CHECK_LIB $ac_path_to_link"
+         AC_MSG_RESULT(found at $ac_find_libraries)
+         AC_MSG_CHECKING(for Xpm library)
+         AC_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm)
+         if test "$ac_find_libraries" != "" ; then
+           AC_LINK_PATH_EXIST($ac_find_libraries,$CHECK_LIB)
+           CHECK_LINK="$CHECK_LIB $ac_path_to_link"
+           AC_MSG_RESULT(found at $ac_find_libraries)
+         else
+           AC_MSG_ERROR(no)
+         fi
+       else
+         AC_MSG_ERROR(no)
+       fi

      else
        AC_MSG_ERROR(no)
      fi
   else
      AC_MSG_ERROR(no)
   fi
      else
        AC_MSG_ERROR(no)
      fi
   else
      AC_MSG_ERROR(no)
   fi

-  GUI_TK_LINK="-lXext -lXt -lX11 -lXm -lm"
+
+  GUI_TK_LINK="-lXm -lXpm -lXmu -lXt -lX11 -lm"
+  GUI_TK_LIBRARY="$CHECK_LIB $GUI_TK_LINK"

   TOOLKIT=MOTIF
   TOOLKIT_DEF=__WXMOTIF__
   TOOLKIT=MOTIF
   TOOLKIT_DEF=__WXMOTIF__

+  WX_LINK=-lwx_motif2

   MAKEINCLUDE=../motif.inc
 fi
 
 if test "$TOOLKIT" = ""; then
   MAKEINCLUDE=../motif.inc
 fi
 
 if test "$TOOLKIT" = ""; then

-  AC_MSG_ERROR(You must specify a toolkit: --with-gtk --with-qt --with-motif) 
+  AC_MSG_ERROR(You must specify a toolkit: --with-gtk --with-qt --with-motif)

 fi
 
 AC_SUBST(GUI_TK_INCLUDE)
 AC_SUBST(GUI_TK_LIBRARY)
 AC_SUBST(GUI_TK_LINK)
 
 fi
 
 AC_SUBST(GUI_TK_INCLUDE)
 AC_SUBST(GUI_TK_LIBRARY)
 AC_SUBST(GUI_TK_LINK)
 

+AC_SUBST(WX_LINK)
+

 AC_SUBST(TOOLKIT)
 AC_SUBST(TOOLKIT_DEF)
 
 AC_SUBST(TOOLKIT)
 AC_SUBST(TOOLKIT_DEF)
 


@@ -1052,38 +1124,51 @@ dnl ----------------------------------------------------------------
 dnl Register compile options for makefiles and setup.h
 dnl ----------------------------------------------------------------
 
 dnl Register compile options for makefiles and setup.h
 dnl ----------------------------------------------------------------
 

+EXTRA_LINK=
+

 WXDEBUG=
 WXDEBUG=

-if test "$USE_DEBUG_INFO" = 1 ; then
-  WXDEBUG="-g -O0"
+if test "$wxUSE_DEBUG_GDB" = 1 ; then
+  wxUSE_DEBUG_INFO=1
+  WXDEBUG="-ggdb"
+  wxUSE_OPTIMISE=0
+else
+  if test "$wxUSE_DEBUG_INFO" = 1 ; then
+    WXDEBUG="-g"
+    wxUSE_OPTIMISE=0
+  else
+    EXTRA_LINK="-s $EXTRA_LINK"
+  fi

 fi
 AC_SUBST(WXDEBUG)
 
 fi
 AC_SUBST(WXDEBUG)
 

-if test "$USE_DEBUG_FLAG" = 1 ; then
-  AC_DEFINE_UNQUOTED(WXDEBUG,$USE_DEBUG_FLAG)
+if test "$wxUSE_DEBUG_FLAG" = 1 ; then
+  AC_DEFINE_UNQUOTED(WXDEBUG,$wxUSE_DEBUG_FLAG)

   WXDEBUG_DEFINE="-D__WXDEBUG__"
   AC_SUBST(WXDEBUG_DEFINE)
   WXDEBUG_DEFINE="-D__WXDEBUG__"
   AC_SUBST(WXDEBUG_DEFINE)

+else
+  WXDEBUG_DEFINE="-DGTK_NO_CHECK_CASTS"
+  AC_SUBST(WXDEBUG_DEFINE)

 fi
 
 fi
 

-if test "$USE_MEM_TRACING" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_MEMORY_TRACING,$USE_MEM_TRACING)
-  AC_DEFINE_UNQUOTED(USE_GLOBAL_MEMORY_OPERATORS,$USE_MEM_TRACING)
+if test "$wxUSE_MEM_TRACING" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_MEMORY_TRACING,$wxUSE_MEM_TRACING)
+  AC_DEFINE_UNQUOTED(wxUSE_GLOBAL_MEMORY_OPERATORS,$wxUSE_MEM_TRACING)

 fi
 
 fi
 

-EXTRA_LINK=
-if test "$USE_DMALLOC" = 1 ; then
+if test "$wxUSE_DMALLOC" = 1 ; then

   EXTRA_LINK="$EXTRA_LINK -ldmalloc"
 fi
 AC_SUBST(EXTRA_LINK)
 
 PROFILE=
   EXTRA_LINK="$EXTRA_LINK -ldmalloc"
 fi
 AC_SUBST(EXTRA_LINK)
 
 PROFILE=

-if test "$USE_PROFILE" = 1 ; then
+if test "$wxUSE_PROFILE" = 1 ; then

   PROFILE="-pg"
 fi
 AC_SUBST(PROFILE)
 
 CXXFLAGS=`echo "${CXXFLAGS}" | sed "s/\-O.//g" `
 CFLAGS=`echo "${CFLAGS}" | sed "s/\-O.//g" `
   PROFILE="-pg"
 fi
 AC_SUBST(PROFILE)
 
 CXXFLAGS=`echo "${CXXFLAGS}" | sed "s/\-O.//g" `
 CFLAGS=`echo "${CFLAGS}" | sed "s/\-O.//g" `

-if test "$USE_OPTIMISE" = 0 ; then
+if test "$wxUSE_OPTIMISE" = 0 ; then

   OPTIMISE=
 else
   if test "$GCC" = yes ; then
   OPTIMISE=
 else
   if test "$GCC" = yes ; then


@@ -1100,135 +1185,123 @@ fi
 AC_SUBST(OPTIMISE)
 
 APPLE_IEEE=NONE
 AC_SUBST(OPTIMISE)
 
 APPLE_IEEE=NONE

-if test "$USE_APPLE_IEEE" = 1 ; then
+if test "$wxUSE_APPLE_IEEE" = 1 ; then

   APPLE_IEEE="APPLE_IEEE"
   APPLE_IEEE="APPLE_IEEE"

-  AC_DEFINE_UNQUOTED(USE_APPLE_IEEE,$USE_APPLE_IEEE)
+  AC_DEFINE_UNQUOTED(wxUSE_APPLE_IEEE,$wxUSE_APPLE_IEEE)

 fi
 
 fi
 

-USE_IOSTREAMH=$DEFAULT_USE_IOSTREAMH
-AC_DEFINE_UNQUOTED(USE_IOSTREAMH,$USE_IOSTREAMH)
+wxUSE_IOSTREAMH=$DEFAULT_wxUSE_IOSTREAMH
+AC_DEFINE_UNQUOTED(wxUSE_IOSTREAMH,$wxUSE_IOSTREAMH)

 
 dnl ----------------------------------------------------------------
 dnl Register library options for makefiles and setup.h
 dnl ----------------------------------------------------------------
 
 
 dnl ----------------------------------------------------------------
 dnl Register library options for makefiles and setup.h
 dnl ----------------------------------------------------------------
 

-if test "$USE_ZLIB" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_ZLIB,$USE_ZLIB)
+if test "$wxUSE_ZLIB" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_ZLIB,$wxUSE_ZLIB)
+  Z_C_SRC="\$(Z_C_SRC)"

 fi
 fi

+AC_SUBST(Z_C_SRC)

 
 

-if test "$USE_GDK_IMLIB" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_GDK_IMLIB,$USE_GDK_IMLIB)
+if test "$wxUSE_LIBPNG" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_LIBPNG,$wxUSE_LIBPNG)
+  PNG_C_SRC="\$(PNG_C_SRC)"

 fi
 fi

+AC_SUBST(PNG_C_SRC)

 
 

-if test "$USE_LIBPNG" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_LIBPNG,$USE_LIBPNG) 
+JPEG_LINK=""
+if test "$wxUSE_LIBJPEG" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_LIBJPEG,$wxUSE_LIBJPEG)
+  AC_CHECK_LIB(jpeg)
+  JPEG_LINK="-ljpeg"

 fi
 fi

+AC_SUBST(JPEG_LINK)

 
 

-if test "$USE_ODBC" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_ODBC,$USE_ODBC) 
+IODBC_C_SRC=""
+if test "$wxUSE_ODBC" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_ODBC,$wxUSE_ODBC)
+  IODBC_C_SRC="\$(IODBC_C_SRC)"

 fi
 fi

+AC_SUBST(IODBC_C_SRC)

 
 dnl ----------------------------------------------------------------
 
 dnl ----------------------------------------------------------------

-dnl Register GUI-control options for makefiles and setup.h
+dnl Register non-GUI class options for makefiles and setup.h

 dnl ----------------------------------------------------------------
 
 dnl ----------------------------------------------------------------
 

-if test "$USE_GAUGE" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_GAUGE,$USE_GAUGE)
+if test "$wxUSE_CONFIG" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_CONFIG,$wxUSE_CONFIG)

 fi
 
 fi
 

-if test "$USE_COMBOBOX" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_COMBOBOX,$USE_COMBOBOX)
+if test "$wxUSE_TIMEDATE" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_TIMEDATE,$wxUSE_TIMEDATE)

 fi
 
 fi
 

-if test "$USE_SCROLLBAR" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_SCROLLBAR,$USE_SCROLLBAR)
+if test "$wxUSE_INTL" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_INTL,$wxUSE_INTL)

 fi
 
 fi
 

-if test "$USE_LISTCTRL" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_LISTCTRL,$USE_LISTCTRL)
+if test "$wxUSE_STREAMS" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_STREAMS,$wxUSE_STREAMS)

 fi
 
 fi
 

-if test "$USE_TREECTRL" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_TREECTRL,$USE_TREECTRL)
+if test "$wxUSE_SOCKETS" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_SOCKETS,$wxUSE_SOCKETS)

 fi
 
 fi
 

-if test "$USE_GRID" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_GRID,$USE_GRID)
+if test "$wxUSE_SERIAL" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_SERIAL,$wxUSE_SERIAL)

 fi
 
 fi
 

-if test "$USE_TAB_DIALOG" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_TAB_DIALOG,$USE_TAB_DIALOG)
-fi
-
-if test "$USE_NOTEBOOK" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_NOTEBOOK,$USE_NOTEBOOK)
-fi
-
-dnl ----------------------------------------------------------------
-dnl Register non-GUI class options for makefiles and setup.h
-dnl ----------------------------------------------------------------
-
-if test "$USE_CONFIG" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_CONFIG,$USE_CONFIG)
-fi
-
-if test "$USE_TIMEDATE" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_TIMEDATE,$USE_TIMEDATE)
-fi
-
-if test "$USE_FRACTION" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_FRACTION,$USE_FRACTION)
-fi
-
-if test "$USE_LOG" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_LOG,$USE_LOG)
-fi
-
-if test "$USE_INTL" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_INTL,$USE_INTL)
-fi
+dnl ------------------------------------------------------------------------
+dnl wxLibrary class
+dnl ------------------------------------------------------------------------

 
 

-if test "$USE_STREAMS" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_STREAMS,$USE_STREAMS)
-fi
+HAVE_DL_FUNCS=0
+if test "$wxUSE_DYNLIB_CLASS" = "1"; then
+    dnl the test is a bit complicated because we check for dlopen() both with
+    dnl and without -ldl
+    AC_CHECK_FUNCS(dlopen,
+        [AC_DEFINE(HAVE_DLOPEN) HAVE_DL_FUNCS=1],
+        [AC_CHECK_LIB(dl, dlopen,
+            [AC_DEFINE(HAVE_DLOPEN) HAVE_DL_FUNCS=1])])
+    AC_CHECK_FUNCS(shl_load, [AC_DEFINE(HAVE_SHL_LOAD) HAVE_DL_FUNCS=1])

 
 

-if test "$USE_SERIAL" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_SERIAL,$USE_SERIAL)
-fi
+    if test "$HAVE_DL_FUNCS" = 0; then
+        AC_MSG_WARN("--with-dynlib will be disabled because no function was found to load a shared library on this platform")

 
 

-if test "$USE_FILE" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_FILE,$USE_FILE)
+        wxUSE_DYNLIB_CLASS=0
+    fi

 fi
 
 fi
 

-if test "$USE_TEXTFILE" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_TEXTFILE,$USE_TEXTFILE)
+if test "$wxUSE_DYNLIB_CLASS" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_DYNLIB_CLASS,$wxUSE_DYNLIB_CLASS)

 fi
 
 dnl ----------------------------------------------------------------
 dnl Register Prolog and Resources options for makefiles and setup.h
 dnl ----------------------------------------------------------------
 
 fi
 
 dnl ----------------------------------------------------------------
 dnl Register Prolog and Resources options for makefiles and setup.h
 dnl ----------------------------------------------------------------
 

-if test "$USE_RPC" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_RPC,$USE_RPC)
+if test "$wxUSE_RPC" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_RPC,$wxUSE_RPC)

 fi
 
 fi
 

-if test "$USE_WX_RESOURCES" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_WX_RESOURCES,$USE_WX_RESOURCES)
+if test "$wxUSE_WX_RESOURCES" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_WX_RESOURCES,$wxUSE_WX_RESOURCES)

 fi
 
 fi
 

-if test "$USE_PROLOGIO" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_PROLOGIO)
+if test "$wxUSE_PROLOGIO" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_PROLOGIO)

 fi
 
 dnl ----------------------------------------------------------------
 dnl Register PostScript options for makefiles and setup.h
 dnl ----------------------------------------------------------------
 
 fi
 
 dnl ----------------------------------------------------------------
 dnl Register PostScript options for makefiles and setup.h
 dnl ----------------------------------------------------------------
 

-if test "$USE_POSTSCRIPT" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_POSTSCRIPT)
+if test "$wxUSE_POSTSCRIPT" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_POSTSCRIPT)

 fi
 
 fi
 

-AC_DEFINE_UNQUOTED(USE_AFM_FOR_POSTSCRIPT,$USE_AFM_FOR_POSTSCRIPT)
+AC_DEFINE_UNQUOTED(wxUSE_AFM_FOR_POSTSCRIPT,$wxUSE_AFM_FOR_POSTSCRIPT)

 
 AC_DEFINE_UNQUOTED(WX_NORMALIZED_PS_FONTS,$WX_NORMALIZED_PS_FONTS)
 
 
 AC_DEFINE_UNQUOTED(WX_NORMALIZED_PS_FONTS,$WX_NORMALIZED_PS_FONTS)
 


@@ -1236,205 +1309,146 @@ dnl ----------------------------------------------------------------
 dnl Register architecture options for makefiles and setup.h
 dnl ----------------------------------------------------------------
 
 dnl Register architecture options for makefiles and setup.h
 dnl ----------------------------------------------------------------
 

-if test "$USE_MDI_ARCHITECTURE" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_MDI_ARCHITECTURE,$USE_MDI_ARCHITECTURE)
+if test "$wxUSE_MDI_ARCHITECTURE" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_MDI_ARCHITECTURE,$wxUSE_MDI_ARCHITECTURE)

 fi
 
 fi
 

-if test "$USE_DOC_VIEW_ARCHITECTURE" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_DOC_VIEW_ARCHITECTURE,$USE_DOC_VIEW_ARCHITECTURE)
+if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_DOC_VIEW_ARCHITECTURE,$wxUSE_DOC_VIEW_ARCHITECTURE)

 fi
 
 fi
 

-if test "$USE_PRINTING_ARCHITECTURE" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_PRINTING_ARCHITECTURE,$USE_PRINTING_ARCHITECTURE)
+if test "$wxUSE_PRINTING_ARCHITECTURE" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_PRINTING_ARCHITECTURE,$wxUSE_PRINTING_ARCHITECTURE)

 fi
 
 dnl ----------------------------------------------------------------
 fi
 
 dnl ----------------------------------------------------------------

-dnl Register misc options for makefiles and setup.h
+dnl Register wxString options for makefiles and setup.h

 dnl ----------------------------------------------------------------
 
 dnl ----------------------------------------------------------------
 

-if test "$USE_IPC" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_IPC)
-fi
-
-if test "$USE_RESOURCES" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_RESOURCES,$USE_RESOURCES)
-fi
-
-if test "$USE_CLIPBOARD" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_CLIPBOARD,$USE_CLIPBOARD)
-fi
-
-if test "$USE_DND" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_DND,$USE_DND)
+if test "$wxUSE_UNICODE" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_UNICODE)

 fi
 
 fi
 

-if test "$USE_CONSTRAINTS" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_CONSTRAINTS,$USE_CONSTRAINTS)
+if test "$wxUSE_WCSRTOMBS" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_WCSRTOMBS)

 fi
 
 dnl ----------------------------------------------------------------
 fi
 
 dnl ----------------------------------------------------------------

-dnl No effect
+dnl Register misc options for makefiles and setup.h

 dnl ----------------------------------------------------------------
 
 dnl ----------------------------------------------------------------
 

-METAFILE=NONE
-if test "$USE_METAFILE" = 1 ; then
-  METAFILE="METAFILE"
-  AC_DEFINE_UNQUOTED(USE_METAFILE,$USE_METAFILE)
+if test "$wxUSE_IPC" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_IPC)

 fi
 fi

-AC_SUBST(METAFILE)

 
 

-HELP=NONE
-if test "$USE_HELP" = 1 ; then
-  HELP="HELP"
-  AC_DEFINE_UNQUOTED(USE_HELP,$USE_HELP)
+if test "$wxUSE_RESOURCES" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_RESOURCES,$wxUSE_RESOURCES)

 fi
 fi

-AC_SUBST(HELP)

 
 

-WXGRAPH=NONE
-if test "$USE_WXGRAPH" = 1 ; then
-  WXGRAPH="WXGRAPH"
-  AC_DEFINE_UNQUOTED(USE_WXGRAPH,$USE_WXGRAPH)
+if test "$wxUSE_CLIPBOARD" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_CLIPBOARD,$wxUSE_CLIPBOARD)

 fi
 fi

-AC_SUBST(WXGRAPH)

 
 

-WXTREE=NONE
-if test "$USE_WXTREE" = 1 ; then
-  WXTREE="WXTREE"
-  AC_DEFINE_UNQUOTED(USE_WXTREE,$USE_WXTREE)
+if test "$wxUSE_TOOLTIPS" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_TOOLTIPS,$wxUSE_TOOLTIPS)

 fi
 fi

-AC_SUBST(WXTREE)

 
 

-GLCANVAS=NONE
-if test "$USE_OPENGL" = 1 ; then
-  GLCANVAS="GLCANVAS"
+if test "$wxUSE_DRAG_AND_DROP" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_DRAG_AND_DROP,$wxUSE_DRAG_AND_DROP)

 fi
 
 dnl ----------------------------------------------------------------
 fi
 
 dnl ----------------------------------------------------------------

-dnl select  dynamic loader (used by iODBC to load drivers)
+dnl No effect yet

 dnl ----------------------------------------------------------------
 
 dnl ----------------------------------------------------------------
 

-AC_CHECK_LIB(dl,main,[DL_LIBRARY=-ldl],[DL_LIBRARY=])
-AC_SUBST(DL_LIBRARY)
+HELP=NONE
+if test "$wxUSE_HELP" = 1 ; then
+  HELP="HELP"
+  AC_DEFINE_UNQUOTED(wxUSE_HELP,$wxUSE_HELP)
+fi
+AC_SUBST(HELP)

 
 dnl ----------------------------------------------------------------
 dnl thread support
 dnl ----------------------------------------------------------------
 
 
 dnl ----------------------------------------------------------------
 dnl thread support
 dnl ----------------------------------------------------------------
 

-wxUSE_THREADS=1
-THREADS_LINK=""
-UNIX_THREAD="gtk/threadno.cpp"
-
-AC_OVERRIDES(threads,threads,
-**--without-threads       Force disabling threads,
-wxUSE_THREADS)
+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 wxUSE_THREADS if thread support is activated. (GL)

 
 

-dnl AC_ARG_WITH(threads,
-dnl [**--without-threads       Force disabling threads ],
-dnl [wxUSE_THREADS="$withval"])
+THREADS_LINK=""
+UNIX_THREAD=""

 
 if test "$wxUSE_THREADS" = "1"; then
 
 if test "$wxUSE_THREADS" = "1"; then

-  UNIX_THREAD="gtk/threadno.cpp"
-
-  dnl For glibc 2 users who have the old libc 5 too
+     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_CHECK_HEADER(sys/prctl.h, [
-        UNIX_THREAD="gtk/threadsgi.cpp"
-    ])
+     AC_CHECK_LIB(pthread-0.7, pthread_create, [
+       UNIX_THREAD="gtk/threadpsx.cpp"
+       THREADS_LINK="pthread-0.7"
+     ],[
+       AC_CHECK_HEADER(sys/prctl.h, [
+          UNIX_THREAD="gtk/threadsgi.cpp"
+     ])

 
 

-    dnl pthread_create is always available in pthread but it seems not to be
-    dnl the case for pthread_setcanceltype.
+     dnl pthread_create is always available in pthread but it seems not to be
+     dnl the case for pthread_setcanceltype.

 
 

-    AC_CHECK_LIB(pthread, pthread_setcanceltype, [
+     AC_CHECK_LIB(pthread, pthread_setcanceltype, [

        UNIX_THREAD="gtk/threadpsx.cpp"
        UNIX_THREAD="gtk/threadpsx.cpp"

-       THREADS_LINK="-lpthread"
+       THREADS_LINK="pthread"
+     ])

     ])
     ])

-  ])
-  AC_CHECK_LIB(pthreads, pthread_setcanceltype, [
-     UNIX_THREAD="gtk/threadpsx.cpp"
-     THREADS_LINK="-lpthreads"
-  ])
-fi
-
-if test -z "$UNIX_THREAD"; then
-  wxUSE_THREADS=0
-fi
-
-AC_SUBST(UNIX_THREAD)
-AC_SUBST(THREADS_LINK)
-AC_DEFINE(wxUSE_THREADS)
-
-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 wxUSE_THREADS if thread support is activated. (GL)

 
 

-dnl ----------------------------------------------------------------
-dnl search for opengl
-dnl ----------------------------------------------------------------
+    if test "x$THREADS_LINK" = "x"; then
+        dnl thread functions are in libc_r under FreeBSD
+        AC_CHECK_LIB(c_r, pthread_create,
+                    [
+                        UNIX_THREAD="gtk/threadpsx.cpp"
+                        THREADS_LINK="c_r"
+                    ])
+    fi

 
 

-OPENGL_INCLUDE=
-OPENGL_LIBRARY=
-OPENGL_LINK=
-
-if test "$USE_OPENGL" = 1; then
-  dnl checking OPENGL includes
-  AC_MSG_CHECKING(for OpenGL includes)
-  AC_PATH_FIND_INCLUDES($SEARCH_INCLUDE,GL/gl.h)
-  if test "$ac_find_includes" != "" ; then
-    OPENGL_INCLUDE="-I$ac_find_includes"
-    AC_MSG_RESULT(found $ac_find_includes)
-    dnl checking OPENGL libraries
-    AC_MSG_CHECKING(for OpenGL library)
-    AC_PATH_FIND_LIBRARIES($SEARCH_LIB,GL)
-    if test "$ac_find_libraries" != "" ; then
-      AC_INCLUDE_PATH_EXIST($ac_find_includes,$CHECK_INCLUDE)
-      AC_LINK_PATH_EXIST($ac_find_libraries,$CHECK_LIB)
-      CHECK_LINK="$CHECK_INCLUDE $ac_path_to_link"
-      CHECK_INCLUDE="$CHECK_INCLUDE $ac_path_to_include"
-      OPENGL_LIBRARY="$ac_path_to_link"
-      OPENGL_INCLUDE="$ac_path_to_include"
-      OPENGL_LINK="-lGL"
-      AC_MSG_RESULT(found OpenGL at $ac_find_libraries)
-    else
-      AC_PATH_FIND_LIBRARIES($SEARCH_LIB,MesaGL)
-      if test "$ac_find_libraries" != "" ; then
-        AC_INCLUDE_PATH_EXIST($ac_find_includes,$CHECK_INCLUDE)
-        AC_LINK_PATH_EXIST($ac_find_libraries,$CHECK_LIB)
-        CHECK_LINK="$CHECK_INCLUDE $ac_path_to_link"
-        CHECK_INCLUDE="$CHECK_INCLUDE $ac_path_to_include"
-        OPENGL_LIBRARY="$ac_path_to_link"
-        OPENGL_INCLUDE="$ac_path_to_include"
-        OPENGL_LINK="-lMesaGL"
-        AC_MSG_RESULT(found MESA at $ac_find_libraries)
-      else
-        AC_MSG_ERROR(no)
-      fi
+    if test "$THREADS_LINK" != ""; then
+      AC_DEFINE(wxUSE_THREADS)

     fi
     fi

-  else
-    AC_MSG_ERROR(no)
-  fi

 fi
 
 fi
 

-dnl ----------------------------------------------------------------
-dnl left-over
-dnl ----------------------------------------------------------------
+if test "$wxUSE_MOTIF" = "1"; then
+  UNIX_THREAD="motif/thread.cpp"
+fi

 
 

-USE_GLX=$USE_OPENGL
-if test "$USE_OPENGL" != 1; then
-  OPENGL_LIBRARIES=
-  OPENGL_INCLUDE=
-  OPENGL_LINK=
-  GLCANVAS=NONE
+if test -z "$UNIX_THREAD"; then
+  wxUSE_THREADS=0
+fi
+
+dnl do other tests only if we are using threads
+if test "$wxUSE_THREADS" = "1"; then
+  THREADS_LINK2=""
+  AC_CHECK_LIB($THREADS_LINK, sched_yield,
+               AC_DEFINE(HAVE_SCHED_YIELD),
+               [AC_CHECK_LIB("posix4", sched_yield,
+                   [AC_DEFINE(HAVE_SCHED_YIELD) THREADS_LINK2="-lposix4"],
+                   AC_MSG_WARN(wxThread::Yield() will not work properly)
+                )]
+               )
+
+  AC_CHECK_LIB($THREADS_LINK, sched_get_priority_min,
+               AC_DEFINE(HAVE_THREAD_PRIORITY_FUNCTIONS),
+               [AC_CHECK_LIB("posix4", sched_get_priority_min,
+                   [AC_DEFINE(HAVE_THREAD_PRIORITY_FUNCTIONS) THREADS_LINK2="-lposix4"],
+                   AC_MSG_WARN(Setting thread priority will not work)
+                )]
+               )
+
+  AC_CHECK_LIB($THREADS_LINK, pthread_cancel,
+               AC_DEFINE(HAVE_PTHREAD_CANCEL),
+               AC_MSG_WARN(wxThread::Kill() will not work properly))
+
+  THREADS_LINK="-l$THREADS_LINK $THREADS_LINK2"

 fi
 
 fi
 

-AC_DEFINE_UNQUOTED(USE_GLX,$USE_GLX)
-AC_SUBST(OPENGL_INCLUDE)
-AC_SUBST(OPENGL_LIBRARY)
-AC_SUBST(OPENGL_LINK)
-AC_SUBST(GLCANVAS)
+AC_SUBST(UNIX_THREAD)
+AC_SUBST(THREADS_LINK)

 
 dnl ------------------------------------------------------------------------
 dnl compiler options for shared libs
 
 dnl ------------------------------------------------------------------------
 dnl compiler options for shared libs


@@ -1443,9 +1457,8 @@ dnl ------------------------------------------------------------------------
 PICFLAGS=
 CREATE_SHARED=
 case "${canonical}" in
 PICFLAGS=
 CREATE_SHARED=
 case "${canonical}" in

-

   *-hp-hpux* )
   *-hp-hpux* )

-    if test "${CC}" != "gcc" ; then
+    if test "$GCC" != "yes" ; then

       CXXFLAGS="${CXXFLAGS} +a1 -z -Aa -D_HPUX_SOURCE"
       CFLAGS="${CFLAGS} -z -D_HPUX_SOURCE"
       PICFLAGS="+z"
       CXXFLAGS="${CXXFLAGS} +a1 -z -Aa -D_HPUX_SOURCE"
       CFLAGS="${CFLAGS} -z -D_HPUX_SOURCE"
       PICFLAGS="+z"


@@ -1461,15 +1474,15 @@ case "${canonical}" in
     CREATE_SHARED=sharedLinux
   ;;
 
     CREATE_SHARED=sharedLinux
   ;;
 

-  *-*-irix5* | *-*-irix6* ) 
+  *-*-irix5* | *-*-irix6* )

     # PICFLAGS can remain empty, as pic is the default
     LDFLAGS="-Wl,+s"
     CREATE_SHARED=sharedIrix
     AC_DEFINE(SVR4)
   ;;
 
     # PICFLAGS can remain empty, as pic is the default
     LDFLAGS="-Wl,+s"
     CREATE_SHARED=sharedIrix
     AC_DEFINE(SVR4)
   ;;
 

-  *-*-solaris2* ) 
-    if test "${CC}" != "gcc" ; then
+  *-*-solaris2* )
+    if test "$GCC" != "yes" ; then

       PICFLAGS="-KPIC"
     else
       PICFLAGS="-fPIC"
       PICFLAGS="-KPIC"
     else
       PICFLAGS="-fPIC"


@@ -1478,8 +1491,8 @@ case "${canonical}" in
     AC_DEFINE(SVR4)
   ;;
 
     AC_DEFINE(SVR4)
   ;;
 

-  *-*-sunos4* ) 
-    if test "${CC}" != "gcc" ; then
+  *-*-sunos4* )
+    if test "$GCC" != "yes" ; then

       PICFLAGS="-PIC"
     else
       PICFLAGS="-fPIC"
       PICFLAGS="-PIC"
     else
       PICFLAGS="-fPIC"


@@ -1495,13 +1508,13 @@ case "${canonical}" in
     AC_DEFINE(BSD)
   ;;
 
     AC_DEFINE(BSD)
   ;;
 

-  *-*-osf* ) 
+  *-*-osf* )

     PICFLAGS="-fPIC"
     CREATE_SHARED=sharedOSF
   ;;
 
     PICFLAGS="-fPIC"
     CREATE_SHARED=sharedOSF
   ;;
 

-  *-*-dgux5* ) 
-    if test "${CC}" != "gcc" ; then
+  *-*-dgux5* )
+    if test "$GCC" != "yes" ; then

       PICFLAGS="-K PIC"
     else
       PICFLAGS="-fPIC"
       PICFLAGS="-K PIC"
     else
       PICFLAGS="-fPIC"


@@ -1510,8 +1523,8 @@ case "${canonical}" in
     AC_DEFINE(SVR4)
   ;;
 
     AC_DEFINE(SVR4)
   ;;
 

-  *-*-sysv5* ) 
-    if test "${CC}" != "gcc" ; then
+  *-*-sysv5* )
+    if test "$GCC" != "yes" ; then

       PICFLAGS="-K PIC"
     else
       PICFLAGS="-fPIC"
       PICFLAGS="-K PIC"
     else
       PICFLAGS="-fPIC"


@@ -1520,8 +1533,8 @@ case "${canonical}" in
     AC_DEFINE(SVR4)
   ;;
 
     AC_DEFINE(SVR4)
   ;;
 

-  *-*-aix* ) 
-    if test "${CC}" != "gcc" ; then
+  *-*-aix* )
+    if test "$GCC" != "yes" ; then

       PICFLAGS="-bM\:SRE"
     else
       PICFLAGS="-fPIC"
       PICFLAGS="-bM\:SRE"
     else
       PICFLAGS="-fPIC"


@@ -1536,14 +1549,18 @@ case "${canonical}" in
 esac
 
 if test "x$GCC" = xyes; then
 esac
 
 if test "x$GCC" = xyes; then

-  CFLAGS="${CFLAGS} -Wall"
+  CFLAGS="${CFLAGS} -Wall -Wno-unused -Wno-uninitialized -D_REENTRANT -DLEX_SCANNER -DHAVE_LIBDL"

 fi
 
 if test "x$GXX" = xyes; then
 fi
 
 if test "x$GXX" = xyes; then

-  CXXFLAGS="${CXXFLAGS} -Wall"
+  if test "$wxUSE_MOTIF" = 1; then
+    CXXFLAGS="${CXXFLAGS} -Wall -Wno-unused -D_REENTRANT"
+  else
+    CXXFLAGS="${CXXFLAGS} -Wall -D_REENTRANT"
+  fi

 fi
 
 fi
 

-if test "$USE_SHARED" != 1; then
+if test "$wxUSE_SHARED" != 1; then

     CREATE_SHARED=
     PICFLAGS=
 fi
     CREATE_SHARED=
     PICFLAGS=
 fi