diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-09-22 09:58:06 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-09-22 09:58:06 +0200 |
| commit | afba9ad9c639557b3c85d5706461fdbac2820b5a (patch) | |
| tree | e98366c67c6e3f2a618229f0f6c0c8c4b5c4708b | |
| parent | 2b5c1b0742cd109c0702b3051d12829b39e5af49 (diff) | |
| download | libayatana-indicator-afba9ad9c639557b3c85d5706461fdbac2820b5a.tar.gz libayatana-indicator-afba9ad9c639557b3c85d5706461fdbac2820b5a.tar.bz2 libayatana-indicator-afba9ad9c639557b3c85d5706461fdbac2820b5a.zip | |
configure.ac: Support pkg-config (<< 0.27).
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index f47d852..f82f9e3 100644 --- a/configure.ac +++ b/configure.ac @@ -26,6 +26,20 @@ AM_PROG_AR LT_PREREQ([2.2]) LT_INIT +# Upstream's pkg.m4 (since 0.27) offers this now, but define our own +# compatible version in case the local version of pkgconfig isn't new enough. +# https://bugs.freedesktop.org/show_bug.cgi?id=48743 +m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR], + [AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], + [install directory for nx-x11.pc pkg-config file])], + [],[with_pkgconfigdir='$(libdir)/pkgconfig']) + AC_SUBST([pkgconfigdir], [${with_pkgconfigdir}])]) + +# Required when PKG_CHECK_MODULES called within an if statement +PKG_PROG_PKG_CONFIG + + AC_PATH_PROG([GLIB_MKENUMS], [glib-mkenums]) AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal]) |