Image patch

[xournal.git] / configure.in

diff --git a/configure.in b/configure.in
index a83f7d3c8316cd5afbc2806514e650b478436b95..99d500bb64b838b1453fb8ec8e6686a1e82260af 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,20 +1,35 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(xournal, 0.4.2.9)
+AM_INIT_AUTOMAKE(xournal, 0.4.6+image)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 
 AC_ISC_POSIX
 AC_PROG_CC
 AM_PROG_CC_STDC
+AC_PROG_RANLIB
 AC_HEADER_STDC
 
-pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0 libgnomeprintui-2.2 >= 2.0.0 poppler-glib >= 0.6.1"
+LDFLAGS="$LDFLAGS -lz -lm"
+
+pkg_modules="gtk+-2.0 >= 2.10.0 libgnomecanvas-2.0 >= 2.4.0 poppler-glib >= 0.5.4 pangoft2 >= 1.0 x11"
 PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
 AC_SUBST(PACKAGE_CFLAGS)
 AC_SUBST(PACKAGE_LIBS)
 
+dnl detect Windows environment...
+AC_CANONICAL_HOST
+AC_MSG_CHECKING([for Windows environment])
+case "$host" in
+ *-*-mingw*)
+   os_win32=yes;;
+ *)
+   os_win32=no;;
+esac
+AC_MSG_RESULT([$os_win32])
+AM_CONDITIONAL(WIN32, test "$os_win32" = "yes")
+
 GETTEXT_PACKAGE=xournal
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
@@ -26,6 +41,7 @@ AM_GLIB_GNU_GETTEXT
 AC_OUTPUT([
 Makefile
 src/Makefile
+src/ttsubset/Makefile
 po/Makefile.in
 ])