(blind) fix for virtual function hiding warning

[wxWidgets.git] / configure

diff --git a/configure b/configure
index bbfd9630618ba8fe13a11ff6c83489b448f994cf..a4110f2bd9109eed483286955d7b3057b4ddf903 100755 (executable)
--- a/configure
+++ b/configure
@@ -1024,7 +1024,7 @@ Optional Features:
   --enable-splines        use spline drawing code
   --enable-validators     use wxValidator and derived classes
   --enable-busyinfo       use wxBusyInfo
   --enable-splines        use spline drawing code
   --enable-validators     use wxValidator and derived classes
   --enable-busyinfo       use wxBusyInfo

-  --enable-joystick       use wxJoystick (Linux only)
+  --enable-joystick       use wxJoystick

   --enable-metafiles      use wxMetaFile (Windows only)
   --enable-dragimage      use wxDragImage
   --enable-accessibility  enable accessibility support
   --enable-metafiles      use wxMetaFile (Windows only)
   --enable-dragimage      use wxDragImage
   --enable-accessibility  enable accessibility support


@@ -12704,128 +12704,75 @@ fi
       else
                     RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res"
       fi
       else
                     RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res"
       fi

-      echo "$as_me:$LINENO: checking for gcc version" >&5
+                                    echo "$as_me:$LINENO: checking for gcc version" >&5

 echo $ECHO_N "checking for gcc version... $ECHO_C" >&6
 if test "${wx_cv_gccversion+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 echo $ECHO_N "checking for gcc version... $ECHO_C" >&6
 if test "${wx_cv_gccversion+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 

-          cat >conftest.$ac_ext <<_ACEOF
+          if test "$cross_compiling" = yes; then
+                wx_cv_gccversion="EMX2"
+
+else
+  cat >conftest.$ac_ext <<_ACEOF

 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 

-int
-main ()
-{
+                  #include <stdio.h>

 
 

+                  int main()
+                  {
+                      FILE *f=fopen("conftestval", "w");
+                      if (!f) exit(1);
+                      fprintf(f,

                   #if (__GNUC__ < 3)
                   #if (__GNUC__ < 3)

-                      #error old gcc
+                              "EMX2"
+                  #elif (__GNUC__==3) && ((__GNUC_MINOR__ < 2) || ((__GNUC_MINOR__==2) && (__GNUC_PATCHLEVEL__<2)))
+                              "EMX3"
+                  #elif (__GNUC__==3) && (__GNUC_MINOR__==2) && (__GNUC_PATCHLEVEL__==2)
+                              "Innotek5"
+                  #else
+                              "Innotek6"

                   #endif
                   #endif

+                     );
+                      exit(0);
+                  }

 
 

-  ;
-  return 0;
-}

 _ACEOF
 _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
