Now uses dcps.h

[wxWidgets.git] / configure.in

diff --git a/configure.in b/configure.in
index db9f4d644cd69e97c71bf70a52bb618db617bdec..c40297ad141c83b1ba6c9a36819d5b44b3871284 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -237,6 +237,7 @@ dnl ------------------------------------------------------------------------
 
 SEARCH_INCLUDE="\
     /usr/Motif1.2/include     \
 
 SEARCH_INCLUDE="\
     /usr/Motif1.2/include     \

+    /usr/dt/include/Xm        \

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


@@ -289,6 +290,7 @@ SEARCH_INCLUDE="\
     "
 
 SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` \
     "
 
 SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` \

+    /usr/dt/lib \

     "
 
 dnl ------------------------------------------------------------------------
     "
 
 dnl ------------------------------------------------------------------------


@@ -557,6 +559,60 @@ dnl   defines YYTEXT_POINTER  if yytext is char*
 dnl   defines LEX_OUTPUT_ROOT as to the base of the 
 dnl                           filename output by the lexer
 
 dnl   defines LEX_OUTPUT_ROOT as to the base of the 
 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 ------------------------------------------------------------------------


@@ -578,7 +634,6 @@ dnl ------------------------------------------------------------------------
 
 USE_UNIX=1
 
 
 USE_UNIX=1
 

-

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


@@ -680,7 +735,7 @@ DEFAULT_wxUSE_GTK=1
 DEFAULT_wxUSE_QT=0
 DEFAULT_wxUSE_MOTIF=0
 
 DEFAULT_wxUSE_QT=0
 DEFAULT_wxUSE_MOTIF=0
 

-DEFAULT_wxUSE_THREADS=1
+DEFAULT_wxUSE_THREADS=0

 
 DEFAULT_wxUSE_SHARED=1
 DEFAULT_wxUSE_OPTIMISE=1
 
 DEFAULT_wxUSE_SHARED=1
 DEFAULT_wxUSE_OPTIMISE=1


@@ -694,26 +749,13 @@ DEFAULT_wxUSE_IOSTREAMH=1
 
 DEFAULT_wxUSE_ZLIB=1
 DEFAULT_wxUSE_LIBPNG=1
 
 DEFAULT_wxUSE_ZLIB=1
 DEFAULT_wxUSE_LIBPNG=1

-DEFAULT_wxUSE_ODBC=0
-
-DEFAULT_wxUSE_COMBOBOX=1
-DEFAULT_wxUSE_GAUGE=1
-DEFAULT_wxUSE_SCROLLBAR=1
-DEFAULT_wxUSE_LISTCTRL=1
-DEFAULT_wxUSE_TREECTRL=1
-DEFAULT_wxUSE_GRID=1
-DEFAULT_wxUSE_TAB_DIALOG=1
-DEFAULT_wxUSE_NOTEBOOK=1
+DEFAULT_wxUSE_ODBC=1

 
 DEFAULT_wxUSE_TIMEDATE=1
 
 DEFAULT_wxUSE_TIMEDATE=1

-DEFAULT_wxUSE_FRACTION=1
-DEFAULT_wxUSE_LOG=1

 DEFAULT_wxUSE_INTL=1
 DEFAULT_wxUSE_CONFIG=1
 DEFAULT_wxUSE_STREAMS=1
 DEFAULT_wxUSE_SERIAL=1
 DEFAULT_wxUSE_INTL=1
 DEFAULT_wxUSE_CONFIG=1
 DEFAULT_wxUSE_STREAMS=1
 DEFAULT_wxUSE_SERIAL=1

-DEFAULT_wxUSE_FILE=1
-DEFAULT_wxUSE_TEXTFILE=1

 
 DEFAULT_wxUSE_AFM_FOR_POSTSCRIPT=1
 DEFAULT_WX_NORMALIZED_PS_FONTS=1
 
 DEFAULT_wxUSE_AFM_FOR_POSTSCRIPT=1
 DEFAULT_WX_NORMALIZED_PS_FONTS=1


