* Fixed configuration problem (#if USE_APPLE_IEEE)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@180 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/install/gtk/configure b/install/gtk/configure
index d8d019336a845635c1e9351587f1ac3b74854df2..cf9fee4bd3f20358208efc85b2f57d6020acfd8c 100755 (executable)
--- a/install/gtk/configure
+++ b/install/gtk/configure
@@ -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
@@ -6004,7 +6012,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:6016: 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 +6043,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:6047: checking for GTK - version >= $min_gtk_version" >&5
   no_gtk=""
   if test "$GTK_CONFIG" != "no" ; then
     GTK_CFLAGS=`$GTK_CONFIG --cflags`
@@ -6048,7 +6056,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 6060 "configure"
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
@@ -6070,7 +6078,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:6082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -6121,7 +6129,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:6133: checking for OpenGL includes" >&5
   
 ac_find_includes=
 for ac_dir in $SEARCH_INCLUDE;
@@ -6136,7 +6144,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:6148: checking for OpenGL library" >&5
     
 ac_find_libraries=
 for ac_dir in $SEARCH_LIB;

diff --git a/install/gtk/configure.in b/install/gtk/configure.in
index 56a369e0395eb95c1d32e3bc11fceaf5743d036b..588929a3cb06ada0bac6c707ee0b406aaa423858 100644 (file)
--- a/install/gtk/configure.in
+++ b/install/gtk/configure.in
@@ -921,6 +921,11 @@ if test "$USE_LIBPNG" = 1 ; then
   LIBPNG="LIBPNG"
 fi
 
+APPLE_IEEE=NONE
+if test "$USE_APPLE_IEEE" = 1 ; then
+  APPLE_IEEE="APPLE_IEEE"
+  AC_DEFINE_UNQUOTED(USE_APPLE_IEEE,$USE_APPLE_IEEE)
+fi
 
 STORABLE=NONE
 if test "$USE_STORABLE_CLASSES" = 1 ; then

diff --git a/src/common/extended.c b/src/common/extended.c
index 90bd43ec72fba83670d02e6347ce543168967c1e..d77950456dd9ab6f6b7af40e839ccb913f1cc0bf 100644 (file)
--- a/src/common/extended.c
+++ b/src/common/extended.c
@@ -176,4 +176,4 @@ double ConvertFromIeeeExtended(const unsigned char *bytes)
                return f;
 }
 
-#endif USE_APPLE_IEEE
+#endif

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 196f506ae727910acf8f3dc14a3fdb5e51791973..349d6f04a0755b47f164a4e6b9c80324b2d326ee 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -10,7 +10,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
-#pragma implementation "utilscmn.h"
+#pragma implementation "utils.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".