X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=configure.ac;h=7e81e3fab966c08848b2a788b1fd38c6cd765005;hb=677848a8a1242eeb330b2a16ff78ce930ff61aeb;hp=d06bf5f6ae9c0cb9d124c4ecaf9a00af1ca99b99;hpb=f2fb74874c0b938cdb73dd50ea470bd4bc6b0c26;p=libsvgtiny-pixbuf.git diff --git a/configure.ac b/configure.ac index d06bf5f..7e81e3f 100644 --- a/configure.ac +++ b/configure.ac @@ -8,16 +8,39 @@ 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]) +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])