[#206] Moved gtest handling routines to a separate m4 file

diff --git a/configure.ac b/configure.ac
index 5b8d9947f615f07103560d80cd45116c67b935cc..ac2153718b2ffd0339c5fe39d30cf006824527dd 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -553,57 +553,11 @@ int main() {
         AC_DEFINE(USE_REGEX, 1, [Define to 1 if C++11 regex is usable])],
         AC_MSG_RESULT(no))
 
-enable_gtest="no"
-GTEST_INCLUDES=
-
-AC_ARG_WITH([gtest-source],
-            [AS_HELP_STRING([--with-gtest-source=PATH],
-                            [location of the Googletest source])],
-            [enable_gtest="yes" ; GTEST_SOURCE="$withval"])
-
-AC_ARG_WITH([gtest],
-            [AS_HELP_STRING([--with-gtest=PATH],
-                            [specify a path to gtest header files (PATH/include) and library (PATH/lib)])],
-        [gtest_path="$withval"; enable_gtest="yes"], [gtest_path="no"])
-
-AC_ARG_WITH([lcov],
-            [AS_HELP_STRING([--with-lcov=PROGRAM],
-                            [enable gtest and coverage target using the specified lcov])],
-                            [lcov="$withval"],
-                            [lcov="no"])
-
-USE_LCOV="no"
-if test "$lcov" != "no"; then
-        # force gtest if not set
-        if test "$enable_gtest" = "no"; then
-#               AC_MSG_ERROR("lcov needs gtest for test coverage report")
-                AC_MSG_NOTICE([gtest support is now enabled, because used by coverage tests])
-                enable_gtest="yes"
-        fi
-        if test "$lcov" != "yes"; then
-                LCOV=$lcov
-        else
-                AC_PATH_PROG([LCOV], [lcov])
-        fi
-        if test -x "${LCOV}"; then
-                USE_LCOV="yes"
-        else
-                AC_MSG_ERROR([Cannot find lcov.])
-        fi
-        # is genhtml always in the same directory?
-        GENHTML=`echo "$LCOV" | ${SED} s/lcov$/genhtml/`
-        if test ! -x $GENHTML; then
-                AC_MSG_ERROR([genhtml not found, needed for lcov])
-        fi
-        # GCC specific?
-        CXXFLAGS="$CXXFLAGS -fprofile-arcs -ftest-coverage"
-        LIBS=" $LIBS -lgcov"
-        AC_SUBST(CPPFLAGS)
-        AC_SUBST(LIBS)
-        AC_SUBST(LCOV)
-        AC_SUBST(GENHTML)
-fi
-AC_SUBST(USE_LCOV)
+# Run the gtest detection routines. This supports --with-gtest and --with-gtest-source
+# parameters. If specified, those will set the HAVE_GTEST, HAVE_GTEST_SOURCE,
+# DISTCHECK_GTEST_CONFIGURE_FLAG, GTEST_INCLUDES, GTEST_LDFLAGS, GTEST_LDADD, GTEST_SOURCE
+# variables.
+AX_ISC_GTEST
 
 enable_benchmark="no"
 BENCHMARK_INCLUDES=
@@ -1076,103 +1030,6 @@ CPPFLAGS="$CPPFLAGS $CPPFLAGS_BOOST_THREADCONF"
 # Can be required by gtest, boost and perhaps still asio
 AC_CHECK_LIB(pthread, pthread_create,[ LDFLAGS="$LDFLAGS -lpthread" ], [])
 