@@ -721,9 +763,8 @@ DEFAULT_wxUSE_POSTSCRIPT=1
 
 DEFAULT_wxUSE_IPC=1
 DEFAULT_wxUSE_RESOURCES=1
 
 DEFAULT_wxUSE_IPC=1
 DEFAULT_wxUSE_RESOURCES=1

-DEFAULT_wxUSE_CONSTRAINTS=1

 DEFAULT_wxUSE_CLIPBOARD=1
 DEFAULT_wxUSE_CLIPBOARD=1

-DEFAULT_wxUSE_DND=1
+DEFAULT_wxUSE_DRAG_AND_DROP=1

 
 DEFAULT_wxUSE_MDI_ARCHITECTURE=1
 DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=1
 
 DEFAULT_wxUSE_MDI_ARCHITECTURE=1
 DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=1


@@ -732,11 +773,6 @@ DEFAULT_wxUSE_PRINTING_ARCHITECTURE=1
 DEFAULT_wxUSE_PROLOGIO=1
 DEFAULT_wxUSE_WX_RESOURCES=1
 DEFAULT_wxUSE_RPC=0
 DEFAULT_wxUSE_PROLOGIO=1
 DEFAULT_wxUSE_WX_RESOURCES=1
 DEFAULT_wxUSE_RPC=0

-
-DEFAULT_wxUSE_OPENGL=0
-DEFAULT_wxUSE_METAFILE=0
-DEFAULT_wxUSE_WXGRAPH=0
-DEFAULT_wxUSE_WXTREE=0

 DEFAULT_wxUSE_HELP=1
 
 DEFAULT_wxUSE_UNICODE=1
 DEFAULT_wxUSE_HELP=1
 
 DEFAULT_wxUSE_UNICODE=1


@@ -798,6 +834,10 @@ AC_OVERRIDES(apple_ieee, apple_ieee,
 **--with_apple_ieee      use the Apple IEEE codec,
 wxUSE_APPLE_IEEE)
 
 **--with_apple_ieee      use the Apple IEEE codec,
 wxUSE_APPLE_IEEE)
 

+AC_OVERRIDES(threads,threads,
+**--with-threads          for enabling threads,
+wxUSE_THREADS)
+

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


@@ -814,46 +854,6 @@ AC_OVERRIDES(odbc,odbc,
 **--with-odbc             use iODBC and wxODBC classes,
 wxUSE_ODBC)
 
 **--with-odbc             use iODBC and wxODBC classes,
 wxUSE_ODBC)
 

-AC_OVERRIDES(opengl,opengl,
-**--with-opengl           use OpenGL (or Mesa),
-wxUSE_OPENGL)
-
-dnl ----------------------------------------------------------------
-dnl user options for GUI control classes
-dnl ----------------------------------------------------------------
-
-AC_OVERRIDES(gauge,gauge,
-**--with-gauge            use wxGauge class,
-wxUSE_GAUGE)
-
-AC_OVERRIDES(combobox,combobox,
-**--with-combobox         use wxComboBox class,
-wxUSE_COMBOBOX)
-
-AC_OVERRIDES(scrollbar,scrollbar,
-**--with-scrollbar        use wxScrollbar class,
-wxUSE_SCROLLBAR)
-
-AC_OVERRIDES(listctrl,listctrl,
-**--with-listctrl         use wxListCtrl class,
-wxUSE_LISTCTRL)
-
-AC_OVERRIDES(treectrl,treectrl,
-**--with-treectrl         use wxTreeCtrl class,
-wxUSE_TREECTRL)
-
-AC_OVERRIDES(grid,grid,
-**--with-grid             use wxGrid class,
-wxUSE_GRID)
-
-AC_OVERRIDES(tab_dialog,tab_dialog,
-**--with-tab_dialog       use wxTabDia class,
-wxUSE_TAB_DIALOG)
-
-AC_OVERRIDES(notebook,notebook,
-**--with-notebook         use wxNotebook class,
-wxUSE_NOTEBOOK)
-

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


