source: branches/packages_10.03.1/libs/libxapian/patches/004-xapian_config_no_ltlibs.patch @ 28417

Last change on this file since 28417 was 28417, checked in by nico, 5 years ago

[backfire/packages] merge [28415] & [28416]

File size: 2.3 KB
  • m4-macros/xapian.m4

    old new  
    4747      [$2]) 
    4848  else 
    4949    AC_MSG_CHECKING([$XAPIAN_CONFIG works]) 
    50     dnl check for --ltlibs but not --libs as "xapian-config --libs" will 
    51     dnl fail if xapian isn't installed... 
    5250 
    5351    dnl run with exec to avoid leaking output on "real" bourne shells 
    54     if (exec >&5 2>&5 ; $XAPIAN_CONFIG --ltlibs --cxxflags; exit $?) then 
     52    if (exec >&5 2>&5 ; $XAPIAN_CONFIG --libs --cxxflags; exit $?) then 
    5553      AC_MSG_RESULT(yes) 
    5654    else 
    57       AC_MSG_ERROR([\`$XAPIAN_CONFIG --ltlibs --cxxflags' doesn't work, aborting]) 
     55      AC_MSG_ERROR([\`$XAPIAN_CONFIG --libs --cxxflags' doesn't work, aborting]) 
    5856    fi 
    5957 
    6058dnl If LT_INIT, AC_PROG_LIBTOOL or the deprecated older version 
     
    6462    XAPIAN_VERSION=`$XAPIAN_CONFIG --version|sed 's/.* //;s/_svn[[0-9]]*$//'` 
    6563    XAPIAN_CXXFLAGS=`$XAPIAN_CONFIG --cxxflags` 
    6664    AC_PROVIDE_IFELSE([LT_INIT], 
    67       [XAPIAN_LIBS=`$XAPIAN_CONFIG --ltlibs`], 
     65      [XAPIAN_LIBS=`$XAPIAN_CONFIG --libs`], 
    6866      [AC_PROVIDE_IFELSE([AC_PROG_LIBTOOL], 
    69         [XAPIAN_LIBS=`$XAPIAN_CONFIG --ltlibs`], 
     67        [XAPIAN_LIBS=`$XAPIAN_CONFIG --libs`], 
    7068        [AC_PROVIDE_IFELSE([AM_PROG_LIBTOOL], 
    71           [XAPIAN_LIBS=`$XAPIAN_CONFIG --ltlibs`], 
     69          [XAPIAN_LIBS=`$XAPIAN_CONFIG --libs`], 
    7270          dnl Pass magic option so xapian-config knows we called it (so it 
    7371          dnl can choose a more appropriate error message if asked to link 
    7472          dnl with an uninstalled libxapian).  Also pass ac_top_srcdir 
     
    7674          dnl "configure.in" according to which is in use. 
    7775          [XAPIAN_LIBS=`ac_top_srcdir="$ac_top_srcdir" $XAPIAN_CONFIG --from-xo-lib-xapian --libs` 
    7876          define([LT_INIT], defn([LT_INIT]) 
    79                  [XAPIAN_LIBS=`$XAPIAN_CONFIG --ltlibs`]) 
     77                 [XAPIAN_LIBS=`$XAPIAN_CONFIG --libs`]) 
    8078          define([AC_PROG_LIBTOOL], defn([AC_PROG_LIBTOOL]) 
    81                  [XAPIAN_LIBS=`$XAPIAN_CONFIG --ltlibs`]) 
     79                 [XAPIAN_LIBS=`$XAPIAN_CONFIG --libs`]) 
    8280          define([AM_PROG_LIBTOOL], defn([AM_PROG_LIBTOOL]) 
    83                  [XAPIAN_LIBS=`$XAPIAN_CONFIG --ltlibs`])])])]) 
     81                 [XAPIAN_LIBS=`$XAPIAN_CONFIG --libs`])])])]) 
    8482    ifelse([$1], , :, [$1]) 
    8583  fi 
    8684  AC_SUBST(XAPIAN_CXXFLAGS) 
Note: See TracBrowser for help on using the repository browser.