|
a/src/configure.ac |
|
b/src/configure.ac |
|
... |
|
... |
| 531 |
test "X$m_prefix" = "XNONE" && m_prefix=/usr/local
|
531 |
test "X$m_prefix" = "XNONE" && m_prefix=/usr/local
|
| 532 |
m_datadir=${m_prefix}/share
|
532 |
m_datadir=${m_prefix}/share
|
| 533 |
QTRECOLL_DATADIR=${m_datadir}/recoll
|
533 |
QTRECOLL_DATADIR=${m_datadir}/recoll
|
| 534 |
|
534 |
|
| 535 |
RCLVERSION=`cat VERSION`
|
535 |
RCLVERSION=`cat VERSION`
|
|
|
536 |
RCLLIBVERSION=$RCLVERSION
|
| 536 |
|
537 |
|
| 537 |
AC_SUBST(X_CFLAGS)
|
538 |
AC_SUBST(X_CFLAGS)
|
| 538 |
AC_SUBST(X_PRE_LIBS)
|
539 |
AC_SUBST(X_PRE_LIBS)
|
| 539 |
AC_SUBST(X_LIBS)
|
540 |
AC_SUBST(X_LIBS)
|
| 540 |
AC_SUBST(X_LIBX11)
|
541 |
AC_SUBST(X_LIBX11)
|
|
... |
|
... |
| 559 |
AC_SUBST(LIBQZEITGEIST)
|
560 |
AC_SUBST(LIBQZEITGEIST)
|
| 560 |
AC_SUBST(NOPIC)
|
561 |
AC_SUBST(NOPIC)
|
| 561 |
AC_SUBST(NOTHREADS)
|
562 |
AC_SUBST(NOTHREADS)
|
| 562 |
AC_SUBST(NOPYTHON)
|
563 |
AC_SUBST(NOPYTHON)
|
| 563 |
AC_SUBST(RCLVERSION)
|
564 |
AC_SUBST(RCLVERSION)
|
|
|
565 |
AC_SUBST(RCLLIBVERSION)
|
| 564 |
|
566 |
|
| 565 |
# All object files depend on localdefs which has the cc flags. Avoid
|
567 |
# All object files depend on localdefs which has the cc flags. Avoid
|
| 566 |
# changing it unless necessary
|
568 |
# changing it unless necessary
|
| 567 |
AC_CONFIG_FILES(mk/localdefs.new:mk/localdefs.in)
|
569 |
AC_CONFIG_FILES(mk/localdefs.new:mk/localdefs.in)
|
| 568 |
AC_CONFIG_FILES(recollinstall)
|
570 |
AC_CONFIG_FILES(recollinstall)
|
|
... |
|
... |
| 575 |
do
|
577 |
do
|
| 576 |
rm -f $d/alldeps.stamp
|
578 |
rm -f $d/alldeps.stamp
|
| 577 |
cp -f /dev/null $d/alldeps
|
579 |
cp -f /dev/null $d/alldeps
|
| 578 |
done
|
580 |
done
|
| 579 |
|
581 |
|
| 580 |
(cd lib;test -f Makefile && chmod +w Makefile;sh mkMake)
|
582 |
(cd lib;RCLLIBVERSION=$RCLLIBVERSION sh mkMake)
|
| 581 |
|
583 |
|
| 582 |
AC_OUTPUT
|
584 |
AC_OUTPUT
|
| 583 |
|
585 |
|
| 584 |
if cmp -s mk/localdefs mk/localdefs.new ; then
|
586 |
if cmp -s mk/localdefs mk/localdefs.new ; then
|
| 585 |
rm -f mk/localdefs.new
|
587 |
rm -f mk/localdefs.new
|