Merge branch 'master' into knotc-improvements

5fcf3fef · Lubos Slovak · fa03129f · 97d0918a · 5fcf3fef
Commit 5fcf3fef authored 10 years ago by Lubos Slovak
--- a/configure.ac
+++ b/configure.ac
@@ -40,8 +40,7 @@ AC_PROG_LIBTOOL
 LT_INIT

 # Use pkg-config
-PKG_PROG_PKG_CONFIG
-PKG_INSTALLDIR
+m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR], [AC_SUBST([pkgconfigdir], ['${libdir}/pkgconfig'])])
 AC_CONFIG_FILES([libknot.pc])

 AC_CACHE_CHECK([for reentrant lex], [ac_cv_path_LEX],