-#
-# Check availability of gtest, which will be used for unit tests.
-#
-GTEST_LDFLAGS=
-GTEST_LDADD=
-DISTCHECK_GTEST_CONFIGURE_FLAG=
-GTEST_VERSION="unknown"
-
-if test "x$enable_gtest" = "xyes" ; then
-
-    DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest=$gtest_path"
-
-    if test -n "$with_gtest_source" ; then
-
-        if test "x$GTEST_SOURCE" = "xyes" ; then
-
-            AC_MSG_CHECKING([for gtest source])
-            # If not specified, try some common paths.
-            GTEST_SOURCE=
-            for d in /usr/src/gtest /usr/local /usr/pkg /opt /opt/local ; do
-                if test -f $d/src/gtest-all.cc -a $d/src/gtest_main.cc; then
-                    GTEST_SOURCE=$d
-                    AC_MSG_RESULT([$GTEST_SOURCE])
-                    break
-                fi
-            done
-            if test -z $GTEST_SOURCE ; then
-                AC_MSG_ERROR([no gtest source but it was selected])
-            fi
-        else
-            if test ! -d $GTEST_SOURCE/src -a -d $GTEST_SOURCE/googletest; then
-                GTEST_SOURCE=$GTEST_SOURCE/googletest
-            fi
-            AC_CHECK_FILES([$GTEST_SOURCE/src/gtest-all.cc]
-                [$GTEST_SOURCE/src/gtest_main.cc],
-                [have_gtest_source=yes],
-                [AC_MSG_ERROR([no gtest source at $GTEST_SOURCE])])
-        fi
-        have_gtest_source=yes
-        GTEST_LDADD="\$(top_builddir)/ext/gtest/libgtest.a"
-        DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest-source=$GTEST_SOURCE"
-        GTEST_INCLUDES="-I$GTEST_SOURCE -I$GTEST_SOURCE/include"
-        GTEST_VERSION="`basename $GTEST_SOURCE`"
-    fi
-
-    if test "$gtest_path" != "no" ; then
-        if test "$gtest_path" != "yes"; then
-            GTEST_PATHS=$gtest_path
-            if test -x "${gtest_path}/bin/gtest-config" ; then
-                GTEST_CONFIG="${gtest_path}/bin/gtest-config"
-            fi
-        else
-            AC_PATH_PROG([GTEST_CONFIG], [gtest-config])
-        fi
-        if test -x "${GTEST_CONFIG}" ; then :
-            # using cppflags instead of cxxflags
-            GTEST_INCLUDES=`${GTEST_CONFIG} --cppflags`
-            GTEST_LDFLAGS=`${GTEST_CONFIG} --ldflags`
-            GTEST_LDADD=`${GTEST_CONFIG} --libs`
-            GTEST_VERSION=`${GTEST_CONFIG} --version`
-            GTEST_FOUND="true"
-        else
-            AC_MSG_WARN([Unable to locate Google Test gtest-config.])
-            if test -z "${GTEST_PATHS}" ; then
-                GTEST_PATHS="/usr /usr/local"
-            fi
-            GTEST_FOUND="false"
-        fi
-        if test "${GTEST_FOUND}" != "true"; then
-            GTEST_FOUND="false"
-            for dir in $GTEST_PATHS; do
-                if test -f "$dir/include/gtest/gtest.h"; then
-                    if ! test -f "$dir/lib/libgtests.a"; then
-                        AC_MSG_WARN([Found Google Test include but not the library in $dir.])
-                        continue
-                    fi
-                    GTEST_INCLUDES="-I$dir/include"
-                    GTEST_LDFLAGS="-L$dir/lib"
-                    GTEST_LDADD="-lgtest"
-                    GTEST_FOUND="true"
-                    break
-                fi
-            done
-        fi
-        if test "${GTEST_FOUND}" != "true"; then
-            AC_MSG_ERROR([Cannot find gtest in: $GTEST_PATHS])
-        fi
-
-    fi
-fi
-AM_CONDITIONAL(HAVE_GTEST, test $enable_gtest != "no")
-AM_CONDITIONAL(HAVE_GTEST_SOURCE, test "X$have_gtest_source" = "Xyes")
-AC_SUBST(DISTCHECK_GTEST_CONFIGURE_FLAG)
-AC_SUBST(GTEST_INCLUDES)
-AC_SUBST(GTEST_LDFLAGS)
-AC_SUBST(GTEST_LDADD)
-AC_SUBST(GTEST_SOURCE)
 
 #
 # Check availability of benchmark.

