Apply patch given by maw (thanks!). The patch was modified a bit using AC_ARG_WITH.

- Fix build problems when building with gtest.
- --with-gflags support.


git-svn-id: https://google-glog.googlecode.com/svn/trunk@42 eb4d4688-79bd-11dd-afb4-1d65580434c0

1 files changed, 13 insertions, 2 deletions

diff --git a/configure.ac b/configure.ac
index 7c279e5..9cae651 100644
--- a/configure.ac
+++ b/configure.ac
@@ -99,13 +99,23 @@ if test x"$acx_pthread_ok" = x"yes"; then
 fi
 
 # Check if there is google-gflags library installed.
+SAVE_CFLAGS="$CFLAGS"
+SAVE_LIBS="$LIBS"
+AC_ARG_WITH(gflags, AS_HELP_STRING[--with-gflags=GFLAGS_DIR],
+  GFLAGS_CFLAGS="-I${with_gflags}/include"
+  GFLAGS_LIBS="-L${with_gflags}/lib -lgflags"
+  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
-  GFLAGS_LIBS=-lgflags
   AC_DEFINE(HAVE_LIB_GFLAGS, 1, [define if you have google gflags library])
 else
+  GFLAGS_CFLAGS=
   GFLAGS_LIBS=
 fi
+CFLAGS="$SAVE_CFLAGS"
+LIBS="$SAVE_LIBS"
 
 # TODO(hamaji): Use official m4 macros provided by testing libraries
 #               once the m4 macro of Google Mocking becomes ready.
@@ -211,9 +221,10 @@ AC_SUBST(ac_cv_have_uint16_t)
 AC_SUBST(ac_cv_have_u_int16_t)
 AC_SUBST(ac_cv_have___uint16)
 AC_SUBST(ac_cv_have_libgflags)
-AC_SUBST(GFLAGS_LIBS)
+AC_SUBST(GFLAGS_CFLAGS)
 AC_SUBST(GTEST_CFLAGS)
 AC_SUBST(GMOCK_CFLAGS)
+AC_SUBST(GFLAGS_LIBS)
 AC_SUBST(GTEST_LIBS)
 AC_SUBST(GMOCK_LIBS)