1 --- a/m4-macros/xapian.m4
2 +++ b/m4-macros/xapian.m4
6 AC_MSG_CHECKING([$XAPIAN_CONFIG works])
7 - dnl check for --ltlibs but not --libs as "xapian-config --libs" will
8 + dnl check for --libs but not --libs as "xapian-config --libs" will
9 dnl fail if xapian isn't installed...
11 dnl run with exec to avoid leaking output on "real" bourne shells
12 - if (exec >&5 2>&5 ; $XAPIAN_CONFIG --ltlibs --cxxflags; exit $?) then
13 + if (exec >&5 2>&5 ; $XAPIAN_CONFIG --libs --cxxflags; exit $?) then
18 AC_MSG_ERROR([\`$XAPIAN_CONFIG' not executable, aborting])
21 - AC_MSG_ERROR([\`$XAPIAN_CONFIG --ltlibs --cxxflags' doesn't work, aborting])
22 + AC_MSG_ERROR([\`$XAPIAN_CONFIG --libs --cxxflags' doesn't work, aborting])
25 dnl If LT_INIT, AC_PROG_LIBTOOL or the deprecated older version
27 XAPIAN_VERSION=`$XAPIAN_CONFIG --version|sed 's/.* //;s/_svn[[0-9]]*$//'`
28 XAPIAN_CXXFLAGS=`$XAPIAN_CONFIG --cxxflags`
29 AC_PROVIDE_IFELSE([LT_INIT],
30 - [XAPIAN_LIBS=`$XAPIAN_CONFIG --ltlibs`],
31 + [XAPIAN_LIBS=`$XAPIAN_CONFIG --libs`],
32 [AC_PROVIDE_IFELSE([AC_PROG_LIBTOOL],
33 - [XAPIAN_LIBS=`$XAPIAN_CONFIG --ltlibs`],
34 + [XAPIAN_LIBS=`$XAPIAN_CONFIG --libs`],
35 [AC_PROVIDE_IFELSE([AM_PROG_LIBTOOL],
36 - [XAPIAN_LIBS=`$XAPIAN_CONFIG --ltlibs`],
37 + [XAPIAN_LIBS=`$XAPIAN_CONFIG --libs`],
38 dnl Pass magic option so xapian-config knows we called it (so it
39 dnl can choose a more appropriate error message if asked to link
40 dnl with an uninstalled libxapian). Also pass ac_top_srcdir
42 dnl "configure.in" according to which is in use.
43 [XAPIAN_LIBS=`ac_top_srcdir="$ac_top_srcdir" $XAPIAN_CONFIG --from-xo-lib-xapian --libs`
44 define([LT_INIT], defn([LT_INIT])
45 - [XAPIAN_LIBS=`$XAPIAN_CONFIG --ltlibs`])
46 + [XAPIAN_LIBS=`$XAPIAN_CONFIG --libs`])
47 define([AC_PROG_LIBTOOL], defn([AC_PROG_LIBTOOL])
48 - [XAPIAN_LIBS=`$XAPIAN_CONFIG --ltlibs`])
49 + [XAPIAN_LIBS=`$XAPIAN_CONFIG --libs`])
50 define([AM_PROG_LIBTOOL], defn([AM_PROG_LIBTOOL])
51 - [XAPIAN_LIBS=`$XAPIAN_CONFIG --ltlibs`])])])])
52 + [XAPIAN_LIBS=`$XAPIAN_CONFIG --libs`])])])])
53 ifelse([$1], , :, [$1])
55 AC_SUBST(XAPIAN_CXXFLAGS)