compile without STRICT fixed

[wxWidgets.git] / install / gtk / configure.in

diff --git a/install/gtk/configure.in b/install/gtk/configure.in
index e8fc33b1f69653c25448139a9099d2c6b36aba09..d7db7f05e29940c05e82e100784838158b85691c 100644 (file)
--- a/install/gtk/configure.in
+++ b/install/gtk/configure.in
@@ -593,7 +593,7 @@ USE_GTK=1
 USE_UNIX=1
 
 TOOLKIT=GTK
 USE_UNIX=1
 
 TOOLKIT=GTK

-TOOLKIT_DEF=__GTK__
+TOOLKIT_DEF=__WXGTK__

 
 USE_LINUX=
 USE_SGI=
 
 USE_LINUX=
 USE_SGI=


@@ -745,7 +745,7 @@ AC_OVERRIDES(optimise,optimise,
 USE_OPTIMISE)
 
 AC_OVERRIDES(debug_flag,debug_flag,
 USE_OPTIMISE)
 
 AC_OVERRIDES(debug_flag,debug_flag,

-**--with-debug_flag       create code with DEBUG define set to 1,
+**--with-debug_flag       create code with WXDEBUG define set to 1,

 USE_DEBUG_FLAG)
 
 AC_OVERRIDES(debug_info,debug_info,
 USE_DEBUG_FLAG)
 
 AC_OVERRIDES(debug_info,debug_info,


@@ -939,14 +939,16 @@ if test "$USE_AUTOTRANS" = 1 ; then
   AC_DEFINE_UNQUOTED(USE_AUTOTRANS,$USE_AUTOTRANS)
 fi
 
   AC_DEFINE_UNQUOTED(USE_AUTOTRANS,$USE_AUTOTRANS)
 fi
 

-DEBUG=
+WXDEBUG=

 if test "$USE_DEBUG_INFO" = 1 ; then
 if test "$USE_DEBUG_INFO" = 1 ; then

-  DEBUG="-g"
+  WXDEBUG="-g"

 fi
 fi

-AC_SUBST(DEBUG)
+AC_SUBST(WXDEBUG)

 
 if test "$USE_DEBUG_FLAG" = 1 ; then
 
 if test "$USE_DEBUG_FLAG" = 1 ; then

-  AC_DEFINE_UNQUOTED(DEBUG,$USE_DEBUG_FLAG)
+  AC_DEFINE_UNQUOTED(WXDEBUG,$USE_DEBUG_FLAG)
+  WXDEBUG_DEFINE="-D__WXDEBUG__"
+  AC_SUBST(WXDEBUG_DEFINE)

 fi
 
 if test "$USE_MEM_TRACING" = 1 ; then
 fi
 
 if test "$USE_MEM_TRACING" = 1 ; then


@@ -1180,7 +1182,7 @@ if test "$USE_GTK" = 1; then
        GUI_TK_INCLUDE="$GTK_CFLAGS"
        GUI_TK_LIBRARY="$GTK_LIBS"
   ], AC_MSG_ERROR(Are gtk-config and the GTK in path and up-to-date?))
        GUI_TK_INCLUDE="$GTK_CFLAGS"
        GUI_TK_LIBRARY="$GTK_LIBS"
   ], AC_MSG_ERROR(Are gtk-config and the GTK in path and up-to-date?))

-  AC_DEFINE(__GTK__)
+  AC_DEFINE(__WXGTK__)

 fi
 AC_SUBST(GUI_TK_INCLUDE)
 AC_SUBST(GUI_TK_LIBRARY)
 fi
 AC_SUBST(GUI_TK_INCLUDE)
 AC_SUBST(GUI_TK_LIBRARY)