From c8d04472ba17dc145cd44e82b63eecf7a903038e Mon Sep 17 00:00:00 2001 From: David King Date: Tue, 31 May 2016 10:51:21 +0200 Subject: [PATCH] configure: Remove some redundant AC_SUBST usage PKG_CHECK_MODULES has called these automatically since well before pkg-config 0.24. --- configure.ac | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/configure.ac b/configure.ac index 45ec59c3..59881dba 100644 --- a/configure.ac +++ b/configure.ac @@ -112,11 +112,7 @@ AC_SUBST([GDBUS_CODEGEN], [`$PKG_CONFIG --variable gdbus_codegen gio-2.0`]) POLKIT_GOBJECT_REQUIRED=0.98 PKG_CHECK_MODULES(BASE, [glib-2.0 gio-2.0 gio-unix-2.0]) -AC_SUBST(BASE_CFLAGS) -AC_SUBST(BASE_LIBS) PKG_CHECK_MODULES(SOUP, [libsoup-2.4]) -AC_SUBST(SOUP_CFLAGS) -AC_SUBST(SOUP_LIBS) PKG_CHECK_MODULES(POLKIT, \ polkit-gobject-1 >= $POLKIT_GOBJECT_REQUIRED) @@ -128,8 +124,6 @@ AC_ARG_ENABLE([xauth], [enable_xauth=yes]) if test "x$enable_xauth" = "xyes"; then PKG_CHECK_MODULES(XAUTH, [xau]) - AC_SUBST(XAUTH_CFLAGS) - AC_SUBST(XAUTH_LIBS) AC_DEFINE([ENABLE_XAUTH], [1], [Define if using xauth]) fi @@ -145,8 +139,6 @@ if test "x$enable_sandboxed_triggers" = "xno"; then fi PKG_CHECK_MODULES(OSTREE, [libgsystem >= 2015.1 ostree-1 >= 2016.5]) -AC_SUBST(OSTREE_CFLAGS) -AC_SUBST(OSTREE_LIBS) save_LIBS=$LIBS save_CFLAGS=$CFLAGS LIBS=$OSTREE_LIBS @@ -162,12 +154,8 @@ CFLAGS=$save_CFLAGS PKG_CHECK_MODULES(FUSE, [fuse]) -AC_SUBST(FUSE_CFLAGS) -AC_SUBST(FUSE_LIBS) PKG_CHECK_MODULES(JSON, [json-glib-1.0]) -AC_SUBST(JSON_CFLAGS) -AC_SUBST(JSON_LIBS) AC_ARG_ENABLE([seccomp], AC_HELP_STRING([--disable-seccomp], @@ -177,8 +165,6 @@ AC_ARG_ENABLE([seccomp], if test "x$enable_seccomp" = "xyes"; then PKG_CHECK_MODULES(LIBSECCOMP, [libseccomp]) - AC_SUBST(LIBSECCOMP_CFLAGS) - AC_SUBST(LIBSECCOMP_LIBS) AC_DEFINE([ENABLE_SECCOMP], [1], [Define if using seccomp]) fi