diff options
author | Dan Winship <danw@redhat.com> | 2014-11-25 17:27:53 -0500 |
---|---|---|
committer | Dan Winship <danw@redhat.com> | 2015-03-24 10:52:52 -0400 |
commit | d4493e7dba0cc60d0bb126c6053fe7650dd89ac0 (patch) | |
tree | 6cfa4ea1634206751938b68d8a006737ad7df9f2 /configure.ac | |
parent | 181819090f7a4ac747df4b38da3a23b8a5e2a35c (diff) |
build: remove some unnecessary stuff
PKG_CHECK_MODULES() automatically AC_SUBST()s the variables it
creates, so we don't need to do it ourselves.
Drop unnecessary explicit checks for gthread and dbus-glib.
Remove unused INCLUDES= lines from Makefiles.
Remove stray GConf references.
Remove "#define NM_VPN_API_SUBJECT_TO_CHANGE", since that define has
had no effect since before NM 0.7.
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index fb146d9..972b7b3 100644 --- a/configure.ac +++ b/configure.ac @@ -52,24 +52,12 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package]) IT_PROG_INTLTOOL([0.35]) AM_GLIB_GNU_GETTEXT -PKG_CHECK_MODULES(GTHREAD, gthread-2.0) -AC_SUBST(GTHREAD_CFLAGS) -AC_SUBST(GTHREAD_LIBS) - -PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= 0.74) -AC_SUBST(DBUS_CFLAGS) -AC_SUBST(DBUS_LIBS) - if test x"$with_gnome" != xno; then gtk3_req=2.91.4 PKG_CHECK_MODULES(GTK, gtk+-3.0 > $gtk3_req, , [PKG_CHECK_MODULES(GTK, gtk+-2.0 > $gtk2_req)]) - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) PKG_CHECK_MODULES(LIBSECRET, libsecret-1) - AC_SUBST(LIBSECRET_CFLAGS) - AC_SUBST(LIBSECRET_LIBS) fi PKG_CHECK_MODULES(NM, @@ -77,12 +65,8 @@ PKG_CHECK_MODULES(NM, libnm-util >= 0.9.2 libnm-glib >= 0.9.2 libnm-glib-vpn >= 0.9.2) -AC_SUBST(NM_CFLAGS) -AC_SUBST(NM_LIBS) PKG_CHECK_MODULES(NMGTK, libnm-gtk >= 0.9.9.0) -AC_SUBST(NMGTK_CFLAGS) -AC_SUBST(NMGTK_LIBS) NM_COMPILER_WARNINGS |