Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Fixed configuration problem (#if USE_APPLE_IEEE)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@180 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guilhem Lavaux
1998-07-05 14:39:29 +00:00
parent debe6624c1
commit 8c46af496a
4 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
install/gtk/configure vendored
View File

@@ -5625,6 +5625,14 @@ if test "$USE_LIBPNG" = 1 ; then
LIBPNG="LIBPNG" LIBPNG="LIBPNG"
fi 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 STORABLE=NONE
if test "$USE_STORABLE_CLASSES" = 1 ; then 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. # Extract the first word of "gtk-config", so it can be a program name with args.
set dummy gtk-config; ac_word=$2 set dummy gtk-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 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 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@@ -6035,7 +6043,7 @@ fi
min_gtk_version=0.99.7 min_gtk_version=0.99.7
echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 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="" no_gtk=""
if test "$GTK_CONFIG" != "no" ; then if test "$GTK_CONFIG" != "no" ; then
GTK_CFLAGS=`$GTK_CONFIG --cflags` 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" echo $ac_n "cross compiling; assumed OK... $ac_c"
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 6052 "configure" #line 6060 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <gtk/gtk.h> #include <gtk/gtk.h>
@@ -6070,7 +6078,7 @@ main ()
} }
EOF 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 then
: :
else else
@@ -6121,7 +6129,7 @@ OPENGL_LINK=
if test "$USE_OPENGL" = 1; then if test "$USE_OPENGL" = 1; then
echo $ac_n "checking for OpenGL includes""... $ac_c" 1>&6 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= ac_find_includes=
for ac_dir in $SEARCH_INCLUDE; for ac_dir in $SEARCH_INCLUDE;
@@ -6136,7 +6144,7 @@ for ac_dir in $SEARCH_INCLUDE;
OPENGL_INCLUDE="-I$ac_find_includes" OPENGL_INCLUDE="-I$ac_find_includes"
echo "$ac_t""found $ac_find_includes" 1>&6 echo "$ac_t""found $ac_find_includes" 1>&6
echo $ac_n "checking for OpenGL library""... $ac_c" 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= ac_find_libraries=
for ac_dir in $SEARCH_LIB; for ac_dir in $SEARCH_LIB;

5
install/gtk/configure.in
View File

@@ -921,6 +921,11 @@ if test "$USE_LIBPNG" = 1 ; then
LIBPNG="LIBPNG" LIBPNG="LIBPNG"
fi 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 STORABLE=NONE
if test "$USE_STORABLE_CLASSES" = 1 ; then if test "$USE_STORABLE_CLASSES" = 1 ; then

2
src/common/extended.c
View File

@@ -176,4 +176,4 @@ double ConvertFromIeeeExtended(const unsigned char *bytes)
return f; return f;
} }
#endif USE_APPLE_IEEE #endif

2
src/common/utilscmn.cpp
View File

@@ -10,7 +10,7 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__ #ifdef __GNUG__
#pragma implementation "utilscmn.h" #pragma implementation "utils.h"
#endif #endif
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".