Attachment #228267 for bug #171271




2010-04-18 13:41  Israel G. Lugo  <israel.lugo@lugosys.com>

	* * recollinstall.in: Install recollq and its manpage when in cmdline
	mode. Don't install the recoll.1 manpage when in cmdline mode.

2010-04-18 13:34  Israel G. Lugo  <israel.lugo@lugosys.com>

	* 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




# 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_ENABLE(qtgui, 
    AC_HELP_STRING([--disable-qtgui],
   [Disable the QT-based graphical user interface.]),
        enableQT=$enableval, enableQT="yes")

if test "$enableQT" != "yes" ; then
   AC_DEFINE(WITHOUT_X11)
   NOQTMAKE="#"
   NOCMDLINE=""
else



### X11: this is needed for the session monitoring code (in recollindex -m)
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 \




    ${bindir} \
    ${mandir}/man1 \
    ${mandir}/man5 \
    ${datadir}/applications \
    ${datadir}/icons \
    ${datadir}/recoll/doc \
    ${datadir}/recoll/examples \

    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
@NOQTMAKE@${INSTALL} -m 0444 desktop/recoll-searchgui.desktop ${datadir}/applications
${INSTALL} -m 0444 desktop/recoll.png ${datadir}/icons/hicolor/48x48/apps
${INSTALL} -m 0444 desktop/recoll.png ${datadir}/pixmaps/

${INSTALL} -m 0444 doc/user/usermanual.html doc/user/docbook.css \
			${datadir}/recoll/doc 
@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


Return to bug 171271

Lines 278-290 Link Here

(-)recoll-1.13.04/configure.ac (-8 / +11 lines)
278	# If QMAKESPEC is not set and needed, the qmake test at the previous test	278	# If QMAKESPEC is not set and needed, the qmake test at the previous test
279	# will have failed, and we tell the user to check his environment.	279	# will have failed, and we tell the user to check his environment.
280	#	280	#
281	AC_ARG_WITH(gui,	281	AC_ARG_ENABLE(qtgui,
282	AC_HELP_STRING([--without-gui],	282	AC_HELP_STRING([--disable-qtgui],
283	[Disable the QT user interface and auxiliary x11 uses.]),	283	[Disable the QT-based graphical user interface.]),
284	withQT=$withval, withQT="yes")	284	enableQT=$enableval, enableQT="yes")
285		285
286	if test "$withQT" != "yes" ; then	286	if test "$enableQT" != "yes" ; then
287	AC_DEFINE(WITHOUT_X11)
288	NOQTMAKE="#"	287	NOQTMAKE="#"
289	NOCMDLINE=""	288	NOCMDLINE=""
290	else	289	else
Lines 362-372 Link Here
362		361
363		362
364	### X11: this is needed for the session monitoring code (in recollindex -m)	363	### X11: this is needed for the session monitoring code (in recollindex -m)
365	# We disable it if without-gui has been specified, but it could be separated	364	AC_ARG_ENABLE(x11mon,
366	if test "$withQT" = "yes" ; then	365	AC_HELP_STRING([--disable-x11mon],
		366	[Disable recollindex support for X11 session monitoring.]),
		367	enableX11mon=$enableval, enableX11mon="yes")
		368	if test "$enableX11mon" = "yes" ; then
367	AC_PATH_XTRA	369	AC_PATH_XTRA
368	X_LIBX11=-lX11	370	X_LIBX11=-lX11
369	else	371	else
		372	AC_DEFINE(WITHOUT_X11, 1, [No X11 session monitoring support])
370	X_LIBX11=""	373	X_LIBX11=""
371	fi	374	fi
372	#echo X_CFLAGS "'$X_CFLAGS'" X_PRE_LIBS "'$X_PRE_LIBS'" X_LIBS \	375	#echo X_CFLAGS "'$X_CFLAGS'" X_PRE_LIBS "'$X_PRE_LIBS'" X_LIBS \

Lines 60-66 Link Here

(-)recoll-1.13.04/recollinstall.in (-3 / +11 lines)
60	${bindir} \	60	${bindir} \
61	${mandir}/man1 \	61	${mandir}/man1 \
62	${mandir}/man5 \	62	${mandir}/man5 \
63	${datadir}/applications \
64	${datadir}/icons \	63	${datadir}/icons \
65	${datadir}/recoll/doc \	64	${datadir}/recoll/doc \
66	${datadir}/recoll/examples \	65	${datadir}/recoll/examples \
Lines 73-95 Link Here
73	test -d $d \|\| mkdir -p $d \|\| exit 1	72	test -d $d \|\| mkdir -p $d \|\| exit 1
74	done	73	done
75		74
		75	@NOQTMAKE@test -d ${datadir}/applications \
		76	@NOQTMAKE@ \|\| mkdir -p ${datadir}/applications \|\| exit 1
		77
		78
