mirror of
https://github.com/darlinghq/darling-dbuskit.git
synced 2024-11-23 12:19:40 +00:00
Smarter compiler selection for the configure script. Should fix #35340.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/dbuskit/trunk@34600 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
75afe5b865
commit
af4a116cca
@ -1,3 +1,11 @@
|
||||
2011-12-20 Niels Grewe <niels.grewe@halbordnung.de>
|
||||
|
||||
* configure.ac: When selecting an Objective-C compiler, prefer the
|
||||
value of $CC if $OBJC is not set. Also, if the user does not specify
|
||||
a specific compiler and clang is installed, default to using clang.
|
||||
* config.make.in: Update for new compiler selection.
|
||||
* configure: Regenerate.
|
||||
|
||||
2011-10-09 Niels Grewe <niels.grewe@halbordnung.de>
|
||||
|
||||
* Documentation/GNUmakefile
|
||||
|
@ -1,5 +1,5 @@
|
||||
ifeq ($(strip $(CC)),)
|
||||
CC=@CC@
|
||||
CC=@OBJC@
|
||||
endif
|
||||
ADDITIONAL_OBJCFLAGS+=@DBUS_CFLAGS@ @ATOMIC_CFLAGS@
|
||||
WARN_FLAGS+=@WARN_FLAGS@
|
||||
|
11
configure.ac
11
configure.ac
@ -4,8 +4,17 @@ AC_INIT
|
||||
LT_INIT
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
AC_CANONICAL_SYSTEM
|
||||
|
||||
#Override the OBJC variable if it is empty and CC is also set.
|
||||
if test x"$CC" != x""; then
|
||||
if x"$OBJC" = x""; then
|
||||
OBJC="$CC"
|
||||
fi
|
||||
fi
|
||||
|
||||
AC_PROG_CC(clang gcc cc c1 egcs)
|
||||
AC_PROG_CPP
|
||||
AC_PROG_OBJC(clang gcc objcc objc cc CC)
|
||||
AC_LANG(Objective C)
|
||||
PKG_PROG_PKG_CONFIG([])
|
||||
AC_LANG_PUSH(C)
|
||||
@ -129,7 +138,7 @@ else
|
||||
fi
|
||||
|
||||
AC_SUBST(OBJC_RUNTIME_H)
|
||||
|
||||
AC_SUBST(OBJC)
|
||||
CFLAGS="$saved_CFLAGS"
|
||||
CPPFLAGS="$saved_CPPFLAGS"
|
||||
LDFLAGS="$saved_LDFLAGS"
|
||||
|
Loading…
Reference in New Issue
Block a user