Attachment #217947 for bug #171271




2010-01-30 20:14  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-01-30 18:47  Israel G. Lugo  <israel.lugo@lugosys.com>

	* configure.ac: Add missing description to the definition of
	USE_SYSTEM_FILE_COMMAND. Old syntax was obsolete and causing problems
	with autoconf 2.63.

2010-01-29 21:05  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





# 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, 1, [Enable using the system's 'file' command to id mime if we fail internally])
fi



# 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 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 37-43 Link Here

(-)recoll-1.13.02/configure.ac (-9 / +12 lines)
37		37
38	# Can't use Solaris standard 'file' command, it doesn't support -i	38	# Can't use Solaris standard 'file' command, it doesn't support -i
39	if test X$sys != XSunOS -o X$fileProg != X/usr/bin/file; then	39	if test X$sys != XSunOS -o X$fileProg != X/usr/bin/file; then
40	AC_DEFINE(USE_SYSTEM_FILE_COMMAND)	40	AC_DEFINE(USE_SYSTEM_FILE_COMMAND, 1, [Enable using the system's 'file' command to id mime if we fail internally])
41	fi	41	fi
42		42
43		43
Lines 277-289 Link Here
277	# If QMAKESPEC is not set and needed, the qmake test at the previous test	277	# If QMAKESPEC is not set and needed, the qmake test at the previous test
278	# will have failed, and we tell the user to check his environment.	278	# will have failed, and we tell the user to check his environment.
279	#	279	#
280	AC_ARG_WITH(gui,	280	AC_ARG_ENABLE(qtgui,
281	AC_HELP_STRING([--without-gui],	281	AC_HELP_STRING([--disable-qtgui],
282	[Disable the QT user interface and auxiliary x11 uses.]),	282	[Disable the QT-based graphical user interface.]),
283	withQT=$withval, withQT="yes")	283	enableQT=$enableval, enableQT="yes")
284		284
285	if test "$withQT" != "yes" ; then	285	if test "$enableQT" != "yes" ; then
286	AC_DEFINE(WITHOUT_X11)
287	NOQTMAKE="#"	286	NOQTMAKE="#"
288	NOCMDLINE=""	287	NOCMDLINE=""
289	else	288	else
Lines 361-371 Link Here
361		360
362		361
363	### X11: this is needed for the session monitoring code (in recollindex -m)	362	### X11: this is needed for the session monitoring code (in recollindex -m)
364	# We disable it if without-gui has been specified, but it could be separated	363	AC_ARG_ENABLE(x11mon,
365	if test "$withQT" = "yes" ; then	364	AC_HELP_STRING([--disable-x11mon],
		365	[Disable recollindex support for X11 session monitoring.]),
		366	enableX11mon=$enableval, enableX11mon="yes")
		367	if test "$enableX11mon" = "yes" ; then
366	AC_PATH_XTRA	368	AC_PATH_XTRA
367	X_LIBX11=-lX11	369	X_LIBX11=-lX11
368	else	370	else
		371	AC_DEFINE(WITHOUT_X11, 1, [No X11 session monitoring support])
369	X_LIBX11=""	372	X_LIBX11=""
370	fi	373	fi
371	#echo X_CFLAGS "'$X_CFLAGS'" X_PRE_LIBS "'$X_PRE_LIBS'" X_LIBS \	374	#echo X_CFLAGS "'$X_CFLAGS'" X_PRE_LIBS "'$X_PRE_LIBS'" X_LIBS \

Lines 1-3 Link Here

(-)recoll-1.13.02/ChangeLog (+17 lines)
		1	2010-01-30 20:14 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-01-30 18:47 Israel G. Lugo <israel.lugo@lugosys.com>
		7
		8	* configure.ac: Add missing description to the definition of
		9	USE_SYSTEM_FILE_COMMAND. Old syntax was obsolete and causing problems
		10	with autoconf 2.63.
		11
		12	2010-01-29 21:05 Israel G. Lugo <israel.lugo@lugosys.com>
		13
		14	* configure.ac: Rename without-gui to disable-qtgui and make it
		15	affect only the creation of the GUI. New option disable-x11mon to
		16	provide separate control over X11 session monitoring.
		17
1	2009-12-07 17:43 dockes	18	2009-12-07 17:43 dockes
2		19
3	* qtgui/preview_w.cpp, qtgui/preview_w.h: reimplemented	20	* qtgui/preview_w.cpp, qtgui/preview_w.h: reimplemented

Lines 60-66 Link Here

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