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

Mac OS X fixes for ac-2.5

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21366 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-06-24 22:23:43 +00:00
parent e90ed8ad58
commit 01aa586397
2 changed files with 81 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
configure vendored
View File

@@ -11855,8 +11855,25 @@ fi
esac
if test "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1; then
echo "$as_me:$LINENO: checking for ANSI C header files" >&5
if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then
echo "$as_me:$LINENO: checking for strings.h" >&5
echo $ECHO_N "checking for strings.h... $ECHO_C" >&6
if test "${ac_cv_header_strings_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_strings_h=no
fi
echo "$as_me:$LINENO: result: $ac_cv_header_strings_h" >&5
echo "${ECHO_T}$ac_cv_header_strings_h" >&6
if test "$ac_cv_header_strings_h" = "no"; then
echo "$as_me:$LINENO: result: forced no into cache" >&5
echo "${ECHO_T}forced no into cache" >&6
else
{ echo "$as_me:$LINENO: WARNING: strings.h is not compatible with Mac OS X" >&5
echo "$as_me: WARNING: strings.h is not compatible with Mac OS X" >&2;}
fi
fi
echo "$as_me:$LINENO: checking for ANSI C header files" >&5
echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12221,7 +12238,6 @@ fi
done
fi
for ac_header in stdlib.h
@@ -24319,6 +24335,38 @@ if test "$wxUSE_OPENGL" = "yes"; then
elif test "$wxUSE_MSW" = 1; then
OPENGL_LIBS="-lopengl32 -lglu32"
else
ac_find_includes=
for ac_dir in $SEARCH_INCLUDE /usr/include;
do
if test -f "$ac_dir/GL/gl.h"; then
ac_find_includes=$ac_dir
break
fi
done
if test "$ac_find_includes" != "" ; then
echo "$as_me:$LINENO: result: found in $ac_find_includes" >&5
echo "${ECHO_T}found in $ac_find_includes" >&6
set -x
if test "x$ac_find_includes" = "x/usr/include"; then
ac_path_to_include=""
else
echo "$CPPFLAGS" | grep "\-I$ac_find_includes" > /dev/null
result=$?
if test $result = 0; then
ac_path_to_include=""
else
ac_path_to_include=" -I$ac_find_includes"
fi
fi
CPPFLAGS="$CPPFLAGS$ac_path_to_include"
set +x
fi
if test "${ac_cv_header_GL_gl_h+set}" = set; then
echo "$as_me:$LINENO: checking for GL/gl.h" >&5
echo $ECHO_N "checking for GL/gl.h... $ECHO_C" >&6