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

[libsvgtiny-pixbuf.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index c1ddb307e6e45f249019f46a88d527f6d68d47bc..2814fc5a3f59e6f217106ab2c1336e2524c4ed89 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,14 +1,47 @@
-AC_INIT([libsvgtiny-pixbuf],[0.0.1])
+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])
 
 AC_PROG_CC
+AM_PROG_AR
 
-PKG_CHECK_MODULES([LIBSVGTINY], [libsvgtiny])
 PKG_CHECK_MODULES([CAIRO], [cairo])
+PKG_CHECK_MODULES([GDKPIXBUF], [gdk-pixbuf-2.0])
+PKG_CHECK_MODULES([LIBSVGTINY], [libsvgtiny])
+PKG_CHECK_MODULES([LIBXML2], [libxml-2.0])
+
+AC_MSG_CHECKING([for gdk-pixbuf module location])
+# 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])
+
+AC_MSG_CHECKING([for gdk-pixbuf-thumbnailer location])
+gdk_pixbuf_bindir=$($PKG_CONFIG --variable bindir gdk-pixbuf-2.0)
+gdk_pixbuf_thumbnailer="${gdk_pixbuf_bindir}/gdk-pixbuf-thumbnailer"
+
+AS_IF([test -x "${gdk_pixbuf_thumbnailer}"], [
+  AC_MSG_RESULT([$gdk_pixbuf_thumbnailer])
+  AC_SUBST([gdk_pixbuf_thumbnailer])
+],[
+  AC_MSG_RESULT([no])
+])
+
 
 AC_CONFIG_FILES([
   Makefile
+  libsvgtiny.thumbnailer
 ])
 
+LT_INIT([disable-static])
 AC_OUTPUT