GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: Fix for modern Autoconf.

Browse Source 
* m4/glib-2.0.m4: Use AC_RUN_IFELSE and AC_LINK_IFELSE.

--

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2022-07-21 13:47:06 +09:00
parent 5436b309fe
commit 16020c5fd9
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
m4/glib-2.0.m4
View File

@ -87,7 +87,7 @@ dnl Now check if the installed GLIB is sufficiently new. (Also sanity
dnl checks the results of pkg-config to some extent) dnl checks the results of pkg-config to some extent)
dnl dnl
rm -f conf.glibtest rm -f conf.glibtest
AC_TRY_RUN([ AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <glib.h> #include <glib.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -158,7 +158,7 @@ main ()
} }
return 1; 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" CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS" LIBS="$ac_save_LIBS"
fi fi
@ -180,10 +180,9 @@ main ()
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GLIB_CFLAGS" CFLAGS="$CFLAGS $GLIB_CFLAGS"
LIBS="$LIBS $GLIB_LIBS" LIBS="$LIBS $GLIB_LIBS"
AC_TRY_LINK([ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <glib.h>
#include <glib.h>
#include <stdio.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 "*** 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 "*** 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" echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"