compile without STRICT fixed

[wxWidgets.git] / install / gtk / configure

diff --git a/install/gtk/configure b/install/gtk/configure
index d8d019336a845635c1e9351587f1ac3b74854df2..e1ba36ebdd1dd4efdf49d2a8d44c7b82c95ddc87 100755 (executable)
--- a/install/gtk/configure
+++ b/install/gtk/configure
@@ -18,9 +18,9 @@ ac_help="$ac_help
 ac_help="$ac_help
 **--with-shared           create shared libraries"
 ac_help="$ac_help
-**--without-optimise      create unoptimised code"
+**--with-optimise      create optimised code"
 ac_help="$ac_help
-**--with-debug_flag       create code with DEBUG define set to 1"
+**--with-debug_flag       create code with WXDEBUG define set to 1"
 ac_help="$ac_help
 **--with-debug_info       create code with debuging information included"
 ac_help="$ac_help
@@ -4232,7 +4232,7 @@ USE_GTK=1
 USE_UNIX=1
 
 TOOLKIT=GTK
-TOOLKIT_DEF=__GTK__
+TOOLKIT_DEF=__WXGTK__
 
 USE_LINUX=
 USE_SGI=
@@ -5625,6 +5625,14 @@ if test "$USE_LIBPNG" = 1 ; then
   LIBPNG="LIBPNG"
 fi
 
+APPLE_IEEE=NONE
+if test "$USE_APPLE_IEEE" = 1 ; then
+  APPLE_IEEE="APPLE_IEEE"
+  cat >> confdefs.h <<EOF
+#define USE_APPLE_IEEE $USE_APPLE_IEEE
+EOF
+
+fi
 
 STORABLE=NONE
 if test "$USE_STORABLE_CLASSES" = 1 ; then
@@ -5644,17 +5652,23 @@ EOF
 
 fi
 
-DEBUG=
+WXDEBUG=
 if test "$USE_DEBUG_INFO" = 1 ; then
-  DEBUG="-g"
+  WXDEBUG="-g"
 fi
 
 
 if test "$USE_DEBUG_FLAG" = 1 ; then
   cat >> confdefs.h <<EOF
-#define DEBUG $USE_DEBUG_FLAG
+#define WXDEBUG $USE_DEBUG_FLAG
 EOF
 
+  cat >> confdefs.h <<EOF
+#define __WXDEBUG__ $USE_DEBUG_FLAG
+EOF
+
+  WXDEBUG_DEFINE="-D__WXDEBUG__"
+  
 fi
 
 if test "$USE_MEM_TRACING" = 1 ; then
@@ -6004,7 +6018,7 @@ fi
   # Extract the first word of "gtk-config", so it can be a program name with args.
 set dummy gtk-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6008: checking for $ac_word" >&5
+echo "configure:6022: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6035,7 +6049,7 @@ fi
 
   min_gtk_version=0.99.7
   echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:6039: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:6053: checking for GTK - version >= $min_gtk_version" >&5
   no_gtk=""
   if test "$GTK_CONFIG" != "no" ; then
     GTK_CFLAGS=`$GTK_CONFIG --cflags`
@@ -6048,7 +6062,7 @@ echo "configure:6039: checking for GTK - version >= $min_gtk_version" >&5
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
-#line 6052 "configure"
+#line 6066 "configure"
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
@@ -6070,7 +6084,7 @@ main ()
 }
 
 EOF
-if { (eval echo configure:6074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -6103,7 +6117,7 @@ fi
   
 
   cat >> confdefs.h <<\EOF
-#define __GTK__ 1
+#define __WXGTK__ 1
 EOF
 
 fi
@@ -6121,7 +6135,7 @@ OPENGL_LINK=
 
 if test "$USE_OPENGL" = 1; then
     echo $ac_n "checking for OpenGL includes""... $ac_c" 1>&6
-echo "configure:6125: checking for OpenGL includes" >&5
+echo "configure:6139: checking for OpenGL includes" >&5
   
 ac_find_includes=
 for ac_dir in $SEARCH_INCLUDE;
@@ -6136,7 +6150,7 @@ for ac_dir in $SEARCH_INCLUDE;
     OPENGL_INCLUDE="-I$ac_find_includes"
     echo "$ac_t""found $ac_find_includes" 1>&6
         echo $ac_n "checking for OpenGL library""... $ac_c" 1>&6
-echo "configure:6140: checking for OpenGL library" >&5
+echo "configure:6154: checking for OpenGL library" >&5
     
 ac_find_libraries=
 for ac_dir in $SEARCH_LIB;
@@ -6562,7 +6576,8 @@ s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@DEBUG@%$DEBUG%g
+s%@WXDEBUG@%$WXDEBUG%g
+s%@WXDEBUG_DEFINE@%$WXDEBUG_DEFINE%g
 s%@PROFILE@%$PROFILE%g
 s%@OPTIMISE@%$OPTIMISE%g
 s%@RPC@%$RPC%g