* configure.ac: Move AC_LANG_PUSH/POP out of AC_CACHE_CHECK. (Bug#57380)
This commit is contained in:
parent
34686263b7
commit
ce82300221
1 changed files with 9 additions and 11 deletions
20
configure.ac
20
configure.ac
|
@ -2155,17 +2155,16 @@ AC_SUBST([NS_OBJ])
|
|||
AC_SUBST([NS_OBJC_OBJ])
|
||||
|
||||
if test "${HAVE_NS}" = yes; then
|
||||
AC_LANG_PUSH([Objective C])
|
||||
AC_CACHE_CHECK(
|
||||
[if the Objective C compiler supports instancetype],
|
||||
[emacs_cv_objc_instancetype],
|
||||
[AC_LANG_PUSH([Objective C])
|
||||
AC_COMPILE_IFELSE(
|
||||
[AC_COMPILE_IFELSE(
|
||||
[AC_LANG_SOURCE([[@interface Test
|
||||
+ (instancetype)test;
|
||||
@end]])],
|
||||
[emacs_cv_objc_instancetype=yes],
|
||||
[emacs_cv_objc_instancetype=no])
|
||||
AC_LANG_POP([Objective C])])
|
||||
[emacs_cv_objc_instancetype=no])])
|
||||
|
||||
if test x$emacs_cv_objc_instancetype = xyes ; then
|
||||
AC_DEFINE([NATIVE_OBJC_INSTANCETYPE], [1],
|
||||
|
@ -2175,16 +2174,15 @@ if test "${HAVE_NS}" = yes; then
|
|||
AC_CACHE_CHECK(
|
||||
[if the Objective C compiler defaults to C99],
|
||||
[emacs_cv_objc_c99],
|
||||
[AC_LANG_PUSH([Objective C])
|
||||
AC_COMPILE_IFELSE(
|
||||
[AC_COMPILE_IFELSE(
|
||||
[AC_LANG_PROGRAM([], [[for (int i = 0;;);]])],
|
||||
[emacs_cv_objc_c99=yes],
|
||||
[emacs_cv_objc_c99=no])
|
||||
AC_LANG_POP([Objective C])])
|
||||
[emacs_cv_objc_c99=no])])
|
||||
|
||||
if test x$emacs_cv_objc_c99 = xno ; then
|
||||
GNU_OBJC_CFLAGS="$GNU_OBJC_CFLAGS -std=c99"
|
||||
fi
|
||||
if test x$emacs_cv_objc_c99 = xno ; then
|
||||
GNU_OBJC_CFLAGS="$GNU_OBJC_CFLAGS -std=c99"
|
||||
fi
|
||||
AC_LANG_POP([Objective C])
|
||||
fi
|
||||
|
||||
HAVE_BE_APP=no
|
||||
|
|
Loading…
Add table
Reference in a new issue