some compilers don't like statics in inline functions, even if they're const -- repla...

[wxWidgets.git] / configure

diff --git a/configure b/configure
index ab3ac0ee661107d66ce5418f2d12449d1488ebde..a34369af1691f8bd6afa40c7e1d8004aa479c05f 100755 (executable)
--- a/configure
+++ b/configure
@@ -22332,7 +22332,7 @@ main ()
 {
 
                 #if (__GLIBC__ < 2) || (__GLIBC_MINOR__ < 1)
 {
 
                 #if (__GLIBC__ < 2) || (__GLIBC_MINOR__ < 1)

-                    #error not glibc2.1
+                not glibc 2.1

                 #endif
 
   ;
                 #endif
 
   ;


@@ -25798,7 +25798,7 @@ main ()
 {
 
                             #if !GTK_CHECK_VERSION(2,4,0)
 {
 
                             #if !GTK_CHECK_VERSION(2,4,0)

-                            #error "Not GTK+ 2.4"
+                            Not GTK+ 2.4

                             #endif
 
   ;
                             #endif
 
   ;


@@ -28344,7 +28344,7 @@ main ()
 {
 
                         #if XmVersion < 2000
 {
 
                         #if XmVersion < 2000

-                        #error "Not Motif 2"
+                        Not Motif 2

                         #endif
 
   ;
                         #endif
 
   ;


@@ -28411,7 +28411,7 @@ main ()
 {
 
                         #if !defined(LesstifVersion) || LesstifVersion <= 0
 {
 
                         #if !defined(LesstifVersion) || LesstifVersion <= 0

-                        #error "Not Lesstif"
+                        Not Lesstif

                         #endif
 
   ;
                         #endif
 
   ;


@@ -32732,10 +32732,10 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
              #if defined(__BSD__)
 /* end confdefs.h.  */
 
              #if defined(__BSD__)

-               #include <sys/param.h>
-               #include <sys/mount.h>
+             #include <sys/param.h>
+             #include <sys/mount.h>

              #else
              #else

-               #include <sys/vfs.h>
+             #include <sys/vfs.h>

              #endif
 
 int
              #endif
 
 int


@@ -32774,16 +32774,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then

-
-             wx_cv_func_statfs=yes
-
+  wx_cv_func_statfs=yes

 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-
-             wx_cv_func_statfs=no
-
+wx_cv_func_statfs=no

 
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext


@@ -32793,6 +32789,44 @@ echo "$as_me:$LINENO: result: $wx_cv_func_statfs" >&5
 echo "${ECHO_T}$wx_cv_func_statfs" >&6
 
 if test "$wx_cv_func_statfs" = "yes"; then
 echo "${ECHO_T}$wx_cv_func_statfs" >&6
 
 if test "$wx_cv_func_statfs" = "yes"; then

+
+
+    ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+    echo "$as_me:$LINENO: checking for statfs declaration" >&5
+echo $ECHO_N "checking for statfs declaration... $ECHO_C" >&6
+if test "${wx_cv_func_statfs_decl+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+             #if defined(__BSD__)
+             #include <sys/param.h>
+             #include <sys/mount.h>
+             #else
+             #include <sys/vfs.h>
+             #endif
+
+fi
+echo "$as_me:$LINENO: result: $wx_cv_func_statfs_decl" >&5
+echo "${ECHO_T}$wx_cv_func_statfs_decl" >&6
+    ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+    if test "$wx_cv_func_statfs_decl" = "yes"; then
+        cat >>confdefs.h <<\_ACEOF
+#define HAVE_STATFS_DECL 1
+_ACEOF
+
+    fi
+

     wx_cv_type_statvfs_t="struct statfs"
     cat >>confdefs.h <<\_ACEOF
 #define HAVE_STATFS 1
     wx_cv_type_statvfs_t="struct statfs"
     cat >>confdefs.h <<\_ACEOF
 #define HAVE_STATFS 1


@@ -44484,7 +44518,7 @@ int
 main ()
 {
 #if (__GNUC__ < 4)
 main ()
 {
 #if (__GNUC__ < 4)

-             #error "Not GCC 4.0 or greater"
+             Not GCC 4.0 or greater

              #endif
 
   ;
              #endif
 
   ;


@@ -44542,7 +44576,7 @@ int
 main ()
 {
 #if !(__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2))
 main ()
 {
 #if !(__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2))

-                             #error "Not GCC 3.2 or greater"
+                             Not GCC 3.2 or greater

                              #endif
 
   ;
                              #endif
 
   ;


@@ -44598,7 +44632,7 @@ int
 main ()
 {
 #if !(__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2))
 main ()
 {
 #if !(__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2))

-                             #error "Not GCC 3.2 or greater"
+                             Not GCC 3.2 or greater

                              #endif
 
   ;
                              #endif
 
   ;