|
a/src/configure.ac |
|
b/src/configure.ac |
|
... |
|
... |
87 |
#
|
87 |
#
|
88 |
# QMAKESPEC: on most Linux system, there is a 'default' link inside the
|
88 |
# QMAKESPEC: on most Linux system, there is a 'default' link inside the
|
89 |
# mkspecs directory, so that QMAKESPEC is not needed.
|
89 |
# mkspecs directory, so that QMAKESPEC is not needed.
|
90 |
# If QMAKESPEC is not set and needed, the qmake test at the previous test
|
90 |
# If QMAKESPEC is not set and needed, the qmake test at the previous test
|
91 |
# will have failed, and we tell the user to check his environment.
|
91 |
# will have failed, and we tell the user to check his environment.
|
|
|
92 |
#
|
|
|
93 |
# Note about qt4: if --enable-qt4 (enables the qt4gui directory), and the
|
|
|
94 |
# QTDIR variable are inconsistent, too bad.
|
|
|
95 |
#
|
|
|
96 |
AC_ARG_ENABLE(qt4,
|
|
|
97 |
AC_HELP_STRING([--enable-qt4],
|
|
|
98 |
[Use qt version 4]),
|
|
|
99 |
rcl_cv_qt4=$enableval, rcl_cv_qt4=no)
|
|
|
100 |
AC_MSG_NOTICE(rcl_cv_qt4 $rcl_cv_qt4)
|
|
|
101 |
if test X$rcl_cv_qt4 = Xyes ; then
|
|
|
102 |
QTGUI=qt4gui
|
|
|
103 |
else
|
|
|
104 |
QTGUI=qtgui
|
|
|
105 |
fi
|
92 |
|
106 |
|
93 |
if test X$QTDIR != X ; then
|
107 |
if test X$QTDIR != X ; then
|
94 |
PATH=$QTDIR/bin:$PATH
|
108 |
PATH=$QTDIR/bin:$PATH
|
95 |
export PATH
|
109 |
export PATH
|
96 |
fi
|
110 |
fi
|
|
... |
|
... |
99 |
if test X$QMAKE = XNOTFOUND ; then
|
113 |
if test X$QMAKE = XNOTFOUND ; then
|
100 |
AC_MSG_ERROR([Cannot find the qmake program. Maybe you need to install
|
114 |
AC_MSG_ERROR([Cannot find the qmake program. Maybe you need to install
|
101 |
it and/or set the QTDIR environment variable?])
|
115 |
it and/or set the QTDIR environment variable?])
|
102 |
fi
|
116 |
fi
|
103 |
|
117 |
|
104 |
cd qtgui
|
118 |
cd $QTGUI
|
105 |
# We just want a .pro file: no problem with unsubstituted variables
|
119 |
# We just want a .pro file: no problem with unsubstituted variables
|
106 |
cp recoll.pro.in recoll.pro
|
120 |
cp recoll.pro.in recoll.pro
|
107 |
${QMAKE} recoll.pro
|
121 |
${QMAKE} recoll.pro
|
108 |
if test $? != 0 ; then
|
122 |
if test $? != 0 ; then
|
109 |
AC_MSG_ERROR([Cannot use qmake to generate a Makefile. Maybe you need to
|
123 |
AC_MSG_ERROR([Cannot use qmake to generate a Makefile. Maybe you need to
|
|
... |
|
... |
134 |
AC_SUBST(XAPIANCXXFLAGS)
|
148 |
AC_SUBST(XAPIANCXXFLAGS)
|
135 |
AC_SUBST(LIBICONV)
|
149 |
AC_SUBST(LIBICONV)
|
136 |
AC_SUBST(INCICONV)
|
150 |
AC_SUBST(INCICONV)
|
137 |
AC_SUBST(QTRECOLL_DATADIR)
|
151 |
AC_SUBST(QTRECOLL_DATADIR)
|
138 |
AC_SUBST(QMAKE)
|
152 |
AC_SUBST(QMAKE)
|
|
|
153 |
AC_SUBST(QTGUI)
|
139 |
|
154 |
|
140 |
AC_CONFIG_FILES(mk/localdefs)
|
155 |
AC_CONFIG_FILES(mk/localdefs)
|
141 |
AC_CONFIG_FILES(recollinstall)
|
156 |
AC_CONFIG_FILES(recollinstall)
|
142 |
AC_CONFIG_FILES(Makefile)
|
157 |
AC_CONFIG_FILES(Makefile)
|
143 |
AC_CONFIG_FILES(sampleconf/recoll.conf)
|
158 |
AC_CONFIG_FILES(sampleconf/recoll.conf)
|
144 |
AC_CONFIG_FILES(qtgui/recoll.pro)
|
159 |
AC_CONFIG_FILES($QTGUI/recoll.pro)
|
145 |
|
160 |
|
146 |
for d in bincimapmime index lib query
|
161 |
for d in bincimapmime index lib query
|
147 |
do
|
162 |
do
|
148 |
rm -f $d/alldeps.stamp
|
163 |
rm -f $d/alldeps.stamp
|
149 |
cp -f /dev/null $d/alldeps
|
164 |
cp -f /dev/null $d/alldeps
|