diff options
| author | Philip Withnall <philip@tecnocode.co.uk> | 2021-01-26 13:16:42 +0000 |
|---|---|---|
| committer | Philip Withnall <philip@tecnocode.co.uk> | 2021-01-26 13:16:42 +0000 |
| commit | 4dc7603b3e8d7358a243fac486c5eaf9a3327e9e (patch) | |
| tree | 24d97015dbdca5fafcbf00c7bab073522de1d7a6 | |
| parent | 9e5b9a8f709cfb8fcacee4527a733b5219967c51 (diff) | |
| parent | 6f26637e83727b05f865389937bb07c761c13c12 (diff) | |
| download | glib-4dc7603b3e8d7358a243fac486c5eaf9a3327e9e.tar.gz | |
Merge branch 'autoconf-obsolete-macros' into 'master'
m4macros: replace obsolete macros AC_TRY_RUN and AC_TRY_LINK in glib-2.0.m4
See merge request GNOME/glib!1899
| -rw-r--r-- | m4macros/glib-2.0.m4 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/m4macros/glib-2.0.m4 b/m4macros/glib-2.0.m4 index d36a0cea4..5c73f3bcb 100644 --- a/m4macros/glib-2.0.m4 +++ b/m4macros/glib-2.0.m4 @@ -94,7 +94,7 @@ dnl Now check if the installed GLib is sufficiently new. (Also sanity dnl checks the results of pkg-config to some extent) dnl rm -f conf.glibtest - AC_TRY_RUN([ + AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include <glib.h> #include <stdio.h> #include <stdlib.h> @@ -162,7 +162,7 @@ main (void) } return 1; } -],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) +]])],[],[no_glib=yes],[echo $ac_n "cross compiling; assumed OK... $ac_c"]) CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS" fi @@ -184,10 +184,10 @@ main (void) ac_save_LIBS="$LIBS" CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS" - AC_TRY_LINK([ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include <glib.h> #include <stdio.h> -], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], +]], [[ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ]])], [ echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GLib or finding the wrong" echo "*** version of GLib. If it is not finding GLib, you'll need to set your" |