diff options
Diffstat (limited to 'am')
-rw-r--r-- | am/proctitle.m4 | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/am/proctitle.m4 b/am/proctitle.m4 index 3035efd..73afd87 100644 --- a/am/proctitle.m4 +++ b/am/proctitle.m4 @@ -20,18 +20,18 @@ AC_DEFUN([MF_PROCTITLE],[ #define MF_PROCTITLE_SETPROCTITLE 0 #define MF_PROCTITLE_REPLACE_ARGV 1 #define MF_PROCTITLE_REWRITE_ARGV 2 #define MF_PROCTITLE_PSTAT 3 #define MF_PROCTITLE_PSSTRINGS 4 ]) - AC_SUBST(MF_PROCTITLE_LIBS) + AC_SUBST([MF_PROCTITLE_LIBS]) - AC_TRY_LINK([extern char *__progname, *__progname_full;], - [__progname = "foo"; __progname_full = "foo bar";], - [AC_DEFINE(HAVE___PROGNAME, 1, - [Define to 1 if libc has __progname])]) + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[extern char *__progname, *__progname_full;]], + [[__progname = "foo"; __progname_full = "foo bar";]])], + [AC_DEFINE(HAVE___PROGNAME, 1, [Define to 1 if libc has __progname])]) mf_proctitle_type=no AC_CHECK_FUNC(setproctitle, [mf_proctitle_type=MF_PROCTITLE_SETPROCTITLE], [AC_CHECK_HEADERS(libutil.h) AC_CHECK_LIB(util, setproctitle, @@ -41,27 +41,29 @@ AC_DEFUN([MF_PROCTITLE],[ if test "$mf_proctitle_type" = no; then AC_CHECK_HEADER([sys/pstat.h], [AC_CHECK_FUNC([pstat], [mf_proctitle_type=MF_PROCTITLE_PSTAT], [mf_proctitle_type=MF_PROCTITLE_REWRITE_ARGV])]) if test "$mf_proctitle_type" = no; then - AC_TRY_COMPILE([#include <machine/vmparam.h> - #include <sys/exec.h>], - [ + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[#include <machine/vmparam.h> + #include <sys/exec.h>]], + [[ #include <sys/types.h> #include <sys/proc.h> #include <vm/pmap.h> #include <machine/pmap.h> #include <machine/vmparam.h> #include <sys/exec.h> +int main() { int i = PS_STRINGS; } -], +]])], [mf_proctitle_type=MF_PROCTITLE_PSSTRINGS]) if test "$mf_proctitle_type" = no; then AC_EGREP_CPP(yes,[ #if defined(__GNU_HURD__) yes |