|
a/src/configure.ac |
|
b/src/configure.ac |
|
... |
|
... |
| 224 |
fi
|
224 |
fi
|
| 225 |
cd ..
|
225 |
cd ..
|
| 226 |
|
226 |
|
| 227 |
##################### End QT detection
|
227 |
##################### End QT detection
|
| 228 |
|
228 |
|
|
|
229 |
### X11: this is needed for the session monitoring code (in recollindex -m)
|
|
|
230 |
AC_PATH_XTRA
|
|
|
231 |
#echo X_CFLAGS "'$X_CFLAGS'" X_PRE_LIBS "'$X_PRE_LIBS'" X_LIBS "'$X_LIBS'" X_EXTRA_LIBS "'$X_EXTRA_LIBS'"
|
|
|
232 |
|
| 229 |
# We have to expand prefix in here, couldn't find a way to do it inside
|
233 |
# We have to expand prefix in here, couldn't find a way to do it inside
|
| 230 |
# the qt gui .pro file or Makefile. This just means that you can't change
|
234 |
# the qt gui .pro file or Makefile. This just means that you can't change
|
| 231 |
# prefix at build time. It works at install time because we dont' use the
|
235 |
# prefix at build time. It works at install time because we dont' use the
|
| 232 |
# qtgui Makefile
|
236 |
# qtgui Makefile
|
| 233 |
m_prefix=$prefix
|
237 |
m_prefix=$prefix
|
| 234 |
test "X$m_prefix" = "XNONE" && m_prefix=/usr/local
|
238 |
test "X$m_prefix" = "XNONE" && m_prefix=/usr/local
|
| 235 |
m_datadir=${m_prefix}/share
|
239 |
m_datadir=${m_prefix}/share
|
| 236 |
QTRECOLL_DATADIR=${m_datadir}/recoll
|
240 |
QTRECOLL_DATADIR=${m_datadir}/recoll
|
| 237 |
|
241 |
|
|
|
242 |
AC_SUBST(X_CFLAGS)
|
|
|
243 |
AC_SUBST(X_PRE_LIBS)
|
|
|
244 |
AC_SUBST(X_LIBS)
|
|
|
245 |
AC_SUBST(X_EXTRA_LIBS)
|
| 238 |
AC_SUBST(INCICONV)
|
246 |
AC_SUBST(INCICONV)
|
| 239 |
AC_SUBST(LIBICONV)
|
247 |
AC_SUBST(LIBICONV)
|
| 240 |
AC_SUBST(LIBXAPIAN)
|
248 |
AC_SUBST(LIBXAPIAN)
|
| 241 |
AC_SUBST(LIBFAM)
|
249 |
AC_SUBST(LIBFAM)
|
| 242 |
AC_SUBST(QMAKE)
|
250 |
AC_SUBST(QMAKE)
|