Austin English : configure: Fix mach-o/dyld_images.h detection on OS X.
Alexandre Julliard
julliard at winehq.org
Mon Jun 15 07:59:05 CDT 2009
Module: wine
Branch: master
Commit: 2d7ccb3862217efff0b0346e46682c55a8537452
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d7ccb3862217efff0b0346e46682c55a8537452
Author: Austin English <austinenglish at gmail.com>
Date: Sat Jun 13 18:01:24 2009 -0500
configure: Fix mach-o/dyld_images.h detection on OS X.
---
configure | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++-
configure.ac | 10 ++++++-
include/config.h.in | 3 ++
3 files changed, 81 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index dcc43b6..73ced57 100755
--- a/configure
+++ b/configure
@@ -5786,7 +5786,6 @@ for ac_header in \
linux/serial.h \
linux/types.h \
linux/ucdrom.h \
- mach-o/dyld_images.h \
mach-o/nlist.h \
mach/mach.h \
mach/machine.h \
@@ -5813,6 +5812,7 @@ for ac_header in \
scsi/scsi_ioctl.h \
scsi/sg.h \
soundcard.h \
+ stdbool.h \
stdint.h \
strings.h \
stropts.h \
@@ -6440,6 +6440,74 @@ done
+for ac_header in mach-o/dyld_images.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#ifdef HAVE_STDBOOL_H
+ # include <stdbool.h>
+ #endif
+ #ifdef HAVE_STDINT_H
+ # include <stdint.h>
+ #endif
+
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ eval "$as_ac_Header=yes"
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_Header=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+
for ac_header in resolv.h
do
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
diff --git a/configure.ac b/configure.ac
index 5fc708e..258a864 100644
--- a/configure.ac
+++ b/configure.ac
@@ -309,7 +309,6 @@ AC_CHECK_HEADERS(\
linux/serial.h \
linux/types.h \
linux/ucdrom.h \
- mach-o/dyld_images.h \
mach-o/nlist.h \
mach/mach.h \
mach/machine.h \
@@ -336,6 +335,7 @@ AC_CHECK_HEADERS(\
scsi/scsi_ioctl.h \
scsi/sg.h \
soundcard.h \
+ stdbool.h \
stdint.h \
strings.h \
stropts.h \
@@ -486,6 +486,14 @@ AC_CHECK_HEADERS([linux/ipx.h],,,
# include <linux/types.h>
#endif])
+AC_CHECK_HEADERS([mach-o/dyld_images.h],,,
+ [#ifdef HAVE_STDBOOL_H
+ # include <stdbool.h>
+ #endif
+ #ifdef HAVE_STDINT_H
+ # include <stdint.h>
+ #endif])
+
AC_CHECK_HEADERS([resolv.h],,,
[#include <sys/types.h>
#ifdef HAVE_SYS_SOCKET_H
diff --git a/include/config.h.in b/include/config.h.in
index aab0591..c113fcb 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -699,6 +699,9 @@
/* Define to 1 if you have the `statvfs' function. */
#undef HAVE_STATVFS
+/* Define to 1 if you have the <stdbool.h> header file. */
+#undef HAVE_STDBOOL_H
+
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
More information about the wine-cvs
mailing list