-
-                  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-                          #if (__GNUC__==3) && ((__GNUC_MINOR__ < 2) || ((__GNUC_MINOR__==2) && (__GNUC_PATCHLEVEL__<2)))
-                              #error intermediate gcc
-                          #endif
-
-  ;
-  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
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); }; } &&
-        { ac_try='test -s conftest.$ac_objext'
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

   { (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
   { (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

-
-                         wx_cv_gccversion=Innotek
-
+  wx_cv_gccversion=`cat conftestval`

 else
 else

-  echo "$as_me: failed program was:" >&5
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5

 sed 's/^/| /' conftest.$ac_ext >&5
 
 sed 's/^/| /' conftest.$ac_ext >&5
 

-
-                         wx_cv_gccversion=3
-
-
+( exit $ac_status )
+wx_cv_gccversion="EMX2"

 fi
 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-                  wx_cv_gccversion=2
-
-
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 fi

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

 
 fi
 echo "$as_me:$LINENO: result: $wx_cv_gccversion" >&5
 echo "${ECHO_T}$wx_cv_gccversion" >&6
 
 fi
 echo "$as_me:$LINENO: result: $wx_cv_gccversion" >&5
 echo "${ECHO_T}$wx_cv_gccversion" >&6

-      if test "$wx_cv_gccversion" = "2"; then
+      if test "$wx_cv_gccversion" = "EMX2"; then

           LIBS="$LIBS -lstdcpp"
           LDFLAGS="$LDFLAGS -Zsysv-signals"
       else
           LIBS="$LIBS -lstdcpp"
           LDFLAGS="$LDFLAGS -Zsysv-signals"
       else

-          if test "$wx_cv_gccversion" = "3"; then
+          if test "$wx_cv_gccversion" = "EMX3"; then

               LIBS="$LIBS -lstdcxx"
               LDFLAGS="$LDFLAGS -Zsysv-signals"
           else
               LIBS="$LIBS -lstdcxx"
               LDFLAGS="$LDFLAGS -Zsysv-signals"
           else


@@ -14400,7 +14347,10 @@ done
 
 case "${host}" in
   *-pc-os2_emx | *-pc-os2-emx )
 
 case "${host}" in
   *-pc-os2_emx | *-pc-os2-emx )

-            if test $ac_cv_header_langinfo_h = "yes"; then
+                  if test $ac_cv_header_langinfo_h = "yes" \
+                -a \(   "$wx_cv_gccversion" = "EMX2" \
+                     -o "$wx_cv_gccversion" = "EMX3" \
+                     -o "$wx_cv_gccversion" = "Innotek5" \); then

           LIBS="$LIBS -lintl"
       fi
   ;;
           LIBS="$LIBS -lintl"
       fi
   ;;


@@ -36988,15 +36938,9 @@ fi
 
 
 if test "$wxUSE_GUI" = "yes"; then
 
 
 if test "$wxUSE_GUI" = "yes"; then

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

 
 

-    if test "$TOOLKIT" = "MAC" -o "$TOOLKIT" = "COCOA"; then
-        { echo "$as_me:$LINENO: WARNING: Joystick not yet supported under Mac OS X... disabled" >&5
-echo "$as_me: WARNING: Joystick not yet supported under Mac OS X... disabled" >&2;}
-        wxUSE_JOYSTICK=no
-     fi
-
-         if test "$TOOLKIT" != "MSW"; then
-        if test "$wxUSE_JOYSTICK" = "yes"; then
+                if test "$TOOLKIT" != "MAC" -a "$TOOLKIT" != "COCOA" -a "$TOOLKIT" != "MSW"; then

 
 for ac_header in linux/joystick.h
 do
 
 for ac_header in linux/joystick.h
 do


@@ -37152,15 +37096,22 @@ done
                 { echo "$as_me:$LINENO: WARNING: Joystick not supported by this system... disabled" >&5
 echo "$as_me: WARNING: Joystick not supported by this system... disabled" >&2;}
             fi
                 { echo "$as_me:$LINENO: WARNING: Joystick not supported by this system... disabled" >&5
 echo "$as_me: WARNING: Joystick not supported by this system... disabled" >&2;}
             fi

+        else
+                      if test "$USE_DARWIN" != 1 -a "$TOOLKIT" != "MSW"; then
+                wxUSE_JOYSTICK=no
+                { echo "$as_me:$LINENO: WARNING: Joystick not supported by this system... disabled" >&5
+echo "$as_me: WARNING: Joystick not supported by this system... disabled" >&2;}
+           fi

         fi
         fi

-    fi

 
 

-    if test "$wxUSE_JOYSTICK" = "yes"; then
-        cat >>confdefs.h <<\_ACEOF
+
+        if test "$wxUSE_JOYSTICK" = "yes"; then
+            cat >>confdefs.h <<\_ACEOF

 #define wxUSE_JOYSTICK 1
 _ACEOF
 
 #define wxUSE_JOYSTICK 1
 _ACEOF
 

-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest"
+            SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest"
+        fi

     fi
 fi
 
     fi
 fi
 


@@ -38924,7 +38875,7 @@ if test "$wxUSE_MAC" = 1 ; then
     fi
 fi
 if test "$wxUSE_COCOA" = 1 ; then
     fi
 fi
 if test "$wxUSE_COCOA" = 1 ; then

-    LDFLAGS="$LDFLAGS -framework Cocoa"
+    LDFLAGS="$LDFLAGS -framework IOKit -framework Cocoa"

     if test "$wxUSE_MEDIACTRL" = "yes"; then
         LDFLAGS="$LDFLAGS -framework QuickTime"
     fi
     if test "$wxUSE_MEDIACTRL" = "yes"; then
         LDFLAGS="$LDFLAGS -framework QuickTime"
     fi


@@ -41322,10 +41273,10 @@ fi
 
 
 
 
 
 

-    BAKEFILE_BAKEFILE_M4_VERSION="0.1.7"
+    BAKEFILE_BAKEFILE_M4_VERSION="0.1.6"

 
 
 
 

-BAKEFILE_AUTOCONF_INC_M4_VERSION="0.1.7"
+BAKEFILE_AUTOCONF_INC_M4_VERSION="0.1.6"