76	# Use the xdg utilies to install the desktop file and icon? Couldn't find	79	# Use the xdg utilies to install the desktop file and icon? Couldn't find
77	# out how to get this to work sanely. So keep the old way	80	# out how to get this to work sanely. So keep the old way
78	#PATH=$PATH:desktop/xdg-utils-1.0.1/scripts	81	#PATH=$PATH:desktop/xdg-utils-1.0.1/scripts
79	#export PATH	82	#export PATH
80	#xdg-desktop-menu install desktop/recoll-searchgui.desktop	83	#xdg-desktop-menu install desktop/recoll-searchgui.desktop
81	#xdg-icon-resource install --size 48 desktop/recoll.png	84	#xdg-icon-resource install --size 48 desktop/recoll.png
82	${INSTALL} -m 0444 desktop/recoll-searchgui.desktop ${datadir}/applications	85	@NOQTMAKE@${INSTALL} -m 0444 desktop/recoll-searchgui.desktop ${datadir}/applications
83	${INSTALL} -m 0444 desktop/recoll.png ${datadir}/icons/hicolor/48x48/apps	86	${INSTALL} -m 0444 desktop/recoll.png ${datadir}/icons/hicolor/48x48/apps
84	${INSTALL} -m 0444 desktop/recoll.png ${datadir}/pixmaps/	87	${INSTALL} -m 0444 desktop/recoll.png ${datadir}/pixmaps/
85		88
86	${INSTALL} -m 0444 doc/user/usermanual.html doc/user/docbook.css \	89	${INSTALL} -m 0444 doc/user/usermanual.html doc/user/docbook.css \
87	${datadir}/recoll/doc	90	${datadir}/recoll/doc
88	${INSTALL} -m 0444 doc/man/recoll.1 doc/man/recollindex.1 ${mandir}/man1/	91	@NOQTMAKE@${INSTALL} -m 0444 doc/man/recoll.1 ${mandir}/man1/
		92	@NOCMDLINE@${INSTALL} -m 0444 doc/man/recollq.1 ${mandir}/man1/
		93	${INSTALL} -m 0444 doc/man/recollindex.1 ${mandir}/man1/
89	${INSTALL} -m 0444 doc/man/recoll.conf.5 ${mandir}/man5/	94	${INSTALL} -m 0444 doc/man/recoll.conf.5 ${mandir}/man5/
90		95
91	@NOQTMAKE@${INSTALL} -m 0755 ${RECOLLPROG} ${bindir} \|\| exit 1	96	@NOQTMAKE@${INSTALL} -m 0755 ${RECOLLPROG} ${bindir} \|\| exit 1
92	@NOQTMAKE@${STRIP} ${bindir}/recoll	97	@NOQTMAKE@${STRIP} ${bindir}/recoll
		98	@NOCMDLINE@${INSTALL} -m 0755 query/recollq ${bindir} \|\| exit 1
		99	@NOCMDLINE@${STRIP} ${bindir}/recollq
		100
93	${INSTALL} -m 0755 index/recollindex ${bindir} \|\| exit 1	101	${INSTALL} -m 0755 index/recollindex ${bindir} \|\| exit 1
94	${STRIP} ${bindir}/recollindex	102	${STRIP} ${bindir}/recollindex
95		103

Lines 1-3 Link Here

(-)recoll-1.13.04/ChangeLog (+11 lines)
		1	2010-04-18 13:41 Israel G. Lugo <israel.lugo@lugosys.com>
		2
		3	* * recollinstall.in: Install recollq and its manpage when in cmdline
		4	mode. Don't install the recoll.1 manpage when in cmdline mode.
		5
		6	2010-04-18 13:34 Israel G. Lugo <israel.lugo@lugosys.com>
		7
		8	* configure.ac: Rename without-gui to disable-qtgui and make it
		9	affect only the creation of the GUI. New option disable-x11mon to
		10	provide separate control over X11 session monitoring.
		11
1	2009-12-07 17:43 dockes	12	2009-12-07 17:43 dockes
2		13
3	* qtgui/preview_w.cpp, qtgui/preview_w.h: reimplemented	14	* qtgui/preview_w.cpp, qtgui/preview_w.h: reimplemented