X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.in;h=52a07df250b78d81287cc5de6a63b1243a34148d;hb=69037d6ddbe7e90d13d8a7a088d8c209a926190e;hp=e0b42abccd32eaaf2e39533bdaadb5a4c7ba1b8d;hpb=2e5ff0bff41fa53d4941b6f0fe49c8914bf29cbc;p=xournal.git

diff --git a/configure.in b/configure.in
index e0b42ab..52a07df 100644
--- a/configure.in
+++ b/configure.in
@@ -1,31 +1,47 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(xournal, 0.4)
+AM_INIT_AUTOMAKE(xournal, 0.4.7)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 
 AC_ISC_POSIX
 AC_PROG_CC
 AM_PROG_CC_STDC
+AC_PROG_RANLIB
 AC_HEADER_STDC
 
-dnl set this var to NONE (PC) or other thing (Maemo)
-usehildon='NONE'
-if test "x$usehildon" != xNONE
-then
-  pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0 libgnomeprintui-2.2 >= 2.0.0 hildon-libs libosso"
-else
-  pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0 libgnomeprintui-2.2 >= 2.0.0"
-fi
+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"
 PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
 AC_SUBST(PACKAGE_CFLAGS)
 AC_SUBST(PACKAGE_LIBS)
 
-AM_CONDITIONAL(USE_HILDON, test "x$usehildon" != xNONE)
+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.])
+
+dnl Add the languages which your application supports here.
+ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`"
+AM_GLIB_GNU_GETTEXT
 
 AC_OUTPUT([
 Makefile
 src/Makefile
+src/ttsubset/Makefile
+po/Makefile.in
 ])