You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by so...@apache.org on 2014/08/07 21:35:00 UTC
git commit: TS-2950: Merge libck master (0.4.3-3-gc4e4702)
Repository: trafficserver
Updated Branches:
refs/heads/master 2167d9386 -> f1463eac0
TS-2950: Merge libck master (0.4.3-3-gc4e4702)
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/f1463eac
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/f1463eac
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/f1463eac
Branch: refs/heads/master
Commit: f1463eac0f4ff155c6fc16af314ca9b69435c9cf
Parents: 2167d93
Author: Phil Sorber <so...@apache.org>
Authored: Thu Aug 7 13:34:39 2014 -0600
Committer: Phil Sorber <so...@apache.org>
Committed: Thu Aug 7 13:34:39 2014 -0600
----------------------------------------------------------------------
lib/ck/configure | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f1463eac/lib/ck/configure
----------------------------------------------------------------------
diff --git a/lib/ck/configure b/lib/ck/configure
index 9e24c0e..b9b6898 100755
--- a/lib/ck/configure
+++ b/lib/ck/configure
@@ -42,6 +42,8 @@ LDNAME="libck.so"
LDNAME_VERSION="libck.so.$VERSION"
LDNAME_MAJOR="libck.so.$VERSION_MAJOR"
+OPTION_CHECKING=1
+
export CFLAGS
export PREFIX
LC_ALL=C
@@ -224,16 +226,22 @@ for option in $*; do
--without-pic)
WANT_PIC=no
;;
+ --disable-option-checking)
+ OPTION_CHECKING=0
+ ;;
--build=*|--host=*|--target=*|--exec-prefix=*|--bindir=*|--sbindir=*|\
--sysconfdir=*|--datadir=*|--libexecdir=*|--localstatedir=*|\
--enable-static|\
- --sharedstatedir=*|--infodir=*|--enable-shared|--disable-shared)
+ --sharedstatedir=*|--infodir=*|--enable-shared|--disable-shared|\
+ --cache-file=*|--srcdir=*)
# ignore for compat with regular configure
;;
--*)
- echo "$0 [--help]"
- echo "Unknown option $option"
- exit $EXIT_FAILURE
+ if test "$OPTION_CHECKING" -eq 1; then
+ echo "$0 [--help]"
+ echo "Unknown option $option"
+ exit $EXIT_FAILURE
+ fi
;;
*=*)
NAME=`expr "$option" : '\([^=]*\)='`