don't change the wxUSE_XXX for the controls if --enable-controls wasn't specified

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47461 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure b/configure
index fd4323c2993e8a48532098fc3be8ca96b2dd9c43..95af068deb44cf30a72509a0aa68f6cf96f4c5f8 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
 #! /bin/sh

-# From configure.in Id: configure.in 47419 2007-07-13 09:13:55Z VS .
+# From configure.in Id: configure.in 47439 2007-07-13 20:44:26Z VS .

 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
 #
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
 #


@@ -1749,7 +1749,7 @@ Optional Features:
   --enable-clipboard      use wxClipboard class
   --enable-dnd            use Drag'n'Drop classes
   --enable-metafile       use win32 metafiles
   --enable-clipboard      use wxClipboard class
   --enable-dnd            use Drag'n'Drop classes
   --enable-metafile       use win32 metafiles

-  --enable-controls       use all usual controls
+  --disable-controls      disable compilation of all standard controls

   --enable-accel          use accelerators
   --enable-animatectrl    use wxAnimationCtrl class
   --enable-button         use wxButton class
   --enable-accel          use accelerators
   --enable-animatectrl    use wxAnimationCtrl class
   --enable-button         use wxButton class


@@ -10168,9 +10168,10 @@ echo "${ECHO_T}$result" >&6; }
 
 
 
 
 
 

+DEFAULT_wxUSE_CONTROLS=none

 
 

-          enablestring=
-          defaultval=$wxUSE_ALL_FEATURES
+          enablestring=disable
+          defaultval=

           if test -z "$defaultval"; then
               if test x"$enablestring" = xdisable; then
                   defaultval=yes
           if test -z "$defaultval"; then
               if test x"$enablestring" = xdisable; then
                   defaultval=yes


@@ -25608,11 +25609,13 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */

-#include <stdio.h>
+#include <sys/types.h> /* for off_t */
+     #include <stdio.h>

 int
 main ()
 {
 int
 main ()
 {

-return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
+int (*fp) (FILE *, off_t, int) = fseeko;
+     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);

   ;
   return 0;
 }
   ;
   return 0;
 }


@@ -25652,11 +25655,13 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #define _LARGEFILE_SOURCE 1
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #define _LARGEFILE_SOURCE 1

-#include <stdio.h>
+#include <sys/types.h> /* for off_t */
+     #include <stdio.h>

 int
 main ()
 {
 int
 main ()
 {

-return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
+int (*fp) (FILE *, off_t, int) = fseeko;
+     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);

   ;
   return 0;
 }
   ;
   return 0;
 }

diff --git a/configure.in b/configure.in
index 6b322e600dd0a15124397521c7d3251ee7a76e80..0a5e8757b5d348c6feaf9588028307c1f0b91101 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -663,7 +663,9 @@ dnl ---------------------------------------------------------------------------
 dnl optional GUI controls (in alphabetical order except the first one)
 dnl ---------------------------------------------------------------------------
 
 dnl optional GUI controls (in alphabetical order except the first one)
 dnl ---------------------------------------------------------------------------
 

-WX_ARG_FEATURE(controls,    [  --enable-controls       use all usual controls], wxUSE_CONTROLS)
+dnl don't set DEFAULT_wxUSE_XXX below if the option is not specified
+DEFAULT_wxUSE_CONTROLS=none
+WX_ARG_DISABLE(controls,    [  --disable-controls      disable compilation of all standard controls], wxUSE_CONTROLS)

 
 dnl even with --enable-controls, some may be disabled by giving
 dnl --disable-<control> later on the command line - but by default all will be
 
 dnl even with --enable-controls, some may be disabled by giving
 dnl --disable-<control> later on the command line - but by default all will be