correct some AC_LANG_SOURCE/AC_LANG_PROGRAM snafu

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@14166 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2004-08-26 12:35:42 +00:00
parent 0624b4457e
commit c8f892953b
18 changed files with 29 additions and 32 deletions

View File

@@ -5,7 +5,7 @@ dnl
AC_DEFUN([AC_BROKEN_GLOB],[ AC_DEFUN([AC_BROKEN_GLOB],[
AC_CACHE_CHECK(for working glob, ac_cv_func_glob_working, AC_CACHE_CHECK(for working glob, ac_cv_func_glob_working,
ac_cv_func_glob_working=yes ac_cv_func_glob_working=yes
AC_LINK_IFELSE([AC_LANG_SOURCE([[ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#include <stdio.h> #include <stdio.h>
#include <glob.h>]],[[ #include <glob.h>]],[[
glob(NULL, GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE| glob(NULL, GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE|

View File

@@ -6,8 +6,7 @@ dnl AC_BROKEN2(func, includes, arguments)
AC_DEFUN([AC_BROKEN2], AC_DEFUN([AC_BROKEN2],
[AC_MSG_CHECKING([for $1]) [AC_MSG_CHECKING([for $1])
AC_CACHE_VAL(ac_cv_func_[]$1, AC_CACHE_VAL(ac_cv_func_[]$1,
[AC_LINK_IFELSE([AC_LANG_SOURCE([[$2]], [AC_LINK_IFELSE([AC_LANG_SOURCE([[$2
[[
/* The GNU C library defines this for functions which it implements /* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */ something starting with __ and the normal name is an alias. */

View File

@@ -9,7 +9,7 @@ dnl
AC_DEFUN([AC_C___ATTRIBUTE__], [ AC_DEFUN([AC_C___ATTRIBUTE__], [
AC_MSG_CHECKING(for __attribute__) AC_MSG_CHECKING(for __attribute__)
AC_CACHE_VAL(ac_cv___attribute__, [ AC_CACHE_VAL(ac_cv___attribute__, [
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <stdlib.h>]],[[ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <stdlib.h>
static void foo(void) __attribute__ ((noreturn)); static void foo(void) __attribute__ ((noreturn));
static void static void

View File

@@ -61,7 +61,7 @@ elif test "${krb_cv_compile_et}" = "yes"; then
krb_cv_save_LIBS="${LIBS}" krb_cv_save_LIBS="${LIBS}"
LIBS="${LIBS} -lcom_err" LIBS="${LIBS} -lcom_err"
AC_MSG_CHECKING(for com_err) AC_MSG_CHECKING(for com_err)
AC_LINK_IFELSE([AC_LANG_SOURCE([[#include <com_err.h>]],[[ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <com_err.h>]],[[
const char *p; const char *p;
p = error_message(0); p = error_message(0);
$krb_cv_com_err_need_r $krb_cv_com_err_need_r

View File

@@ -5,11 +5,11 @@ AC_DEFUN([rk_CHECK_VAR], [
AC_MSG_CHECKING(for $1) AC_MSG_CHECKING(for $1)
AC_CACHE_VAL(ac_cv_var_$1, [ AC_CACHE_VAL(ac_cv_var_$1, [
m4_ifval([$2],[ m4_ifval([$2],[
AC_LINK_IFELSE([AC_LANG_SOURCE([[$2 AC_LINK_IFELSE([AC_LANG_PROGRAM([[$2
void * foo() { return &$1; }]],[[foo()]])], void * foo() { return &$1; }]],[[foo()]])],
[ac_cv_var_$1=yes],[ac_cv_var_$1=no])]) [ac_cv_var_$1=yes],[ac_cv_var_$1=no])])
if test "$ac_cv_var_$1" != yes ; then if test "$ac_cv_var_$1" != yes ; then
AC_LINK_IFELSE([AC_LANG_SOURCE([[extern int $1; AC_LINK_IFELSE([AC_LANG_PROGRAM([[extern int $1;
int foo() { return $1; }]],[[foo()]])], int foo() { return $1; }]],[[foo()]])],
[ac_cv_var_$1=yes],[ac_cv_var_$1=no]) [ac_cv_var_$1=yes],[ac_cv_var_$1=no])
fi fi

View File

@@ -87,7 +87,7 @@ if test "$crypto_lib" = "unknown" -a "$with_krb4" != "no"; then
for j in $cdirs; do for j in $cdirs; do
for k in $clibs; do for k in $clibs; do
LIBS="$j $k $save_LIBS" LIBS="$j $k $save_LIBS"
AC_LINK_IFELSE([AC_LANG_SOURCE([test_headers], AC_LINK_IFELSE([AC_LANG_PROGRAM([test_headers],
[test_body])], [test_body])],
[openssl=yes ires="$i" lres="$j $k"; break 3]) [openssl=yes ires="$i" lres="$j $k"; break 3])
done done
@@ -96,7 +96,7 @@ if test "$crypto_lib" = "unknown" -a "$with_krb4" != "no"; then
for j in $cdirs; do for j in $cdirs; do
for k in $clibs; do for k in $clibs; do
LIBS="$j $k $save_LIBS" LIBS="$j $k $save_LIBS"
AC_LINK_IFELSE([AC_LANG_SOURCE([test_headers],[test_body])], AC_LINK_IFELSE([AC_LANG_PROGRAM([test_headers],[test_body])],
[openssl=no ires="$i" lres="$j $k"; break 3]) [openssl=no ires="$i" lres="$j $k"; break 3])
done done
done done
@@ -104,7 +104,7 @@ if test "$crypto_lib" = "unknown" -a "$with_krb4" != "no"; then
for j in $cdirs; do for j in $cdirs; do
for k in $clibs; do for k in $clibs; do
LIBS="$j $k $save_LIBS" LIBS="$j $k $save_LIBS"
AC_LINK_IFELSE([AC_LANG_SOURCE([test_headers],[test_body])], AC_LINK_IFELSE([AC_LANG_PROGRAM([test_headers],[test_body])],
[openssl=no ires="$i" lres="$j $k"; break 3]) [openssl=no ires="$i" lres="$j $k"; break 3])
done done
done done
@@ -142,7 +142,7 @@ if test "$crypto_lib" = "unknown" -a "$with_openssl" != "no"; then
LIB_des_so="$LIB_des" LIB_des_so="$LIB_des"
LIB_des_appl="$LIB_des" LIB_des_appl="$LIB_des"
LIBS="${LIBS} ${LIB_des}" LIBS="${LIBS} ${LIB_des}"
AC_LINK_IFELSE([AC_LANG_SOURCE([test_headers],[test_body])], [ AC_LINK_IFELSE([AC_LANG_PROGRAM([test_headers],[test_body])], [
crypto_lib=libcrypto openssl=yes crypto_lib=libcrypto openssl=yes
AC_MSG_RESULT([libcrypto]) AC_MSG_RESULT([libcrypto])
]) ])

View File

@@ -21,7 +21,7 @@ if eval "test \"\$ac_cv_func_$1\" != yes" ; then
*) ac_lib="-l$ac_lib" ;; *) ac_lib="-l$ac_lib" ;;
esac esac
LIBS="$6 $ac_lib $5 $ac_save_LIBS" LIBS="$6 $ac_lib $5 $ac_save_LIBS"
AC_LINK_IFELSE([AC_LANG_SOURCE([[$3]],[[$1($4)]])],[eval "if test -n \"$ac_lib\";then ac_cv_funclib_$1=$ac_lib; else ac_cv_funclib_$1=yes; fi";break]) AC_LINK_IFELSE([AC_LANG_PROGRAM([[$3]],[[$1($4)]])],[eval "if test -n \"$ac_lib\";then ac_cv_funclib_$1=$ac_lib; else ac_cv_funclib_$1=yes; fi";break])
done done
eval "ac_cv_funclib_$1=\${ac_cv_funclib_$1-no}" eval "ac_cv_funclib_$1=\${ac_cv_funclib_$1-no}"
LIBS="$ac_save_LIBS" LIBS="$ac_save_LIBS"

View File

@@ -7,7 +7,7 @@ dnl AC_HAVE_STRUCT_FIELD(struct, field, headers)
AC_DEFUN([AC_HAVE_STRUCT_FIELD], [ AC_DEFUN([AC_HAVE_STRUCT_FIELD], [
define(cache_val, translit(ac_cv_type_$1_$2, [A-Z ], [a-z_])) define(cache_val, translit(ac_cv_type_$1_$2, [A-Z ], [a-z_]))
AC_CACHE_CHECK([for $2 in $1], cache_val,[ AC_CACHE_CHECK([for $2 in $1], cache_val,[
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[$3]],[[$1 x; x.$2]])], AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[$3]],[[$1 x; x.$2]])],
[cache_val=yes], [cache_val=yes],
[cache_val=no])]) [cache_val=no])])
if test "$cache_val" = yes; then if test "$cache_val" = yes; then

View File

@@ -8,7 +8,7 @@ AC_REQUIRE([AC_HEADER_STDC])
cv=`echo "$1" | sed 'y%./+- %__p__%'` cv=`echo "$1" | sed 'y%./+- %__p__%'`
AC_MSG_CHECKING(for $1) AC_MSG_CHECKING(for $1)
AC_CACHE_VAL([ac_cv_type_$cv], AC_CACHE_VAL([ac_cv_type_$cv],
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <sys/types.h> #include <sys/types.h>
#if STDC_HEADERS #if STDC_HEADERS
#include <stdlib.h> #include <stdlib.h>

View File

@@ -18,7 +18,7 @@ AC_CACHE_CHECK([whether byte order is known at compile time],
krb_cv_c_bigendian_compile, krb_cv_c_bigendian_compile,
[AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
#include <sys/types.h> #include <sys/types.h>
#include <sys/param.h>]],[[ #include <sys/param.h>
#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN #if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
bogus endian macros bogus endian macros
#endif]])],[krb_cv_c_bigendian_compile=yes],[krb_cv_c_bigendian_compile=no])]) #endif]])],[krb_cv_c_bigendian_compile=yes],[krb_cv_c_bigendian_compile=no])])
@@ -26,7 +26,7 @@ AC_CACHE_CHECK(whether byte ordering is bigendian, krb_cv_c_bigendian,[
if test "$krb_cv_c_bigendian_compile" = "yes"; then if test "$krb_cv_c_bigendian_compile" = "yes"; then
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
#include <sys/types.h> #include <sys/types.h>
#include <sys/param.h>]],[[ #include <sys/param.h>
#if BYTE_ORDER != BIG_ENDIAN #if BYTE_ORDER != BIG_ENDIAN
not big endian not big endian
#endif]])],[krb_cv_c_bigendian=yes],[krb_cv_c_bigendian=no]) #endif]])],[krb_cv_c_bigendian=yes],[krb_cv_c_bigendian=no])

View File

@@ -89,7 +89,7 @@ fi
]) ])
AC_CACHE_CHECK([for IPv6], ac_cv_lib_ipv6, [ AC_CACHE_CHECK([for IPv6], ac_cv_lib_ipv6, [
AC_LINK_IFELSE([AC_LANG_SOURCE([[ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#ifdef HAVE_SYS_TYPES_H #ifdef HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>
#endif #endif
@@ -125,7 +125,7 @@ fi
## test for AIX missing in6addr_loopback ## test for AIX missing in6addr_loopback
if test "$ac_cv_lib_ipv6" = yes; then if test "$ac_cv_lib_ipv6" = yes; then
AC_CACHE_CHECK([for in6addr_loopback],[ac_cv_var_in6addr_loopback],[ AC_CACHE_CHECK([for in6addr_loopback],[ac_cv_var_in6addr_loopback],[
AC_LINK_IFELSE([AC_LANG_SOURCE([[ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#ifdef HAVE_SYS_TYPES_H #ifdef HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>
#endif #endif

View File

@@ -9,7 +9,7 @@ AC_DEFUN([KRB_READLINE],[
AC_FIND_FUNC_NO_LIBS(el_init, edit, [], [], [$LIB_tgetent]) AC_FIND_FUNC_NO_LIBS(el_init, edit, [], [], [$LIB_tgetent])
if test "$ac_cv_func_el_init" = yes ; then if test "$ac_cv_func_el_init" = yes ; then
AC_CACHE_CHECK(for four argument el_init, ac_cv_func_el_init_four,[ AC_CACHE_CHECK(for four argument el_init, ac_cv_func_el_init_four,[
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <stdio.h> AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
#include <histedit.h>]], #include <histedit.h>]],
[[el_init("", NULL, NULL, NULL);]])], [[el_init("", NULL, NULL, NULL);]])],
[ac_cv_func_el_init_four=yes], [ac_cv_func_el_init_four=yes],

View File

@@ -5,7 +5,7 @@ dnl Test for `struct spwd'
AC_DEFUN([AC_KRB_STRUCT_SPWD], [ AC_DEFUN([AC_KRB_STRUCT_SPWD], [
AC_MSG_CHECKING(for struct spwd) AC_MSG_CHECKING(for struct spwd)
AC_CACHE_VAL(ac_cv_struct_spwd, [ AC_CACHE_VAL(ac_cv_struct_spwd, [
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <pwd.h> #include <pwd.h>
#ifdef HAVE_SHADOW_H #ifdef HAVE_SHADOW_H
#include <shadow.h> #include <shadow.h>

View File

@@ -39,7 +39,7 @@ AC_MSG_CHECKING([if $CC supports the $abi option])
AC_CACHE_VAL($ac_foo, [ AC_CACHE_VAL($ac_foo, [
save_CFLAGS="$CFLAGS" save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $abi" CFLAGS="$CFLAGS $abi"
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[]],[[int x;]])],[eval $ac_foo=yes], [eval $ac_foo=no])dnl AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],[[int x;]])],[eval $ac_foo=yes], [eval $ac_foo=no])dnl
CFLAGS="$save_CFLAGS" CFLAGS="$save_CFLAGS"
]) ])
ac_res=`eval echo \\\$$ac_foo` ac_res=`eval echo \\\$$ac_foo`
@@ -50,7 +50,7 @@ case $abi in
-mabi=32) -mabi=32)
save_CFLAGS="$CFLAGS" save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -mabi=n32" CFLAGS="$CFLAGS -mabi=n32"
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[]],[[int x;]])],[ac_res=yes],[ac_res=no])dnl AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],[[int x;]])],[ac_res=yes],[ac_res=no])dnl
CLAGS="$save_CFLAGS" CLAGS="$save_CFLAGS"
if test $ac_res = yes; then if test $ac_res = yes; then
# New GCC # New GCC

View File

@@ -9,11 +9,9 @@ dnl AC_NEED_PROTO(includes, function)
AC_DEFUN([AC_NEED_PROTO], [ AC_DEFUN([AC_NEED_PROTO], [
if test "$ac_cv_func_$2+set" != set -o "$ac_cv_func_$2" = yes; then if test "$ac_cv_func_$2+set" != set -o "$ac_cv_func_$2" = yes; then
AC_CACHE_CHECK([if $2 needs a prototype], ac_cv_func_$2_noproto, AC_CACHE_CHECK([if $2 needs a prototype], ac_cv_func_$2_noproto,
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[$1]], AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[$1
[[struct foo { int foo; } xx; struct foo { int foo; } xx;
extern int $2 (struct foo*); extern int $2 (struct foo*);]],[[$2(&xx)]])],
$2(&xx);
]])],
[eval "ac_cv_func_$2_noproto=yes"], [eval "ac_cv_func_$2_noproto=yes"],
[eval "ac_cv_func_$2_noproto=no"])) [eval "ac_cv_func_$2_noproto=no"]))
if test "$ac_cv_func_$2_noproto" = yes; then if test "$ac_cv_func_$2_noproto" = yes; then

View File

@@ -9,7 +9,7 @@ dnl AC_PROTO_COMPAT(includes, function, prototype)
AC_DEFUN([AC_PROTO_COMPAT], [ AC_DEFUN([AC_PROTO_COMPAT], [
AC_CACHE_CHECK([if $2 is compatible with system prototype], AC_CACHE_CHECK([if $2 is compatible with system prototype],
ac_cv_func_$2_proto_compat, ac_cv_func_$2_proto_compat,
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[$1]],[[$3]])], AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[$1]],[[$3]])],
[eval "ac_cv_func_$2_proto_compat=yes"], [eval "ac_cv_func_$2_proto_compat=yes"],
[eval "ac_cv_func_$2_proto_compat=no"])) [eval "ac_cv_func_$2_proto_compat=no"]))
define([foo], translit($2, [a-z], [A-Z])[_PROTO_COMPATIBLE]) define([foo], translit($2, [a-z], [A-Z])[_PROTO_COMPATIBLE])

View File

@@ -91,7 +91,7 @@ if test "$with_$1" != no; then
if test "$[]$1_cflags" -a "$[]$1_libs"; then if test "$[]$1_cflags" -a "$[]$1_libs"; then
CFLAGS="$[]$1_cflags $save_CFLAGS" CFLAGS="$[]$1_cflags $save_CFLAGS"
LIBS="$[]$1_libs $save_LIBS" LIBS="$[]$1_libs $save_LIBS"
AC_LINK_IFELSE([AC_LANG_SOURCE([[$2]],[[]])],[ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$2]],[[]])],[
INCLUDE_$1="$[]$1_cflags" INCLUDE_$1="$[]$1_cflags"
LIB_$1="$[]$1_libs" LIB_$1="$[]$1_libs"
AC_MSG_RESULT([from $with_$1_config]) AC_MSG_RESULT([from $with_$1_config])
@@ -101,11 +101,11 @@ if test "$with_$1" != no; then
ires= lres= ires= lres=
for i in $header_dirs; do for i in $header_dirs; do
CFLAGS="-I$i $save_CFLAGS" CFLAGS="-I$i $save_CFLAGS"
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[$2]],[[]])],[ires=$i;break]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[$2]],[[]])],[ires=$i;break])
done done
for i in $lib_dirs; do for i in $lib_dirs; do
LIBS="-L$i $3 $4 $save_LIBS" LIBS="-L$i $3 $4 $save_LIBS"
AC_LINK_IFELSE([AC_LANG_SOURCE([[$2]],[[]])],[lres=$i;break]) AC_LINK_IFELSE([AC_LANG_PROGRAM([[$2]],[[]])],[lres=$i;break])
done done
if test "$ires" -a "$lres" -a "$with_$1" != "no"; then if test "$ires" -a "$lres" -a "$with_$1" != "no"; then
INCLUDE_$1="-I$ires" INCLUDE_$1="-I$ires"

View File

@@ -6,7 +6,7 @@ dnl
AC_DEFUN([rk_C_VARARRAY], [ AC_DEFUN([rk_C_VARARRAY], [
AC_CACHE_CHECK([if the compiler supports variable-length arrays],[rk_cv_c_vararray],[ AC_CACHE_CHECK([if the compiler supports variable-length arrays],[rk_cv_c_vararray],[
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[]],[[int x = 0; { int y[x]; }]])], AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],[[int x = 0; { int y[x]; }]])],
[rk_cv_c_vararray=yes], [rk_cv_c_vararray=yes],
[rk_cv_c_vararray=no])]) [rk_cv_c_vararray=no])])
if test "$rk_cv_c_vararray" = yes; then if test "$rk_cv_c_vararray" = yes; then