X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=configure.ac;h=f27d8a134a6e3dcbf5efc3ee9e13b58a203e9cad;hb=202ad71d2beff55ffdb8e62bc3a62a0abb4c4618;hp=6a271715760721e8aebaa0ad0c13d6e4bb34ca3f;hpb=f4fad536c7fa70b8477a81fb521d8088dbe2565d;p=vlp.git

diff --git a/configure.ac b/configure.ac
index 6a27171..f27d8a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([Virtual Loglan Processor], [3.1.1], [bugz@dlugolecki.net.pl], [vlp], [http://dlugolecki.net.pl/software/vlp/])
+AC_INIT([Virtual Loglan Processor], [3.1.2-a2], [bugz@dlugolecki.net.pl], [vlp], [http://dlugolecki.net.pl/software/vlp/])
 AC_PREREQ([2.59])
 AM_INIT_AUTOMAKE([1.10 no-define])
 AC_CONFIG_HEADERS([config.h])
@@ -11,14 +11,14 @@ AC_CONFIG_FILES([Makefile])
 # libqt3-mt:i386
 #  libqt3-mt-dev:i386
 # qt3-dev-tools:i386
-PKG_CHECK_MODULES([bin_loggraph], [qt-mt < 4.0])
-PKG_CHECK_MODULES([bin_lognet], [qt-mt < 4.0 libconfig])
-PKG_CHECK_MODULES([bin_logker], [qt-mt < 4.0 libconfig])
+#PKG_CHECK_MODULES([bin_loggraph], [qt-mt < 4.0])
+#PKG_CHECK_MODULES([bin_lognet], [qt-mt < 4.0 libconfig])
+PKG_CHECK_MODULES([bin_logker], [QtCore >= 4.0 QtGui >= 4.0 libconfig])
 #PKG_CHECK_MODULES([bin_logint], [qt-mt < 4.0])
-PKG_CHECK_MODULES([bin_logedit], [qt-mt < 4.0])
-PKG_CHECK_MODULES([bin_lgconfig], [qt-mt < 4.0 libconfig])
-PKG_CHECK_MODULES([bin_logcomp], [qt-mt < 4.0])
-PKG_CHECK_MODULES([bin_loghelp], [qt-mt < 4.0])
+PKG_CHECK_MODULES([bin_logedit], [QtCore >= 4.0 QtGui >= 4.0 ])
+#PKG_CHECK_MODULES([bin_lgconfig], [qt-mt < 4.0 libconfig])
+#PKG_CHECK_MODULES([bin_logcomp], [qt-mt < 4.0])
+#PKG_CHECK_MODULES([bin_loghelp], [qt-mt < 4.0])
 
 # Get Qt3 library and include locations
 AC_ARG_WITH([moc-compiler-name],
@@ -35,6 +35,13 @@ AC_ARG_WITH([moc-compiler-dir],
   [MOCDIR='/usr/bin'])
 AC_SUBST([MOCDIR])
 
+AC_ARG_WITH([qt-dir],
+  [AS_HELP_STRING([--with-qt-dir=DIR],
+    [location of Qt library, defaults to: /usr])],
+  [QTDIR="$withval"],
+  [QTDIR='/usr'])
+AC_SUBST([QTDIR])
+
 AC_CHECK_PROGS([DOXYGEN], [doxygen])
 if test -z "$DOXYGEN";
    then AC_MSG_WARN([Doxygen not found - continuing without Doxygen support])