@@ -862,14 +862,6 @@ AC_OVERRIDES(timedate, timedate,
 **--with-timedate         use wxTime and wxDate classes,
 wxUSE_TIMEDATE)
 
 **--with-timedate         use wxTime and wxDate classes,
 wxUSE_TIMEDATE)
 

-AC_OVERRIDES(fraction,fraction,
-**--with-fraction         use wxFraction class,
-wxUSE_FRACTION)
-
-AC_OVERRIDES(log,log,
-**--with-log              use logging system,
-wxUSE_LOG)
-

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


@@ -886,14 +878,6 @@ AC_OVERRIDES(serial,serial,
 **--with-serial           use class serialization,
 wxUSE_SERIAL)
 
 **--with-serial           use class serialization,
 wxUSE_SERIAL)
 

-AC_OVERRIDES(file,file,
-**--with-file             use wxFile class,
-wxUSE_FILE)
-
-AC_OVERRIDES(textfile,textfile,
-**--with-textfile         use wxTextFile class,
-wxUSE_TEXTFILE)
-

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


@@ -956,11 +940,7 @@ wxUSE_CLIPBOARD)
 
 AC_OVERRIDES(dnd,dnd,
 **--with-dnd              use Drag'n'Drop classes,
 
 AC_OVERRIDES(dnd,dnd,
 **--with-dnd              use Drag'n'Drop classes,

-wxUSE_DND)
-
-AC_OVERRIDES(constraints,constrains,
-**--with-constraints      use layout-constraints system,
-wxUSE_CONSTRAINTS)
+wxUSE_DRAG_AND_DROP)

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


@@ -982,24 +962,6 @@ AC_OVERRIDES(help,help,
 **--with-help             use help (using external browser at present),
 wxUSE_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(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 ----------------------------------------------------------------


@@ -1008,6 +970,13 @@ 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 ----------------------------------------------------------------


@@ -1030,7 +999,7 @@ if test "$wxUSE_GTK" = 1; then
   ], 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__
   ], 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__

-  WX_LINK=-lwx_gtk_1_0
+  WX_LINK=-lwx_gtk2

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


@@ -1098,11 +1067,11 @@ if test "$wxUSE_MOTIF" = 1; then
      AC_MSG_ERROR(no)
   fi
   
      AC_MSG_ERROR(no)
   fi
   

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

   TOOLKIT=MOTIF
   TOOLKIT_DEF="__WXMOTIF__ -D__LINUX__ -D__UNIX__"
   TOOLKIT=MOTIF
   TOOLKIT_DEF="__WXMOTIF__ -D__LINUX__ -D__UNIX__"

-  WX_LINK=-lwx_motif
+  WX_LINK=-lwx_motif2

   MAKEINCLUDE=../motif.inc
 fi
 
   MAKEINCLUDE=../motif.inc
 fi
 


@@ -1125,6 +1094,8 @@ dnl ----------------------------------------------------------------
 dnl Register compile options for makefiles and setup.h
 dnl ----------------------------------------------------------------
 
 dnl Register compile options for makefiles and setup.h
 dnl ----------------------------------------------------------------
 

+EXTRA_LINK=
+

 WXDEBUG=
 if test "$wxUSE_DEBUG_GDB" = 1 ; then
   wxUSE_DEBUG_INFO=1
 WXDEBUG=
 if test "$wxUSE_DEBUG_GDB" = 1 ; then
   wxUSE_DEBUG_INFO=1


@@ -1134,6 +1105,8 @@ else
   if test "$wxUSE_DEBUG_INFO" = 1 ; then
     WXDEBUG="-g"
     wxUSE_OPTIMISE=0
   if test "$wxUSE_DEBUG_INFO" = 1 ; then
     WXDEBUG="-g"
     wxUSE_OPTIMISE=0

