Skip to content

Instantly share code, notes, and snippets.

@wez wez/-
Created Apr 19, 2014

Embed
What would you like to do?
diff --git a/configure.ac b/configure.ac
index 28de985..059bb22 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,13 +55,6 @@ if test "$placate_valgrind" == "yes" ; then
AC_DEFINE(PH_PLACATE_VALGRIND, [1], [Placate valgrind])
fi
-rtm=no
-AC_ARG_ENABLE(rtm, [
- --enable-rtm Turn on support for Intel TSX extensions
-],[
- rtm=$enableval
-])
-
stack_protect=no
AC_ARG_ENABLE(stack-protector, [
--enable-stack-protector Enable stack protection in the same
@@ -120,6 +113,19 @@ if ! $PKG_CONFIG --exists --print-errors openssl ; then
AC_MSG_ERROR([openssl is required])
fi
+pkg_config_libs() {
+ pkg_config_rpath=""
+ case "$target_os" in
+ solaris*|darwin*)
+ ;;
+ *)
+ dnl GNU LD specific; Solaris wants s/L/R/ but moving fast for now
+ pkg_config_rpath=`$PKG_CONFIG --libs-only-L $1 | sed -e 's/L/Wl,-rpath=/'`
+ ;;
+ esac
+ echo "`$PKG_CONFIG --libs $1` $pkg_config_rpath"
+}
+
ares="yes"
AC_ARG_WITH(cares, [
--with-cares Enable libc-ares DNS resolver support.
@@ -131,16 +137,7 @@ if test "x$ares" != "xno" ; then
if ! $PKG_CONFIG --exists --print-errors libcares ; then
AC_MSG_ERROR([libcares requested but not found])
fi
- ares_rpath=""
- case "$target_os" in
- solaris*|darwin*)
- ;;
- *)
- dnl GNU LD specific; Solaris wants s/L/R/ but moving fast for now
- ares_rpath=`$PKG_CONFIG --libs-only-L libcares | sed -e 's/L/Wl,-rpath=/'`
- ;;
- esac
- LIBS="$LIBS `$PKG_CONFIG --libs libcares` $ares_rpath"
+ LIBS="$LIBS `pkg_config_libs libcares`"
CFLAGS="$CFLAGS `$PKG_CONFIG --cflags libcares`"
AC_CHECK_FUNCS(ares_parse_mx_reply,[
AC_DEFINE(PH_HAVE_ARES_MX, 1, [whether ares has mx parsing support])
@@ -164,7 +161,7 @@ if ! $PKG_CONFIG --exists --max-version=0.3.2 --print-errors ck ; then
AC_MSG_ERROR([ck is required])
fi
CFLAGS="$CFLAGS `$PKG_CONFIG --cflags ck`"
-LIBS="$LIBS `$PKG_CONFIG --libs ck`"
+LIBS="$LIBS `pkg_config_libs ck`"
AC_PATH_PROG(PHP, php, true)
AC_SUBST(PHP)
diff --git a/travis/deps.sh b/travis/deps.sh
index 826d62e..e8f0608 100755
--- a/travis/deps.sh
+++ b/travis/deps.sh
@@ -7,3 +7,18 @@ case `uname` in
sudo apt-get install -y libc-ares-dev -q
;;
esac
+
+HERE=$PWD
+
+# There is no CK package available for ubuntu yet
+CK_VER=0.3.2
+CK_RELEASE=https://github.com/sbahra/ck/archive/$CK_VER.tar.gz
+if test ! -f $CK_VER.tar.gz ; then
+ wget $CK_RELEASE
+ tar xzf $CK_VER.tar.gz
+fi
+cd ck-$CK_VER
+./configure --prefix=$HERE/thirdparty/ck || exit 1
+make install || exit 1
+cd ..
+
diff --git a/travis/run.sh b/travis/run.sh
index 05e9180..475bd79 100755
--- a/travis/run.sh
+++ b/travis/run.sh
@@ -1,7 +1,7 @@
#!/bin/sh
set -x
./autogen.sh
-./configure --enable-address-sanitizer --with-cares
+PKG_CONFIG_PATH=$PWD/thirdparty/ck/lib/pkgconfig ./configure --enable-address-sanitizer --with-cares
make -j
make -j clang-analyze
make check
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.