regenerated makefiles

[wxWidgets.git] / configure.in

diff --git a/configure.in b/configure.in
index c3595564e92ccd3d65410ada0983e5e4b10fa64c..03b73bcb5f735219fae1bd374ed57a485a185056 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -503,7 +503,7 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_ICO_CUR=no
   DEFAULT_wxUSE_ACCESSIBILITY=no
   
-  DEFAULT_wxUSE_MONOLITHIC=yes
+  DEFAULT_wxUSE_MONOLITHIC=no
   DEFAULT_wxUSE_OFFICIAL_BUILD=no
 else
   DEFAULT_wxUSE_UNIVERSAL=no
@@ -679,7 +679,7 @@ else
   DEFAULT_wxUSE_ICO_CUR=yes
   DEFAULT_wxUSE_ACCESSIBILITY=no
   
-  DEFAULT_wxUSE_MONOLITHIC=yes
+  DEFAULT_wxUSE_MONOLITHIC=no
   DEFAULT_wxUSE_OFFICIAL_BUILD=no
 fi
 
@@ -2980,7 +2980,7 @@ if test "$wxUSE_OPENGL" = "yes"; then
         USE_OPENGL=1
         AC_DEFINE(wxUSE_OPENGL)
         AC_DEFINE(wxUSE_GLCANVAS)
-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl"
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl opengl/cube opengl/penguin opengl/isosurf"
     fi
 fi
 
@@ -3672,12 +3672,13 @@ dnl Checks specific to contrib libs (MMedia)
 dnl ------------------------------------------
 
 dnl Check for ESD:
-ESD_LINK=
-AC_CHECK_HEADER([esd.h], [
-  AC_CHECK_LIB(esd, esd_close, [
-    ESD_LINK="-lesd"
+EXTRALIBS_ESD=
+AC_CHECK_LIB(esd, esd_close, [
+    AC_CHECK_HEADERS([esd.h], [
+    EXTRALIBS_ESD="-lesd"
   ])
 ])
+AC_SUBST(EXTRALIBS_ESD)
 
 
 dnl ===========================================================================
@@ -5390,6 +5391,29 @@ AC_DEFINE_UNQUOTED(wxINSTALL_PREFIX, "$wxPREFIX")
 dnl define the variables used in wx-config
 top_builddir_wxconfig=`pwd`
 
+
+dnl ---------------------------------------------------------------------------
+dnl define variables with all built libraries for wx-config
+dnl ---------------------------------------------------------------------------
+
+CORE_BASE_LIBS="net base"
+CORE_GUI_LIBS="adv core"
+
+if test "$wxUSE_XML" = "yes" ; then
+    CORE_BASE_LIBS="xml $CORE_BASE_LIBS"
+fi
+if test "$wxUSE_ODBC" != "no" ; then
+    CORE_BASE_LIBS="odbc $CORE_BASE_LIBS"
+    CORE_GUI_LIBS="dbgrid $CORE_GUI_LIBS"
+fi
+if test "$wxUSE_HTML" = "yes" ; then
+    CORE_GUI_LIBS="html $CORE_GUI_LIBS"
+fi
+
+AC_SUBST(CORE_BASE_LIBS)
+AC_SUBST(CORE_GUI_LIBS)
+
+
 dnl ---------------------------------------------------------------------------
 dnl Output the makefiles and such from the results found above
 dnl ---------------------------------------------------------------------------
@@ -5462,7 +5486,7 @@ if test "$wxUSE_GUI" = "yes"; then
     dnl      ipc, mfc, nativdlg, oleauto, ownerdrw
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs \
                      drawing dynamic erase event exec font image \
-                     minimal propsize rotate shaped widgets"
+                     minimal propsize rotate shaped widgets render"
 
     if test "$wxUSE_MONOLITHIC" != "yes"; then
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS console"
@@ -5733,9 +5757,6 @@ AC_SUBST(MAKEINFO)
 AC_SUBST(INSTALL_LIBRARY)
 AC_SUBST(INSTALL_DIR)
 
-dnl contrib tests results:
-AC_SUBST(ESD_LINK)
-
 
 dnl MAKE_SET will be replaced with "MAKE=..." or nothing if make sets MAKE
 dnl itself (this macro is required if SUBDIRS variable is used in Makefile.am