pegasus/unrealircd
1
0
Fork 0
mirror of https://github.com/unrealircd/unrealircd.git synced 2026-07-04 23:33:14 +02:00
Code Activity

- Fix bundled TRE compilation error on OpenBSD with pkg-config-0.21

Browse Source 
where pkg-config can't find 'tre.pc'. Reported by CuleX. (#3982)
  Also properly escape the sed expression used in the pkg-config call.
This commit is contained in:
binki
2010-12-24 02:29:53 +00:00
parent f6c843d38f
commit 91c3283cfa
3 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Changes
+3
View File
@@ -2252,3 +2252,6 @@
- Fix invalid use of 'wc -l' when detecting the AsynchDNS feature of
libcurl which breaks compilation on FreeBSD; instead use 'grep
-q'. Reported by Jobe (#3981), solution proposed by satmd.
- Fix bundled TRE compilation error on OpenBSD with pkg-config-0.21
where pkg-config can't find 'tre.pc'. Reported by CuleX. (#3982)
Also properly escape the sed expression used in the pkg-config call.
configure
Vendored
+7 -4
View File
@@ -6696,10 +6696,13 @@ $as_echo "installing TRE regex library" >&6; }
$ac_cv_prog_MAKER install || exit 1
TRE_CFLAGS="-I$cur_dir/extras/regexp/include"
if test "x$ac_cv_path_PKGCONFIG" = "x" ; then
TRE_LIBS="../extras/regexp/lib/libtre.a"
else
TRE_LIBS=`$ac_cv_path_PKGCONFIG --static --libs tre.pc | sed -e 's,-L\(^ \+lib\) -ltre,\1/libtre.a,'`
TRE_LIBS=
if test -n "$ac_cv_path_PKGCONFIG"; then :
TRE_LIBS="`$ac_cv_path_PKGCONFIG --static --libs tre.pc | sed 's,-L\([^ ]\+lib\) -ltre,\1/libtre.a,'`"
fi
if test -z "$TRE_LIBS"; then :
TRE_LIBS="../extras/regexp/lib/libtre.a"
fi
cd $cur_dir
configure.ac
+11 -9
View File
@@ -567,15 +567,17 @@ AC_MSG_RESULT(installing TRE regex library)
$ac_cv_prog_MAKER install || exit 1
TRE_CFLAGS="-I$cur_dir/extras/regexp/include"
AC_SUBST(TRE_CFLAGS)
if test "x$ac_cv_path_PKGCONFIG" = "x" ; then
dnl for when pkg-config isn't available
TRE_LIBS="../extras/regexp/lib/libtre.a"
else
dnl See c-ares's compilation section for more info on this hack.
dnl ensure that we're linking against the bundled version of tre
dnl (we only reach this code if linking against the bundled version is desired).
TRE_LIBS=`$ac_cv_path_PKGCONFIG --static --libs tre.pc | sed -e 's,-L\([^ ]\+lib\) -ltre,\1/libtre.a,'`
fi
TRE_LIBS=
dnl See c-ares's compilation section for more info on this hack.
dnl ensure that we're linking against the bundled version of tre
dnl (we only reach this code if linking against the bundled version is desired).
AS_IF([test -n "$ac_cv_path_PKGCONFIG"],
[TRE_LIBS="`$ac_cv_path_PKGCONFIG --static --libs tre.pc | sed ['s,-L\([^ ]\+lib\) -ltre,\1/libtre.a,']`"])
dnl For when pkg-config isn't available -- or for when pkg-config
dnl doesn't see the tre.pc file somehow... (#3982)
AS_IF([test -z "$TRE_LIBS"],
[TRE_LIBS="../extras/regexp/lib/libtre.a"])
AC_SUBST(TRE_LIBS)
cd $cur_dir
],[