wx-config is configurable...

[wxWidgets.git] / configure.in

diff --git a/configure.in b/configure.in
index 64a63af5b7dab102c3c95f75a7b691e29030fa0c..4f4d5682464b99868ef4e6743c545b51d9809134 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -409,7 +409,7 @@ dnl WX_INTERFACE_AGE = 0
 
 WX_MAJOR_VERSION_NUMBER=2
 WX_MINOR_VERSION_NUMBER=1
-WX_RELEASE_NUMBER=13
+WX_RELEASE_NUMBER=14
 
 WX_INTERFACE_AGE=0
 WX_BINARY_AGE=0
@@ -714,6 +714,7 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_LISTBOX=no
   DEFAULT_wxUSE_LISTCTRL=no
   DEFAULT_wxUSE_NOTEBOOK=no
+  DEFAULT_wxUSE_PLOT=no
   DEFAULT_wxUSE_RADIOBOX=no
   DEFAULT_wxUSE_RADIOBTN=no
   DEFAULT_wxUSE_SASH=no
@@ -825,11 +826,12 @@ else
   DEFAULT_wxUSE_COMBOBOX=yes
   DEFAULT_wxUSE_GAUGE=yes
   DEFAULT_wxUSE_GRID=yes
-  DEFAULT_wxUSE_NEW_GRID=no
+  DEFAULT_wxUSE_NEW_GRID=yes
   DEFAULT_wxUSE_IMAGLIST=yes
   DEFAULT_wxUSE_LISTBOX=yes
   DEFAULT_wxUSE_LISTCTRL=yes
   DEFAULT_wxUSE_NOTEBOOK=yes
+  DEFAULT_wxUSE_PLOT=yes
   DEFAULT_wxUSE_RADIOBOX=yes
   DEFAULT_wxUSE_RADIOBTN=yes
   DEFAULT_wxUSE_SASH=yes
@@ -1042,7 +1044,7 @@ if test "$wxUSE_CONTROLS" = "yes"; then
   DEFAULT_wxUSE_CHOICE=yes
   DEFAULT_wxUSE_GAUGE=yes
   DEFAULT_wxUSE_GRID=yes
-  DEFAULT_wxUSE_NEW_GRID=no
+  DEFAULT_wxUSE_NEW_GRID=yes
   DEFAULT_wxUSE_IMAGLIST=yes
   DEFAULT_wxUSE_LISTBOX=yes
   DEFAULT_wxUSE_LISTCTRL=yes
@@ -1147,6 +1149,7 @@ WX_ARG_ENABLE(tooltips,    [  --enable-tooltips       use wxToolTip class], wxUS
 WX_ARG_ENABLE(splines,     [  --enable-splines        use spline drawing code], wxUSE_SPLINES)
 WX_ARG_ENABLE(validators,  [  --enable-validators     use wxValidator and derived classes], wxUSE_VALIDATORS)
 WX_ARG_ENABLE(busyinfo,    [  --enable-busyinfo       use wxBusyInfo], wxUSE_BUSYINFO)
+WX_ARG_ENABLE(plot,        [  --enable-plot           use wxPlot], wxUSE_PLOT)
 
 dnl ---------------------------------------------------------------------------
 dnl support for image formats that do not rely on external library
@@ -1773,6 +1776,8 @@ if test "$wxUSE_MOTIF" = 1; then
                 version = XpmLibraryVersion();
             ],
             [
+               XPM_LINK="-lXpm "
+               AC_DEFINE(wxHAVE_LIB_XPM)
                 AC_MSG_RESULT(found in default search path)
                 COMPILED_X_PROGRAM=0
             ],
@@ -1832,7 +1837,9 @@ fi
 
     dnl ODBC objects are Unix only
     if test "$TOOLKIT" != "MSW"; then
-        ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)"
+        if test "$wxUSE_ODBC" = "yes" ; then
+            ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)"
+        fi
     fi
 
     if test "$wxUSE_LIBJPEG" = "yes" ; then
@@ -2626,6 +2633,10 @@ if test "$wxUSE_LONGLONG" = "yes"; then
   AC_DEFINE(wxUSE_LONGLONG)
 fi
 
+if test "$wxUSE_PLOT" = "yes"; then
+  AC_DEFINE(wxUSE_PLOT)
+fi
+
 if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then
   AC_DEFINE(wxUSE_DIALUP_MANAGER)
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup"
@@ -2799,6 +2810,7 @@ if test "$wxUSE_SOCKETS" = "yes" ; then
 
             AC_TRY_COMPILE(
                 [
+                    #include <sys/types.h>
                     #include <sys/socket.h>
                 ],
                 [
@@ -2808,6 +2820,7 @@ if test "$wxUSE_SOCKETS" = "yes" ; then
                 wx_cv_type_getsockname3=socklen_t,
                 AC_TRY_COMPILE(
                     [
+                        #include <sys/types.h>
                         #include <sys/socket.h>
                     ],
                     [
@@ -2817,13 +2830,14 @@ if test "$wxUSE_SOCKETS" = "yes" ; then
                     wx_cv_type_getsockname3=size_t,
                     AC_TRY_COMPILE(
                         [
+                            #include <sys/types.h>
                             #include <sys/socket.h>
                         ],
                         [
                             int len;
                             getsockname(0, 0, &len);
                         ],
-                        wx_cv_type_getsockname3=int
+                        wx_cv_type_getsockname3=int,
                         wx_cv_type_getsockname3=unknown
                     )
                 )
@@ -3373,7 +3387,7 @@ if test "$wxUSE_GUI" = "yes"; then
                      font fractal image minimal richedit"
 
     dnl this is needed to be able to find AFM files
-    CPPFLAGS="$CPPFLAGS \$(EXTRADEFS)"
+    CPPFLAGS="$CPPFLAGS \$(EXTRADEFS) \$(APPEXTRADEFS)"
 else
     SAMPLES_SUBDIRS=""
 fi