[patch] new configure options, fix installation of cmdline tool, fix build errors

recoll-1.13.02-gentoo1.patch (text/plain), 4.54 KB, created by Israel G. Lugo on 2010-01-30 22:28:32 UTC

diff -dur recoll-1.13.02/ChangeLog recoll-1.13.02-gentoo1/ChangeLog
--- recoll-1.13.02/ChangeLog	2009-12-14 10:27:31.000000000 +0000
+++ recoll-1.13.02-gentoo1/ChangeLog	2010-01-30 20:14:00.000000000 +0000
@@ -1,3 +1,20 @@
[phone]:14  Israel G. Lugo  <[e-mail]>
+
+	* recollinstall.in: Install recollq and its manpage when in cmdline
+	mode. Don't install the recoll.1 manpage when in cmdline mode.
+
[phone]:47  Israel G. Lugo  <[e-mail]>
+
+	* configure.ac: Add missing description to the definition of
+	USE_SYSTEM_FILE_COMMAND. Old syntax was obsolete and causing problems
+	with autoconf 2.63.
+
[phone]:05  Israel G. Lugo  <[e-mail]>
+
+	* configure.ac: Rename without-gui to disable-qtgui and make it
+	affect only the creation of the GUI. New option disable-x11mon to
+	provide separate control over X11 session monitoring.
+
 2009-12-07 17:43  dockes
 
 	* qtgui/preview_w.cpp, qtgui/preview_w.h: reimplemented
diff -dur recoll-1.13.02/configure.ac recoll-1.13.02-gentoo1/configure.ac
--- recoll-1.13.02/configure.ac	2009-12-20 14:28:04.000000000 +0000
+++ recoll-1.13.02-gentoo1/configure.ac	2010-01-30 21:02:18.000000000 +0000
@@ -37,7 +37,7 @@
 
 # Can't use Solaris standard 'file' command, it doesn't support -i
 if test X$sys != XSunOS -o X$fileProg != X/usr/bin/file; then
-   AC_DEFINE(USE_SYSTEM_FILE_COMMAND)
+   AC_DEFINE(USE_SYSTEM_FILE_COMMAND, 1, [Enable using the system's 'file' command to id mime if we fail internally])
 fi
 
 
@@ -277,13 +277,12 @@
 # If QMAKESPEC is not set and needed, the qmake test at the previous test
 # will have failed, and we tell the user to check his environment.
 #
-AC_ARG_WITH(gui, 
-    AC_HELP_STRING([--without-gui],
-   [Disable the QT user interface and auxiliary x11 uses.]),
-        withQT=$withval, withQT="yes")
+AC_ARG_ENABLE(qtgui, 
+    AC_HELP_STRING([--disable-qtgui],
+   [Disable the QT-based graphical user interface.]),
+        enableQT=$enableval, enableQT="yes")
 
-if test "$withQT" != "yes" ; then
-   AC_DEFINE(WITHOUT_X11)
+if test "$enableQT" != "yes" ; then
    NOQTMAKE="#"
    NOCMDLINE=""
 else
@@ -361,11 +360,15 @@
 
 
 ### X11: this is needed for the session monitoring code (in recollindex -m)
-# We disable it if without-gui has been specified, but it could be separated
-if test "$withQT" = "yes" ; then
+AC_ARG_ENABLE(x11mon, 
+    AC_HELP_STRING([--disable-x11mon],
+   [Disable recollindex support for X11 session monitoring.]),
+        enableX11mon=$enableval, enableX11mon="yes")
+if test "$enableX11mon" = "yes" ; then
   AC_PATH_XTRA
   X_LIBX11=-lX11
 else
+  AC_DEFINE(WITHOUT_X11, 1, [No X11 session monitoring support])
   X_LIBX11=""
 fi
 #echo X_CFLAGS "'$X_CFLAGS'" X_PRE_LIBS "'$X_PRE_LIBS'" X_LIBS \
diff -dur recoll-1.13.02/recollinstall.in recoll-1.13.02-gentoo1/recollinstall.in
--- recoll-1.13.02/recollinstall.in	2009-12-31 07:53:41.000000000 +0000
+++ recoll-1.13.02-gentoo1/recollinstall.in	2010-01-30 21:07:49.000000000 +0000
@@ -60,7 +60,6 @@
     ${bindir} \
     ${mandir}/man1 \
     ${mandir}/man5 \
-    ${datadir}/applications \
     ${datadir}/icons \
     ${datadir}/recoll/doc \
     ${datadir}/recoll/examples \
@@ -72,22 +71,30 @@
     test -d $d || mkdir -p $d || exit 1
 done
 
+@NOQTMAKE@test -d ${datadir}/applications \
+@NOQTMAKE@  || mkdir -p ${datadir}/applications || exit 1
+
+
 # Use the xdg utilies to install the desktop file and icon? Couldn't find
 # out how to get this to work sanely. So keep the old way
 #PATH=$PATH:desktop/xdg-utils-1.0.1/scripts
 #export PATH
 #xdg-desktop-menu install desktop/recoll-searchgui.desktop
 #xdg-icon-resource install --size 48 desktop/recoll.png
-${INSTALL} -m 0444 desktop/recoll-searchgui.desktop ${datadir}/applications
+@NOQTMAKE@${INSTALL} -m 0444 desktop/recoll-searchgui.desktop ${datadir}/applications
 ${INSTALL} -m 0444 desktop/recoll.png ${datadir}/icons/hicolor/48x48/apps
 
 ${INSTALL} -m 0444 doc/user/usermanual.html doc/user/docbook.css \
 			${datadir}/recoll/doc 
-${INSTALL} -m 0444 doc/man/recoll.1 doc/man/recollindex.1 ${mandir}/man1/
+@NOQTMAKE@${INSTALL} -m 0444 doc/man/recoll.1 ${mandir}/man1/
+@NOCMDLINE@${INSTALL} -m 0444 doc/man/recollq.1 ${mandir}/man1/
+${INSTALL} -m 0444 doc/man/recollindex.1 ${mandir}/man1/
 ${INSTALL} -m 0444 doc/man/recoll.conf.5  ${mandir}/man5/
 
 @NOQTMAKE@${INSTALL} -m 0755 ${RECOLLPROG} ${bindir} || exit 1
 @NOQTMAKE@${STRIP} ${bindir}/recoll 
+@NOCMDLINE@${INSTALL} -m 0755 query/recollq ${bindir} || exit 1
+@NOCMDLINE@${STRIP} ${bindir}/recollq 
 ${INSTALL} -m 0755 index/recollindex ${bindir} || exit 1
 ${STRIP} ${bindir}/recollindex