+  else
+    EXTRA_LINK="-s $EXTRA_LINK"

   fi
 fi
 AC_SUBST(WXDEBUG)
   fi
 fi
 AC_SUBST(WXDEBUG)


@@ -1152,7 +1125,6 @@ if test "$wxUSE_MEM_TRACING" = 1 ; then
   AC_DEFINE_UNQUOTED(wxUSE_GLOBAL_MEMORY_OPERATORS,$wxUSE_MEM_TRACING)
 fi
 
   AC_DEFINE_UNQUOTED(wxUSE_GLOBAL_MEMORY_OPERATORS,$wxUSE_MEM_TRACING)
 fi
 

-EXTRA_LINK=

 if test "$wxUSE_DMALLOC" = 1 ; then
   EXTRA_LINK="$EXTRA_LINK -ldmalloc"
 fi
 if test "$wxUSE_DMALLOC" = 1 ; then
   EXTRA_LINK="$EXTRA_LINK -ldmalloc"
 fi


@@ -1197,11 +1169,15 @@ dnl ----------------------------------------------------------------
 
 if test "$wxUSE_ZLIB" = 1 ; then
   AC_DEFINE_UNQUOTED(wxUSE_ZLIB,$wxUSE_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 "$wxUSE_LIBPNG" = 1 ; then
   AC_DEFINE_UNQUOTED(wxUSE_LIBPNG,$wxUSE_LIBPNG) 
 
 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)

 
 IODBC_C_SRC=""
 if test "$wxUSE_ODBC" = 1 ; then
 
 IODBC_C_SRC=""
 if test "$wxUSE_ODBC" = 1 ; then


@@ -1210,42 +1186,6 @@ if test "$wxUSE_ODBC" = 1 ; then
 fi
 AC_SUBST(IODBC_C_SRC)
 
 fi
 AC_SUBST(IODBC_C_SRC)
 

-dnl ----------------------------------------------------------------
-dnl Register GUI-control options for makefiles and setup.h
-dnl ----------------------------------------------------------------
-
-if test "$wxUSE_GAUGE" = 1 ; then
-  AC_DEFINE_UNQUOTED(wxUSE_GAUGE,$wxUSE_GAUGE)
-fi
-
-if test "$wxUSE_COMBOBOX" = 1 ; then
-  AC_DEFINE_UNQUOTED(wxUSE_COMBOBOX,$wxUSE_COMBOBOX)
-fi
-
-if test "$wxUSE_SCROLLBAR" = 1 ; then
-  AC_DEFINE_UNQUOTED(wxUSE_SCROLLBAR,$wxUSE_SCROLLBAR)
-fi
-
-if test "$wxUSE_LISTCTRL" = 1 ; then
-  AC_DEFINE_UNQUOTED(wxUSE_LISTCTRL,$wxUSE_LISTCTRL)
-fi
-
-if test "$wxUSE_TREECTRL" = 1 ; then
-  AC_DEFINE_UNQUOTED(wxUSE_TREECTRL,$wxUSE_TREECTRL)
-fi
-
-if test "$wxUSE_GRID" = 1 ; then
-  AC_DEFINE_UNQUOTED(wxUSE_GRID,$wxUSE_GRID)
-fi
-
-if test "$wxUSE_TAB_DIALOG" = 1 ; then
-  AC_DEFINE_UNQUOTED(wxUSE_TAB_DIALOG,$wxUSE_TAB_DIALOG)
-fi
-
-if test "$wxUSE_NOTEBOOK" = 1 ; then
-  AC_DEFINE_UNQUOTED(wxUSE_NOTEBOOK,$wxUSE_NOTEBOOK)
-fi
-

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


