Check for wxFS_READ in OpenFile.

[wxWidgets.git] / configure

diff --git a/configure b/configure
index 03e13055ce695f83f4482673db68e326b5249801..75ef74e90422dc8f677b6bb889d103b4148b4c44 100755 (executable)
--- a/configure
+++ b/configure
@@ -965,6 +965,7 @@ Optional Features:
   --enable-no_exceptions  create code without C++ exceptions handling
   --enable-permissive     compile code disregarding strict ANSI
   --enable-no_deps        create code without dependency information
   --enable-no_exceptions  create code without C++ exceptions handling
   --enable-permissive     compile code disregarding strict ANSI
   --enable-no_deps        create code without dependency information

+  --disable-vararg_macros don't use vararg macros, even if they are supported

   --enable-universal_binary[=SDK] create Mac PowerPC and Intel Universal binary (not yet working)
   --enable-compat24       enable wxWidgets 2.4 compatibility
   --disable-compat26      disable wxWidgets 2.6 compatibility
   --enable-universal_binary[=SDK] create Mac PowerPC and Intel Universal binary (not yet working)
   --enable-compat24       enable wxWidgets 2.4 compatibility
   --disable-compat26      disable wxWidgets 2.6 compatibility


@@ -2190,6 +2191,7 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_OPTIMISE=no
   DEFAULT_wxUSE_PROFILE=no
   DEFAULT_wxUSE_NO_DEPS=no
   DEFAULT_wxUSE_OPTIMISE=no
   DEFAULT_wxUSE_PROFILE=no
   DEFAULT_wxUSE_NO_DEPS=no

+  DEFAULT_wxUSE_VARARG_MACROS=no

   DEFAULT_wxUSE_NO_RTTI=no
   DEFAULT_wxUSE_NO_EXCEPTIONS=no
   DEFAULT_wxUSE_UNIVERSAL_BINARY=no
   DEFAULT_wxUSE_NO_RTTI=no
   DEFAULT_wxUSE_NO_EXCEPTIONS=no
   DEFAULT_wxUSE_UNIVERSAL_BINARY=no


@@ -2413,6 +2415,7 @@ else
   DEFAULT_wxUSE_OPTIMISE=yes
   DEFAULT_wxUSE_PROFILE=no
   DEFAULT_wxUSE_NO_DEPS=no
   DEFAULT_wxUSE_OPTIMISE=yes
   DEFAULT_wxUSE_PROFILE=no
   DEFAULT_wxUSE_NO_DEPS=no

+  DEFAULT_wxUSE_VARARG_MACROS=yes

   DEFAULT_wxUSE_NO_RTTI=no
   DEFAULT_wxUSE_NO_EXCEPTIONS=no
   DEFAULT_wxUSE_UNIVERSAL_BINARY=no
   DEFAULT_wxUSE_NO_RTTI=no
   DEFAULT_wxUSE_NO_EXCEPTIONS=no
   DEFAULT_wxUSE_UNIVERSAL_BINARY=no


@@ -4418,6 +4421,47 @@ echo "${ECHO_T}no" >&6
           fi
 
 
           fi
 
 

+          enablestring=
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-vararg_macros" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-vararg_macros... $ECHO_C" >&6
+          no_cache=0
+          # Check whether --enable-vararg_macros or --disable-vararg_macros was given.
+if test "${enable_vararg_macros+set}" = set; then
+  enableval="$enable_vararg_macros"
+
+                          if test "$enableval" = yes; then
+                            ac_cv_use_vararg_macros='wxUSE_VARARG_MACROS=yes'
+                          else
+                            ac_cv_use_vararg_macros='wxUSE_VARARG_MACROS=no'
+                          fi
+
+else
+
+                          LINE=`grep "wxUSE_VARARG_MACROS" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_vararg_macros='wxUSE_VARARG_MACROS='$DEFAULT_wxUSE_VARARG_MACROS
+
+fi;
+
+          eval "$ac_cv_use_vararg_macros"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_vararg_macros >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_VARARG_MACROS" = yes; then
+            echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+          else
+            echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+          fi
+
+

           enablestring=
           echo "$as_me:$LINENO: checking for --${enablestring:-enable}-universal_binary" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-universal_binary... $ECHO_C" >&6
           enablestring=
           echo "$as_me:$LINENO: checking for --${enablestring:-enable}-universal_binary" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-universal_binary... $ECHO_C" >&6


@@ -11803,6 +11847,8 @@ if test "$wxUSE_WINE" = "yes"; then
     DEFAULT_DEFAULT_wxUSE_MOTIF=0
     DEFAULT_DEFAULT_wxUSE_MSW=1
     wxUSE_SHARED=no
     DEFAULT_DEFAULT_wxUSE_MOTIF=0
     DEFAULT_DEFAULT_wxUSE_MSW=1
     wxUSE_SHARED=no

+    CC=${CC:-winegcc}
+    CXX=${CXX:-wineg++}

 fi
 
 
 fi
 
 


@@ -16042,8 +16088,6 @@ esac
 
 if test "$wxUSE_WINE" = "yes"; then
     wants_win32=1
 
 if test "$wxUSE_WINE" = "yes"; then
     wants_win32=1

-        CC=winegcc
-    CXX=wineg++

     LDFLAGS_GUI="-mwindows"
 fi
 
     LDFLAGS_GUI="-mwindows"
 fi
 


@@ -21597,6 +21641,8 @@ _ACEOF
     fi
 fi
 
     fi
 fi
 

+if test "$wxUSE_VARARG_MACROS" = "yes"; then
+

 echo "$as_me:$LINENO: checking whether the compiler supports variadic macros" >&5
 echo $ECHO_N "checking whether the compiler supports variadic macros... $ECHO_C" >&6
 if test "${wx_cv_have_variadic_macros+set}" = set; then
 echo "$as_me:$LINENO: checking whether the compiler supports variadic macros" >&5
 echo $ECHO_N "checking whether the compiler supports variadic macros... $ECHO_C" >&6
 if test "${wx_cv_have_variadic_macros+set}" = set; then


@@ -21679,6 +21725,7 @@ _ACEOF
 
 fi
 
 
 fi
 

+fi

 # Check whether --enable-largefile or --disable-largefile was given.
 if test "${enable_largefile+set}" = set; then
   enableval="$enable_largefile"
 # Check whether --enable-largefile or --disable-largefile was given.
 if test "${enable_largefile+set}" = set; then
   enableval="$enable_largefile"


@@ -27125,72 +27172,6 @@ _ACEOF
 
         WIN32INSTALL=win32install
 
 
         WIN32INSTALL=win32install
 

-                    echo "$as_me:$LINENO: checking for boolean" >&5
-echo $ECHO_N "checking for boolean... $ECHO_C" >&6
-if test "${ac_cv_type_boolean+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <windows.h>
-
-int
-main ()
-{
-if ((boolean *) 0)
-  return 0;
-if (sizeof (boolean))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-        { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_boolean=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_boolean=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_boolean" >&5
-echo "${ECHO_T}$ac_cv_type_boolean" >&6
-if test $ac_cv_type_boolean = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_BOOLEAN 1
-_ACEOF
-
-
-fi
-
-

 
 for ac_header in pbt.h
 do
 
 for ac_header in pbt.h
 do