|
a/src/configure |
|
b/src/configure |
|
... |
|
... |
| 2190 |
LIBXAPIAN=`$XAPIAN_CONFIG --libs`
|
2190 |
LIBXAPIAN=`$XAPIAN_CONFIG --libs`
|
| 2191 |
# Workaround for problem in xapian-config in some versions: wrongly lists
|
2191 |
# Workaround for problem in xapian-config in some versions: wrongly lists
|
| 2192 |
# libstdc++.la in the lib list
|
2192 |
# libstdc++.la in the lib list
|
| 2193 |
for i in $LIBXAPIAN ; do
|
2193 |
for i in $LIBXAPIAN ; do
|
| 2194 |
case $i in
|
2194 |
case $i in
|
| 2195 |
*libstdc++.la);;
|
2195 |
*stdc++*|-lm|-lgcc_s);;
|
| 2196 |
*) tmpxaplib="$tmpxaplib $i";;
|
2196 |
*) tmpxaplib="$tmpxaplib $i";;
|
| 2197 |
esac
|
2197 |
esac
|
| 2198 |
done
|
2198 |
done
|
| 2199 |
LIBXAPIAN=$tmpxaplib
|
2199 |
LIBXAPIAN=$tmpxaplib
|
| 2200 |
XAPIANCXXFLAGS=`$XAPIAN_CONFIG --cxxflags`
|
2200 |
XAPIANCXXFLAGS=`$XAPIAN_CONFIG --cxxflags`
|
|
... |
|
... |
| 2294 |
it and/or set the QTDIR environment variable?" >&2;}
|
2294 |
it and/or set the QTDIR environment variable?" >&2;}
|
| 2295 |
{ (exit 1); exit 1; }; }
|
2295 |
{ (exit 1); exit 1; }; }
|
| 2296 |
fi
|
2296 |
fi
|
| 2297 |
|
2297 |
|
| 2298 |
cd $QTGUI
|
2298 |
cd $QTGUI
|
| 2299 |
# We just want a .pro file: no problem with unsubstituted variables for now
|
2299 |
# We just want a .pro file: no problem with unsubstituted variables at
|
|
|
2300 |
# this point.
|
| 2300 |
test -f recoll.pro && chmod +w recoll.pro
|
2301 |
test -f recoll.pro && chmod +w recoll.pro
|
| 2301 |
cp recoll.pro.in recoll.pro
|
2302 |
cp recoll.pro.in recoll.pro
|
| 2302 |
${QMAKE} recoll.pro
|
2303 |
${QMAKE} recoll.pro
|
| 2303 |
if test $? != 0 ; then
|
2304 |
if test $? != 0 ; then
|
| 2304 |
{ { echo "$as_me:$LINENO: error: Cannot use qmake to generate a Makefile. Maybe you need to
|
2305 |
{ { echo "$as_me:$LINENO: error: Cannot use qmake to generate a Makefile. Maybe you need to
|