@@ -1258,14 +1198,6 @@ if test "$wxUSE_TIMEDATE" = 1 ; then
   AC_DEFINE_UNQUOTED(wxUSE_TIMEDATE,$wxUSE_TIMEDATE)
 fi
 
   AC_DEFINE_UNQUOTED(wxUSE_TIMEDATE,$wxUSE_TIMEDATE)
 fi
 

-if test "$wxUSE_FRACTION" = 1 ; then
-  AC_DEFINE_UNQUOTED(wxUSE_FRACTION,$wxUSE_FRACTION)
-fi
-
-if test "$wxUSE_LOG" = 1 ; then
-  AC_DEFINE_UNQUOTED(wxUSE_LOG,$wxUSE_LOG)
-fi
-

 if test "$wxUSE_INTL" = 1 ; then
   AC_DEFINE_UNQUOTED(wxUSE_INTL,$wxUSE_INTL)
 fi
 if test "$wxUSE_INTL" = 1 ; then
   AC_DEFINE_UNQUOTED(wxUSE_INTL,$wxUSE_INTL)
 fi


@@ -1278,14 +1210,6 @@ if test "$wxUSE_SERIAL" = 1 ; then
   AC_DEFINE_UNQUOTED(wxUSE_SERIAL,$wxUSE_SERIAL)
 fi
 
   AC_DEFINE_UNQUOTED(wxUSE_SERIAL,$wxUSE_SERIAL)
 fi
 

-if test "$wxUSE_FILE" = 1 ; then
-  AC_DEFINE_UNQUOTED(wxUSE_FILE,$wxUSE_FILE)
-fi
-
-if test "$wxUSE_TEXTFILE" = 1 ; then
-  AC_DEFINE_UNQUOTED(wxUSE_TEXTFILE,$wxUSE_TEXTFILE)
-fi
-

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


@@ -1358,25 +1282,14 @@ if test "$wxUSE_CLIPBOARD" = 1 ; then
   AC_DEFINE_UNQUOTED(wxUSE_CLIPBOARD,$wxUSE_CLIPBOARD)
 fi
 
   AC_DEFINE_UNQUOTED(wxUSE_CLIPBOARD,$wxUSE_CLIPBOARD)
 fi
 

-if test "$wxUSE_DND" = 1 ; then
-  AC_DEFINE_UNQUOTED(wxUSE_DND,$wxUSE_DND)
-fi
-
-if test "$wxUSE_CONSTRAINTS" = 1 ; then
-  AC_DEFINE_UNQUOTED(wxUSE_CONSTRAINTS,$wxUSE_CONSTRAINTS)
+if test "$wxUSE_DRAG_AND_DROP" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_DRAG_AND_DROP,$wxUSE_DRAG_AND_DROP)

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

-dnl No effect
+dnl No effect yet

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

-METAFILE=NONE
-if test "$wxUSE_METAFILE" = 1 ; then
-  METAFILE="METAFILE"
-  AC_DEFINE_UNQUOTED(wxUSE_METAFILE,$wxUSE_METAFILE)
-fi
-AC_SUBST(METAFILE)
-

 HELP=NONE
 if test "$wxUSE_HELP" = 1 ; then
   HELP="HELP"
 HELP=NONE
 if test "$wxUSE_HELP" = 1 ; then
   HELP="HELP"


@@ -1384,59 +1297,15 @@ if test "$wxUSE_HELP" = 1 ; then
 fi
 AC_SUBST(HELP)
 
 fi
 AC_SUBST(HELP)
 

