mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-28 21:07:55 +00:00
Code Issues Releases Wiki Activity

Use AC_LINK_IFELSE instead of AC_TRY_LINK

Browse Source 
Fix printing of status message for visibility checks when the test fails.
This commit is contained in:
Todd C. Miller 2013-04-02 16:56:59 -04:00
parent 9438c8ab36
commit e003c793b3
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configure vendored
View File

@ -20763,6 +20763,7 @@ if ${sudo_cv_var_gnu_ld_anon_map+:} false; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
else else
sudo_cv_var_gnu_ld_anon_map=no
cat > conftest.map <<-EOF cat > conftest.map <<-EOF
{ {
global: foo; global: foo;
@ -20785,9 +20786,7 @@ main ()
} }
_ACEOF _ACEOF
if ac_fn_c_try_link "$LINENO"; then : if ac_fn_c_try_link "$LINENO"; then :
sudo_cv_var_gnu_ld_anon_map=yes
sudo_cv_var_gnu_ld_anon_map=yes
fi fi
rm -f core conftest.err conftest.$ac_objext \ rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext conftest$ac_exeext conftest.$ac_ext
@ -20810,6 +20809,7 @@ if ${sudo_cv_var_solaris_ld_anon_map+:} false; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
else else
sudo_cv_var_solaris_ld_anon_map=no
cat > conftest.map <<-EOF cat > conftest.map <<-EOF
{ {
global: foo; global: foo;
@ -20832,9 +20832,7 @@ main ()
} }
_ACEOF _ACEOF
if ac_fn_c_try_link "$LINENO"; then : if ac_fn_c_try_link "$LINENO"; then :
sudo_cv_var_solaris_ld_anon_map=yes
sudo_cv_var_solaris_ld_anon_map=yes
fi fi
rm -f core conftest.err conftest.$ac_objext \ rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext conftest$ac_exeext conftest.$ac_ext
@ -20856,6 +20854,7 @@ if ${sudo_cv_var_hpux_ld_symbol_export+:} false; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
else else
sudo_cv_var_hpux_ld_symbol_export=no
echo "+e foo" > conftest.opt echo "+e foo" > conftest.opt
_CFLAGS="$CFLAGS" _CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $lt_prog_compiler_pic" CFLAGS="$CFLAGS $lt_prog_compiler_pic"
@ -20877,14 +20876,13 @@ main ()
} }
_ACEOF _ACEOF
if ac_fn_c_try_link "$LINENO"; then : if ac_fn_c_try_link "$LINENO"; then :
sudo_cv_var_hpux_ld_symbol_export=yes
sudo_cv_var_hpux_ld_symbol_export=yes
fi fi
rm -f core conftest.err conftest.$ac_objext \ rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext conftest$ac_exeext conftest.$ac_ext
CFLAGS="$_CFLAGS" CFLAGS="$_CFLAGS"
LDFLAGS="$_LDFLAGS" LDFLAGS="$_LDFLAGS"
rm -f conftest.opt
fi fi

19
configure.in
View File

@ -3345,6 +3345,7 @@ if test -n "$LT_LDEXPORTS"; then
AC_CACHE_CHECK([whether ld supports anonymous map files], AC_CACHE_CHECK([whether ld supports anonymous map files],
[sudo_cv_var_gnu_ld_anon_map], [sudo_cv_var_gnu_ld_anon_map],
[ [
sudo_cv_var_gnu_ld_anon_map=no
cat > conftest.map <<-EOF cat > conftest.map <<-EOF
{ {
global: foo; global: foo;
@ -3355,9 +3356,8 @@ EOF
CFLAGS="$CFLAGS $lt_prog_compiler_pic" CFLAGS="$CFLAGS $lt_prog_compiler_pic"
_LDFLAGS="$LDFLAGS" _LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -fpic -shared -Wl,--version-script,./conftest.map" LDFLAGS="$LDFLAGS -fpic -shared -Wl,--version-script,./conftest.map"
AC_TRY_LINK([int foo;], [], [ AC_LINK_IFELSE([AC_LANG_PROGRAM([[int foo;]], [[]])],
sudo_cv_var_gnu_ld_anon_map=yes [sudo_cv_var_gnu_ld_anon_map=yes])
])
CFLAGS="$_CFLAGS" CFLAGS="$_CFLAGS"
LDFLAGS="$_LDFLAGS" LDFLAGS="$_LDFLAGS"
] ]
@ -3371,6 +3371,7 @@ EOF
AC_CACHE_CHECK([whether ld supports anonymous map files], AC_CACHE_CHECK([whether ld supports anonymous map files],
[sudo_cv_var_solaris_ld_anon_map], [sudo_cv_var_solaris_ld_anon_map],
[ [
sudo_cv_var_solaris_ld_anon_map=no
cat > conftest.map <<-EOF cat > conftest.map <<-EOF
{ {
global: foo; global: foo;
@ -3381,9 +3382,8 @@ EOF
CFLAGS="$CFLAGS $lt_prog_compiler_pic" CFLAGS="$CFLAGS $lt_prog_compiler_pic"
_LDFLAGS="$LDFLAGS" _LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -shared -Wl,-M,./conftest.map" LDFLAGS="$LDFLAGS -shared -Wl,-M,./conftest.map"
AC_TRY_LINK([int foo;], [], [ AC_LINK_IFELSE([AC_LANG_PROGRAM([[int foo;]], [[]])],
sudo_cv_var_solaris_ld_anon_map=yes [sudo_cv_var_solaris_ld_anon_map=yes])
])
CFLAGS="$_CFLAGS" CFLAGS="$_CFLAGS"
LDFLAGS="$_LDFLAGS" LDFLAGS="$_LDFLAGS"
] ]
@ -3396,6 +3396,7 @@ EOF
AC_CACHE_CHECK([whether ld supports controlling exported symbols], AC_CACHE_CHECK([whether ld supports controlling exported symbols],
[sudo_cv_var_hpux_ld_symbol_export], [sudo_cv_var_hpux_ld_symbol_export],
[ [
sudo_cv_var_hpux_ld_symbol_export=no
echo "+e foo" > conftest.opt echo "+e foo" > conftest.opt
_CFLAGS="$CFLAGS" _CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $lt_prog_compiler_pic" CFLAGS="$CFLAGS $lt_prog_compiler_pic"
@ -3405,11 +3406,11 @@ EOF
else else
LDFLAGS="$LDFLAGS -Wl,-b -Wl,-c,./conftest.opt" LDFLAGS="$LDFLAGS -Wl,-b -Wl,-c,./conftest.opt"
fi fi
AC_TRY_LINK([int foo;], [], [ AC_LINK_IFELSE([AC_LANG_PROGRAM([[int foo;]], [[]])],
sudo_cv_var_hpux_ld_symbol_export=yes [sudo_cv_var_hpux_ld_symbol_export=yes])
])
CFLAGS="$_CFLAGS" CFLAGS="$_CFLAGS"
LDFLAGS="$_LDFLAGS" LDFLAGS="$_LDFLAGS"
rm -f conftest.opt
] ]
) )
if test "$sudo_cv_var_hpux_ld_symbol_export" = "yes"; then if test "$sudo_cv_var_hpux_ld_symbol_export" = "yes"; then