summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinichiro Hamaji <shinichiro.hamaji@gmail.com>2017-07-19 23:51:20 +0900
committerGitHub <noreply@github.com>2017-07-19 23:51:20 +0900
commitdc8aa29f2c9a8d8bc6f802316bdf01fd5bb64803 (patch)
treec447ce4a1f296785f6e1dc1752c52f962472da13
parentce8799c8e2fff9e9e446358f7d17eee2f46ed45e (diff)
parent5da5f2cac59ea210f1e82c4d74747c07d1a196a8 (diff)
downloadglog-dc8aa29f2c9a8d8bc6f802316bdf01fd5bb64803.tar.gz
glog-dc8aa29f2c9a8d8bc6f802316bdf01fd5bb64803.tar.bz2
glog-dc8aa29f2c9a8d8bc6f802316bdf01fd5bb64803.zip
Merge pull request #120 from ribalda/master
configure.ac: Allow user to disable gflags
-rw-r--r--configure.ac20
1 files changed, 10 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac
index 69711b7..5c4ac79 100644
--- a/configure.ac
+++ b/configure.ac
@@ -136,16 +136,16 @@ AC_ARG_WITH(gflags, AS_HELP_STRING[--with-gflags=GFLAGS_DIR],
CFLAGS="$CFLAGS $GFLAGS_CFLAGS"
LIBS="$LIBS $GFLAGS_LIBS"
)
-AC_CHECK_LIB(gflags, main, ac_cv_have_libgflags=1, ac_cv_have_libgflags=0)
-if test x"$ac_cv_have_libgflags" = x"1"; then
- AC_DEFINE(HAVE_LIB_GFLAGS, 1, [define if you have google gflags library])
- if test x"$GFLAGS_LIBS" = x""; then
- GFLAGS_LIBS="-lgflags"
- fi
-else
- GFLAGS_CFLAGS=
- GFLAGS_LIBS=
-fi
+
+AS_IF([test "x$with_gflags" != xno],
+ [AC_CHECK_LIB(gflags, main,
+ [AC_DEFINE(HAVE_LIB_GFLAGS, 1, [Define if you have Google gflags library])
+ if test x"$GFLAGS_LIBS" = x""; then
+ GFLAGS_LIBS="-lgflags"
+ fi
+ ac_cv_have_libgflags=1],
+ AC_MSG_FAILURE([gflags test failed (--without-gflags to disable)]))],
+ ac_cv_have_libgflags=0)
CFLAGS="$SAVE_CFLAGS"
LIBS="$SAVE_LIBS"