56 lines
2.3 KiB
Diff
56 lines
2.3 KiB
Diff
--- a/m4-macros/xapian.m4
|
|
+++ b/m4-macros/xapian.m4
|
|
@@ -52,11 +52,11 @@
|
|
[$2])
|
|
else
|
|
AC_MSG_CHECKING([$XAPIAN_CONFIG works])
|
|
- dnl check for --ltlibs but not --libs as "xapian-config --libs" will
|
|
+ dnl check for --libs but not --libs as "xapian-config --libs" will
|
|
dnl fail if xapian isn't installed...
|
|
|
|
dnl run with exec to avoid leaking output on "real" bourne shells
|
|
- if (exec >&5 2>&5 ; $XAPIAN_CONFIG --ltlibs --cxxflags; exit $?) then
|
|
+ if (exec >&5 2>&5 ; $XAPIAN_CONFIG --libs --cxxflags; exit $?) then
|
|
AC_MSG_RESULT(yes)
|
|
else
|
|
case $? in
|
|
@@ -70,7 +70,7 @@
|
|
AC_MSG_ERROR([\`$XAPIAN_CONFIG' not executable, aborting])
|
|
;;
|
|
esac
|
|
- AC_MSG_ERROR([\`$XAPIAN_CONFIG --ltlibs --cxxflags' doesn't work, aborting])
|
|
+ AC_MSG_ERROR([\`$XAPIAN_CONFIG --libs --cxxflags' doesn't work, aborting])
|
|
fi
|
|
|
|
dnl If LT_INIT, AC_PROG_LIBTOOL or the deprecated older version
|
|
@@ -80,11 +80,11 @@
|
|
XAPIAN_VERSION=`$XAPIAN_CONFIG --version|sed 's/.* //;s/_svn[[0-9]]*$//'`
|
|
XAPIAN_CXXFLAGS=`$XAPIAN_CONFIG --cxxflags`
|
|
AC_PROVIDE_IFELSE([LT_INIT],
|
|
- [XAPIAN_LIBS=`$XAPIAN_CONFIG --ltlibs`],
|
|
+ [XAPIAN_LIBS=`$XAPIAN_CONFIG --libs`],
|
|
[AC_PROVIDE_IFELSE([AC_PROG_LIBTOOL],
|
|
- [XAPIAN_LIBS=`$XAPIAN_CONFIG --ltlibs`],
|
|
+ [XAPIAN_LIBS=`$XAPIAN_CONFIG --libs`],
|
|
[AC_PROVIDE_IFELSE([AM_PROG_LIBTOOL],
|
|
- [XAPIAN_LIBS=`$XAPIAN_CONFIG --ltlibs`],
|
|
+ [XAPIAN_LIBS=`$XAPIAN_CONFIG --libs`],
|
|
dnl Pass magic option so xapian-config knows we called it (so it
|
|
dnl can choose a more appropriate error message if asked to link
|
|
dnl with an uninstalled libxapian). Also pass ac_top_srcdir
|
|
@@ -92,11 +92,11 @@
|
|
dnl "configure.in" according to which is in use.
|
|
[XAPIAN_LIBS=`ac_top_srcdir="$ac_top_srcdir" $XAPIAN_CONFIG --from-xo-lib-xapian --libs`
|
|
define([LT_INIT], defn([LT_INIT])
|
|
- [XAPIAN_LIBS=`$XAPIAN_CONFIG --ltlibs`])
|
|
+ [XAPIAN_LIBS=`$XAPIAN_CONFIG --libs`])
|
|
define([AC_PROG_LIBTOOL], defn([AC_PROG_LIBTOOL])
|
|
- [XAPIAN_LIBS=`$XAPIAN_CONFIG --ltlibs`])
|
|
+ [XAPIAN_LIBS=`$XAPIAN_CONFIG --libs`])
|
|
define([AM_PROG_LIBTOOL], defn([AM_PROG_LIBTOOL])
|
|
- [XAPIAN_LIBS=`$XAPIAN_CONFIG --ltlibs`])])])])
|
|
+ [XAPIAN_LIBS=`$XAPIAN_CONFIG --libs`])])])])
|
|
ifelse([$1], , :, [$1])
|
|
fi
|
|
AC_SUBST(XAPIAN_CXXFLAGS)
|