X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=configure.ac;h=757095cbaf25dd7b7a962ceb630c2712948c3410;hb=0adfda00abc34763a95a38a97f80cd5820116f93;hp=49dc6eedd5c76d629f8ab4601459a8463f5ca9d9;hpb=a209742661ba55ef435e1b80c0647fa63bedf321;p=vlp.git

diff --git a/configure.ac b/configure.ac
index 49dc6ee..757095c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([Virtual Loglan Processor], [2.6], [bugz@dlugolecki.net.pl], [vlp], [http://dlugolecki.net.pl/software/vlp/])
+AC_INIT([Virtual Loglan Processor], [3.4-b1], [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])
@@ -7,25 +7,24 @@ AC_PROG_CXX
 AM_PROG_CC_C_O
 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])
-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],
   [AS_HELP_STRING([--with-moc-compiler-name=NAME],
     [filename of MOC compiler, defaults to: moc])],
   [MOCNAME="$withval"],
-  [MOCNAME='moc'])
+  [MOCNAME='moc-qt4'])
 AC_SUBST([MOCNAME])
 
 AC_ARG_WITH([moc-compiler-dir],
@@ -35,5 +34,19 @@ 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])
+fi
+
+AM_CONDITIONAL([HAVE_DOXYGEN], [test -n "$DOXYGEN"])
+AM_COND_IF([HAVE_DOXYGEN], [AC_CONFIG_FILES([Doxyfile])])
 
 AC_OUTPUT