darlinghq/darling-dbuskit
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-dbuskit.git synced 2024-11-23 12:19:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* configure.ac: Fix autoconf test for location of runtime.h

Browse Source 
* configure: Regenerate


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/dbuskit/trunk@30880 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Niels Grewe 2010-06-28 21:41:08 +00:00
parent d379ec1545
commit ae2b4a5e7c
2 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
configure vendored
View File

@ -2083,7 +2083,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test -n "$ac_tool_prefix"; then
for ac_prog in clang cc gcc c1 egcs
for ac_prog in clang gcc cc c1 egcs
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@ -2127,7 +2127,7 @@ fi
fi
if test -z "$CC"; then
ac_ct_CC=$CC
for ac_prog in clang cc gcc c1 egcs
for ac_prog in clang gcc cc c1 egcs
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@ -3847,25 +3847,8 @@ fi
# framework
#--------------------------------------------------------------------
for ac_header in objc/runtime.h
do :
ac_fn_objc_check_header_mongrel "$LINENO" "objc/runtime.h" "ac_cv_header_objc_runtime_h" "$ac_includes_default"
if test "x$ac_cv_header_objc_runtime_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_OBJC_RUNTIME_H 1
_ACEOF
have_libobjc2_runtime_h=yes
else
have_libobjc2_runtime_h=no
fi
done
if test "$have_libobjc2_runtime_h" = "yes"; then
OBJC_RUNTIME_H="objc/runtime.h"
else
for ac_header in ObjectiveC2/runtime.h
CPPFLAGS="$CPPFLAGS -Werror"
for ac_header in ObjectiveC2/runtime.h
do :
ac_fn_objc_check_header_mongrel "$LINENO" "ObjectiveC2/runtime.h" "ac_cv_header_ObjectiveC2_runtime_h" "$ac_includes_default"
if test "x$ac_cv_header_ObjectiveC2_runtime_h" = x""yes; then :
@ -3879,8 +3862,25 @@ fi
done
if test "$have_objectivec2_runtime_h" = "yes"; then
OBJC_RUNTIME_H="ObjectiveC2/runtime.h"
if test "$have_objectivec2_runtime_h" = "yes"; then
OBJC_RUNTIME_H="ObjectiveC2/runtime.h"
else
for ac_header in objc/runtime.h
do :
ac_fn_objc_check_header_mongrel "$LINENO" "objc/runtime.h" "ac_cv_header_objc_runtime_h" "$ac_includes_default"
if test "x$ac_cv_header_objc_runtime_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_OBJC_RUNTIME_H 1
_ACEOF
have_libobjc2_runtime_h=yes
else
have_libobjc2_runtime_h=no
fi
done
if test "$have_libobjc2_runtime_h" = "yes"; then
OBJC_RUNTIME_H="objc/runtime.h"
else
as_fn_error "\"could not find runtime.h. DBusKit requires gnustep-base >=1.20.\"" "$LINENO" 5
fi

14
configure.ac
View File

@ -88,14 +88,14 @@ AC_SUBST(HAVE_TYPED_SELECTORS)
# framework
#--------------------------------------------------------------------
AC_CHECK_HEADERS(objc/runtime.h,have_libobjc2_runtime_h=yes,have_libobjc2_runtime_h=no)
if test "$have_libobjc2_runtime_h" = "yes"; then
OBJC_RUNTIME_H="objc/runtime.h"
CPPFLAGS="$CPPFLAGS -Werror"
AC_CHECK_HEADERS(ObjectiveC2/runtime.h,have_objectivec2_runtime_h=yes,have_objectivec2_runtime_h=no)
if test "$have_objectivec2_runtime_h" = "yes"; then
OBJC_RUNTIME_H="ObjectiveC2/runtime.h"
else
AC_CHECK_HEADERS(ObjectiveC2/runtime.h,have_objectivec2_runtime_h=yes,have_objectivec2_runtime_h=no)
if test "$have_objectivec2_runtime_h" = "yes"; then
OBJC_RUNTIME_H="ObjectiveC2/runtime.h"
AC_CHECK_HEADERS(objc/runtime.h,have_libobjc2_runtime_h=yes,have_libobjc2_runtime_h=no)
if test "$have_libobjc2_runtime_h" = "yes"; then
OBJC_RUNTIME_H="objc/runtime.h"
else
AC_MSG_ERROR("could not find runtime.h. DBusKit requires gnustep-base >=1.20.")
fi