COPYING: add one to state the "or later" bit

[libsvgtiny-pixbuf.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index d2e4f938216612ed32db6f03ffb68afbbab4959b..2814fc5a3f59e6f217106ab2c1336e2524c4ed89 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([libsvgtiny-pixbuf],[0.0.1],[michael@orlitzky.com])
+AC_INIT([libsvgtiny-pixbuf],[0.0.2],[michael@orlitzky.com])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([-Wall foreign no-dist-gzip dist-xz tar-ustar])
 AC_CONFIG_MACRO_DIRS([m4])
@@ -8,11 +8,21 @@ AM_PROG_AR
 
 PKG_CHECK_MODULES([CAIRO], [cairo])
 PKG_CHECK_MODULES([GDKPIXBUF], [gdk-pixbuf-2.0])
-PKG_CHECK_MODULES([GTK4], [gtk4])
 PKG_CHECK_MODULES([LIBSVGTINY], [libsvgtiny])
+PKG_CHECK_MODULES([LIBXML2], [libxml-2.0])
 
 AC_MSG_CHECKING([for gdk-pixbuf module location])
-gdk_pixbuf_moduledir=$($PKG_CONFIG --variable gdk_pixbuf_moduledir gdk-pixbuf-2.0)
+# Hack alert: we need to install our module into this specific
+# location... BUT, we also want to respect --prefix, at least to the
+# extent that we won't try to install something to, say, /usr when
+# we've passed --prefix=/tmp. This little libdir trick prevents
+# pkg-config from substituting for ${libdir} where it appears in the
+# *.pc file. When we go to actually use gdk_pixbuf_moduledir, the
+# variable ${libdir} will be valid in our own build system, and will
+# respect the prefix. This means that if you configure this package
+# with a different prefix than gdk-pixbuf was, it won't install
+# correctly. But hey, make distcheck works?
+gdk_pixbuf_moduledir=$($PKG_CONFIG --define-variable=libdir="\${libdir}" --variable gdk_pixbuf_moduledir gdk-pixbuf-2.0)
 AC_MSG_RESULT([$gdk_pixbuf_moduledir])
 AC_SUBST([gdk_pixbuf_moduledir])