diff options
| author | Shinichiro Hamaji <shinichiro.hamaji@gmail.com> | 2017-07-26 17:44:25 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-26 17:44:25 +0900 |
| commit | a6ffefa7e51e005865f1470715110d0021a65ae5 (patch) | |
| tree | 3ad8516e596cc356d5fd8ed145e6d4193c1f1fbe | |
| parent | dc8aa29f2c9a8d8bc6f802316bdf01fd5bb64803 (diff) | |
| download | glog-a6ffefa7e51e005865f1470715110d0021a65ae5.tar.gz glog-a6ffefa7e51e005865f1470715110d0021a65ae5.tar.bz2 glog-a6ffefa7e51e005865f1470715110d0021a65ae5.zip | |
Revert "configure.ac: Allow user to disable gflags"
| -rw-r--r-- | configure.ac | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 5c4ac79..69711b7 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" ) - -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) +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 CFLAGS="$SAVE_CFLAGS" LIBS="$SAVE_LIBS" |