tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename option without-gui to disable-qtgui. New option disable-x11mon.

Browse Source 
Separate control of creation of the gui and X11 session monitoring.
This commit is contained in:
Israel G. Lugo 2010-01-30 08:18:58 +01:00
parent 7985a0b5c5
commit 2a61e2e11a
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/configure.ac
View File

@ -291,13 +291,12 @@ XAPIANCXXFLAGS=`$XAPIAN_CONFIG --cxxflags`
# If QMAKESPEC is not set and needed, the qmake test at the previous test # 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. # will have failed, and we tell the user to check his environment.
# #
AC_ARG_WITH(gui, AC_ARG_ENABLE(qtgui,
AC_HELP_STRING([--without-gui], AC_HELP_STRING([--disable-qtgui],
[Disable the QT user interface and auxiliary x11 uses.]), [Disable the QT-based graphical user interface.]),
withQT=$withval, withQT="yes") enableQT=$enableval, enableQT="yes")
if test "$withQT" != "yes" ; then if test "$enableQT" != "yes" ; then
AC_DEFINE(WITHOUT_X11)
NOQTMAKE="#" NOQTMAKE="#"
NOCMDLINE="" NOCMDLINE=""
else else
@ -375,11 +374,15 @@ fi
### X11: this is needed for the session monitoring code (in recollindex -m) ### 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 AC_ARG_ENABLE(x11mon,
if test "$withQT" = "yes" ; then AC_HELP_STRING([--disable-x11mon],
[Disable recollindex support for X11 session monitoring.]),
enableX11mon=$enableval, enableX11mon="yes")
if test "$enableX11mon" = "yes" ; then
AC_PATH_XTRA AC_PATH_XTRA
X_LIBX11=-lX11 X_LIBX11=-lX11
else else
AC_DEFINE(WITHOUT_X11, 1, [No X11 session monitoring support])
X_LIBX11="" X_LIBX11=""
fi fi
#echo X_CFLAGS "'$X_CFLAGS'" X_PRE_LIBS "'$X_PRE_LIBS'" X_LIBS \ #echo X_CFLAGS "'$X_CFLAGS'" X_PRE_LIBS "'$X_PRE_LIBS'" X_LIBS \