diff --git a/m4macros/Makefile.am b/m4macros/Makefile.am
index 79d06030439ccac4077b1fe987f094ae5eabbc99..e2ce764833258451198a8c172f492b36c92b522a 100644 (file)
--- a/m4macros/Makefile.am
+++ b/m4macros/Makefile.am
@@ -1 +1 @@
-EXTRA_DIST  = ax_boost_for_kea.m4 ax_isc_rpath.m4 ax_cpp11.m4
+EXTRA_DIST  = ax_boost_for_kea.m4 ax_isc_rpath.m4 ax_cpp11.m4 ax_gtest.m4

diff --git a/m4macros/ax_gtest.m4 b/m4macros/ax_gtest.m4
new file mode 100644 (file)
index 0000000..61257d0
--- /dev/null
+++ b/m4macros/ax_gtest.m4
@@ -0,0 +1,153 @@
+AC_DEFUN([AX_ISC_GTEST], [
+
+enable_gtest="no"
+GTEST_INCLUDES=
+
+AC_ARG_WITH([gtest-source],
+            [AS_HELP_STRING([--with-gtest-source=PATH],
+                            [location of the Googletest source])],
+            [enable_gtest="yes" ; GTEST_SOURCE="$withval"])
+
+AC_ARG_WITH([gtest],
+            [AS_HELP_STRING([--with-gtest=PATH],
+                            [specify a path to gtest header files (PATH/include) and library (PATH/lib)])],
+        [gtest_path="$withval"; enable_gtest="yes"], [gtest_path="no"])
+
+AC_ARG_WITH([lcov],
+            [AS_HELP_STRING([--with-lcov=PROGRAM],
+                            [enable gtest and coverage target using the specified lcov])],
+                            [lcov="$withval"],
+                            [lcov="no"])
+
+USE_LCOV="no"
+if test "$lcov" != "no"; then
+        # force gtest if not set
+        if test "$enable_gtest" = "no"; then
+#               AC_MSG_ERROR("lcov needs gtest for test coverage report")
+                AC_MSG_NOTICE([gtest support is now enabled, because used by coverage tests])
+                enable_gtest="yes"
+        fi
+        if test "$lcov" != "yes"; then
+                LCOV=$lcov
+        else
+                AC_PATH_PROG([LCOV], [lcov])
+        fi
+        if test -x "${LCOV}"; then
+                USE_LCOV="yes"
+        else
+                AC_MSG_ERROR([Cannot find lcov.])
+        fi
+        # is genhtml always in the same directory?
+        GENHTML=`echo "$LCOV" | ${SED} s/lcov$/genhtml/`
+        if test ! -x $GENHTML; then
+                AC_MSG_ERROR([genhtml not found, needed for lcov])
+        fi
+        # GCC specific?
+        CXXFLAGS="$CXXFLAGS -fprofile-arcs -ftest-coverage"
+        LIBS=" $LIBS -lgcov"
+        AC_SUBST(CPPFLAGS)
+        AC_SUBST(LIBS)
+        AC_SUBST(LCOV)
+        AC_SUBST(GENHTML)
+fi
+AC_SUBST(USE_LCOV)
+
+#
+# Check availability of gtest, which will be used for unit tests.
+#
+GTEST_LDFLAGS=
+GTEST_LDADD=
+DISTCHECK_GTEST_CONFIGURE_FLAG=
+GTEST_VERSION="unknown"
+
+if test "x$enable_gtest" = "xyes" ; then
+
+    DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest=$gtest_path"
+
+    if test -n "$with_gtest_source" ; then
+
+        if test "x$GTEST_SOURCE" = "xyes" ; then
+
+            AC_MSG_CHECKING([for gtest source])
+            # If not specified, try some common paths.
+            GTEST_SOURCE=
+            for d in /usr/src/gtest /usr/local /usr/pkg /opt /opt/local ; do
+                if test -f $d/src/gtest-all.cc -a $d/src/gtest_main.cc; then
+                    GTEST_SOURCE=$d
+                    AC_MSG_RESULT([$GTEST_SOURCE])
+                    break
+                fi
+            done
+            if test -z $GTEST_SOURCE ; then
+                AC_MSG_ERROR([no gtest source but it was selected])
+            fi
+        else
+            if test ! -d $GTEST_SOURCE/src -a -d $GTEST_SOURCE/googletest; then
+                GTEST_SOURCE=$GTEST_SOURCE/googletest
+            fi
+            AC_CHECK_FILES([$GTEST_SOURCE/src/gtest-all.cc]
+                [$GTEST_SOURCE/src/gtest_main.cc],
+                [have_gtest_source=yes],
+                [AC_MSG_ERROR([no gtest source at $GTEST_SOURCE])])
+        fi
+        have_gtest_source=yes
+        GTEST_LDADD="\$(top_builddir)/ext/gtest/libgtest.a"
+        DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest-source=$GTEST_SOURCE"
+        GTEST_INCLUDES="-I$GTEST_SOURCE -I$GTEST_SOURCE/include"
+        GTEST_VERSION="`basename $GTEST_SOURCE`"
+    fi
+
+    if test "$gtest_path" != "no" ; then
+        if test "$gtest_path" != "yes"; then
+            GTEST_PATHS=$gtest_path
+            if test -x "${gtest_path}/bin/gtest-config" ; then
+                GTEST_CONFIG="${gtest_path}/bin/gtest-config"
+            fi
+        else
+            AC_PATH_PROG([GTEST_CONFIG], [gtest-config])
+        fi
+        if test -x "${GTEST_CONFIG}" ; then :
+            # using cppflags instead of cxxflags
+            GTEST_INCLUDES=`${GTEST_CONFIG} --cppflags`
+            GTEST_LDFLAGS=`${GTEST_CONFIG} --ldflags`
+            GTEST_LDADD=`${GTEST_CONFIG} --libs`
+            GTEST_VERSION=`${GTEST_CONFIG} --version`
+            GTEST_FOUND="true"
+        else
+            AC_MSG_WARN([Unable to locate Google Test gtest-config.])
+            if test -z "${GTEST_PATHS}" ; then
+                GTEST_PATHS="/usr /usr/local"
+            fi
+            GTEST_FOUND="false"
+        fi
+        if test "${GTEST_FOUND}" != "true"; then
+            GTEST_FOUND="false"
+            for dir in $GTEST_PATHS; do
+                if test -f "$dir/include/gtest/gtest.h"; then
+                    if ! test -f "$dir/lib/libgtests.a"; then
+                        AC_MSG_WARN([Found Google Test include but not the library in $dir.])
+                        continue
+                    fi
+                    GTEST_INCLUDES="-I$dir/include"
+                    GTEST_LDFLAGS="-L$dir/lib"
+                    GTEST_LDADD="-lgtest"
+                    GTEST_FOUND="true"
+                    break
+                fi
+            done
+        fi
+        if test "${GTEST_FOUND}" != "true"; then
+            AC_MSG_ERROR([Cannot find gtest in: $GTEST_PATHS])
+        fi
+
+    fi
+fi
+AM_CONDITIONAL(HAVE_GTEST, test $enable_gtest != "no")
+AM_CONDITIONAL(HAVE_GTEST_SOURCE, test "X$have_gtest_source" = "Xyes")
+AC_SUBST(DISTCHECK_GTEST_CONFIGURE_FLAG)
+AC_SUBST(GTEST_INCLUDES)
+AC_SUBST(GTEST_LDFLAGS)
+AC_SUBST(GTEST_LDADD)
+AC_SUBST(GTEST_SOURCE)
+
+])dnl AX_ISC_GTEST