-WXGRAPH=NONE
-if test "$wxUSE_WXGRAPH" = 1 ; then
-  WXGRAPH="WXGRAPH"
-  AC_DEFINE_UNQUOTED(wxUSE_WXGRAPH,$wxUSE_WXGRAPH)
-fi
-AC_SUBST(WXGRAPH)
-
-WXTREE=NONE
-if test "$wxUSE_WXTREE" = 1 ; then
-  WXTREE="WXTREE"
-  AC_DEFINE_UNQUOTED(wxUSE_WXTREE,$wxUSE_WXTREE)
-fi
-AC_SUBST(WXTREE)
-
-GLCANVAS=NONE
-if test "$wxUSE_OPENGL" = 1 ; then
-  GLCANVAS="GLCANVAS"
-fi
-
-dnl ----------------------------------------------------------------
-dnl select  dynamic loader (used by iODBC to load drivers)
-dnl ----------------------------------------------------------------
-
-AC_CHECK_LIB(dl,main,[DL_LIBRARY=-ldl],[DL_LIBRARY=])
-AC_SUBST(DL_LIBRARY)
-

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

-wxUSE_THREADS=1

 THREADS_LINK=""
 THREADS_LINK=""

-UNIX_THREAD="gtk/threadno.cpp"
-
-AC_OVERRIDES(threads,threads,
-**--without-threads       Force disabling threads,
-wxUSE_THREADS)
+UNIX_THREAD=""

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

-  case "$os" in
-   solaris*)
-
-      AC_CHECK_LIB(thread, thr_create, [
-        UNIX_THREAD="gtk/threadsol.cpp"
-        THREADS_LINK="-lthread"
-      ])
-      ;;
-
-   *)
-  
-     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, [
      dnl For glibc 2 users who have the old libc 5 too
 
      AC_CHECK_LIB(pthread-0.7, pthread_create, [


@@ -1456,13 +1325,16 @@ if test "$wxUSE_THREADS" = "1"; then
      ])
     ])
 
      ])
     ])
 

+    if test "$THREADS_LINK" != ""; then
+      AC_DEFINE(wxUSE_THREADS)
+    fi
+

     dnl -lposix4 seems to be required on Solaris
 
     AC_CHECK_LIB(posix4, printf, [
       THREADS_LINK="$THREADS_LINK -lposix4"
     dnl -lposix4 seems to be required on Solaris
 
     AC_CHECK_LIB(posix4, printf, [
       THREADS_LINK="$THREADS_LINK -lposix4"

-    ]);;
-
-  esac
+    ])
+    

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


@@ -1475,77 +1347,11 @@ fi
 
 AC_SUBST(UNIX_THREAD)
 AC_SUBST(THREADS_LINK)
 
 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   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 ----------------------------------------------------------------
-
-OPENGL_INCLUDE=
-OPENGL_LIBRARY=
-OPENGL_LINK=
-
-if test "$wxUSE_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
-    fi
-  else
-    AC_MSG_ERROR(no)
-  fi
-fi
-
-dnl ----------------------------------------------------------------
-dnl left-over
-dnl ----------------------------------------------------------------
-
-wxUSE_GLX=$wxUSE_OPENGL
-if test "$wxUSE_OPENGL" != 1; then
-  OPENGL_LIBRARIES=
-  OPENGL_INCLUDE=
-  OPENGL_LINK=
-  GLCANVAS=NONE
-fi
-
-AC_DEFINE_UNQUOTED(wxUSE_GLX,$wxUSE_GLX)
-AC_SUBST(OPENGL_INCLUDE)
-AC_SUBST(OPENGL_LIBRARY)
-AC_SUBST(OPENGL_LINK)
-AC_SUBST(GLCANVAS)
-

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


@@ -1646,14 +1452,14 @@ 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
   if test "$wxUSE_MOTIF" = 1; then
 fi
 
 if test "x$GXX" = xyes; then
   if test "$wxUSE_MOTIF" = 1; then

-    CXXFLAGS="${CXXFLAGS} -Wall -Wno-unused"
+    CXXFLAGS="${CXXFLAGS} -Wall -Wno-unused -D_REENTRANT"

   else
   else

-    CXXFLAGS="${CXXFLAGS} -Wall"
+    CXXFLAGS="${CXXFLAGS} -Wall -D_REENTRANT"

   fi
 fi
 
   fi
 fi