From: Shinichiro Hamaji Date: Wed, 19 Jul 2017 14:51:20 +0000 (+0900) Subject: Merge pull request #120 from ribalda/master X-Git-Tag: accepted/tizen/5.0/unified/20181102.024921~32 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dc8aa29f2c9a8d8bc6f802316bdf01fd5bb64803;hp=ce8799c8e2fff9e9e446358f7d17eee2f46ed45e;p=platform%2Fupstream%2Fglog.git Merge pull request #120 from ribalda/master configure.ac: Allow user to disable gflags --- 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"