set wxUSE_DEBUG if both wxUSE_DEBUG_FLAG and wxUSE_DEBUG_INFO were set to fix the...

[wxWidgets.git] / configure

diff --git a/configure b/configure
index 56ccf8490410a8f0acdf33ccb1e2b94fe9167378..a2625e533dcfd7ceacdce117a562f932decd1d6a 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
 #! /bin/sh

-# From configure.in Id: configure.in 50303 2007-11-28 06:46:25Z PC .
+# From configure.in Id: configure.in 50595 2007-12-09 12:40:58Z RR .

 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
 #
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
 #


@@ -4677,13 +4677,13 @@ echo "${ECHO_T}$result" >&6; }
 fi
 
 if test "$wxUSE_DEBUG" = "yes"; then
 fi
 
 if test "$wxUSE_DEBUG" = "yes"; then

-  DEFAULT_wxUSE_DEBUG_FLAG=yes
-  DEFAULT_wxUSE_DEBUG_INFO=yes
-  BUILD=debug
+    DEFAULT_wxUSE_DEBUG_FLAG=yes
+    DEFAULT_wxUSE_DEBUG_INFO=yes
+    BUILD=debug

 elif test "$wxUSE_DEBUG" = "no"; then
 elif test "$wxUSE_DEBUG" = "no"; then

-  DEFAULT_wxUSE_DEBUG_FLAG=no
-  DEFAULT_wxUSE_DEBUG_INFO=no
-  BUILD=release
+    DEFAULT_wxUSE_DEBUG_FLAG=no
+    DEFAULT_wxUSE_DEBUG_INFO=no
+    BUILD=release

 fi
 
 
 fi
 
 


@@ -4775,6 +4775,12 @@ fi
 echo "${ECHO_T}$result" >&6; }
 
 
 echo "${ECHO_T}$result" >&6; }
 
 

+if test "$wxUSE_DEBUG_FLAG" = "yes" -a "$wxUSE_DEBUG_INFO" = "yes"; then
+    wxUSE_DEBUG=yes
+    BUILD=debug
+fi
+
+

           enablestring=
           defaultval=
           if test -z "$defaultval"; then
           enablestring=
           defaultval=
           if test -z "$defaultval"; then


@@ -24772,8 +24778,8 @@ fi
 
 
   if test -n "$GCC"; then
 
 
   if test -n "$GCC"; then

-    { echo "$as_me:$LINENO: checking for __sync_fetch_* builtins" >&5
-echo $ECHO_N "checking for __sync_fetch_* builtins... $ECHO_C" >&6; }
+    { echo "$as_me:$LINENO: checking for __sync_fetch_and_add and __sync_sub_and_fetch builtins" >&5
+echo $ECHO_N "checking for __sync_fetch_and_add and __sync_sub_and_fetch builtins... $ECHO_C" >&6; }

     if test "${wx_cv_cc_gcc_atomic_builtins+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
     if test "${wx_cv_cc_gcc_atomic_builtins+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -24790,8 +24796,11 @@ main ()
 {
 
           unsigned int value=0;
 {
 
           unsigned int value=0;

-          __sync_fetch_and_add(&value, 1);
+          /* wxAtomicInc doesn't use return value here */
+          __sync_fetch_and_add(&value, 2);

           __sync_sub_and_fetch(&value, 1);
           __sync_sub_and_fetch(&value, 1);

+          /* but wxAtomicDec does, so mimic that: */
+          unsigned int r2 = __sync_sub_and_fetch(&value, 1);

 
   ;
   return 0;
 
   ;
   return 0;


@@ -45341,7 +45350,7 @@ echo "$as_me: WARNING: wxTreeCtrl requires wxImageList and won't be compiled wit
 fi
 
 if test "$wxUSE_POPUPWIN" = "yes"; then
 fi
 
 if test "$wxUSE_POPUPWIN" = "yes"; then

-    if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then
+    if test "$wxUSE_COCOA" = 1 ; then

         { echo "$as_me:$LINENO: WARNING: Popup window not yet supported under Mac OS X... disabled" >&5
 echo "$as_me: WARNING: Popup window not yet supported under Mac OS X... disabled" >&2;}
     else
         { echo "$as_me:$LINENO: WARNING: Popup window not yet supported under Mac OS X... disabled" >&5
 echo "$as_me: WARNING: Popup window not yet supported under Mac OS X... disabled" >&2;}
     else