$NetBSD: patch-aa,v 1.7 2010/07/25 13:18:52 obache Exp $ --- configure.orig 2009-03-01 18:37:55.000000000 +0000 +++ configure @@ -12957,70 +12957,12 @@ IRCDLIBS="$IRCDLIBS -lresolv " ;; esac -tre_version="0.7.5" -{ echo "$as_me:$LINENO: result: extracting TRE regex library" >&5 -echo "${ECHO_T}extracting TRE regex library" >&6; } -cur_dir=`pwd` -cd extras -rm -rf tre-$tre_version -if test "x$ac_cv_path_GUNZIP" = "x" ; then - tar xfz tre.tar.gz -else - cp tre.tar.gz tre.tar.gz.bak - gunzip -f tre.tar.gz - cp tre.tar.gz.bak tre.tar.gz - tar xf tre.tar -fi -{ echo "$as_me:$LINENO: result: configuring TRE regex library" >&5 -echo "${ECHO_T}configuring TRE regex library" >&6; } -cd tre-$tre_version -./configure --disable-agrep --disable-shared --disable-system-abi --disable-wchar --disable-multibyte --prefix=$cur_dir/extras/regexp || exit 1 -{ echo "$as_me:$LINENO: result: compiling TRE regex library" >&5 -echo "${ECHO_T}compiling TRE regex library" >&6; } -$ac_cv_prog_MAKER || exit 1 -{ echo "$as_me:$LINENO: result: installing TRE regex library" >&5 -echo "${ECHO_T}installing TRE regex library" >&6; } -$ac_cv_prog_MAKER install || exit 1 -TREINCDIR="$cur_dir/extras/regexp/include" - if test "x$ac_cv_path_PKGCONFIG" = "x" ; then TRELIBS="-L../extras/regexp/lib -ltre" else - TRELIBS=`$ac_cv_path_PKGCONFIG --libs tre.pc` + TRELIBS=`$ac_cv_path_PKGCONFIG --libs tre` fi -cd $cur_dir - - -cares_version="1.6.0" -{ echo "$as_me:$LINENO: result: extracting c-ares resolver library" >&5 -echo "${ECHO_T}extracting c-ares resolver library" >&6; } -cur_dir=`pwd` -cd extras -rm -rf c-ares-$cares_version -if test "x$ac_cv_path_GUNZIP" = "x" ; then - tar xfz c-ares.tar.gz -else - cp c-ares.tar.gz c-ares.tar.gz.bak - gunzip -f c-ares.tar.gz - cp c-ares.tar.gz.bak c-ares.tar.gz - tar xf c-ares.tar -fi -{ echo "$as_me:$LINENO: result: configuring c-ares library" >&5 -echo "${ECHO_T}configuring c-ares library" >&6; } -cd c-ares-$cares_version -./configure --prefix=$cur_dir/extras/c-ares || exit 1 -{ echo "$as_me:$LINENO: result: compiling c-ares resolver library" >&5 -echo "${ECHO_T}compiling c-ares resolver library" >&6; } -$ac_cv_prog_MAKER || exit 1 -{ echo "$as_me:$LINENO: result: installing c-ares resolver library" >&5 -echo "${ECHO_T}installing c-ares resolver library" >&6; } -$ac_cv_prog_MAKER install || exit 1 -CARESINCDIR="$cur_dir/extras/c-ares/include" - -CARESLIBDIR="-L../extras/c-ares/lib" - - CARESLIBSALT="-lcares" case `uname -s` in *FreeBSD*) @@ -13034,14 +12976,12 @@ esac if test "x$ac_cv_path_PKGCONFIG" = "x" ; then CARESLIBS="$CARESLIBSALT" else - CARESLIBS="`$ac_cv_path_PKGCONFIG --static --libs libcares.pc`" + CARESLIBS="`$ac_cv_path_PKGCONFIG --libs libcares`" if test "x$CARESLIBS" = "x" ; then CARESLIBS="$CARESLIBSALT" fi fi -cd $cur_dir - ac_config_files="$ac_config_files Makefile src/modules/Makefile unreal ircdcron/ircdchk"