[#3065] looking for CMakeLists.txt enhanced

diff --git a/m4macros/ax_gtest.m4 b/m4macros/ax_gtest.m4
index 876c559b7e69d2d0bcab8ffc51acb1863d471089..984db8ad1856da4c22f41b95855f6d4f8023cd97 100644 (file)
--- a/m4macros/ax_gtest.m4
+++ b/m4macros/ax_gtest.m4
@@ -73,6 +73,7 @@ if test "x$enable_gtest" = "xyes" ; then
             # If not specified, try some common paths.
             GTEST_SOURCE=
             for d in /usr/src/googletest /usr/src/gtest /usr/local /usr/pkg /opt /opt/local ; do
+                cmakelists="$d/CMakeLists.txt"
                 if test ! -d "$d"/src -a -d "$d"/googletest; then
                     d=$d/googletest
                 fi
@@ -86,6 +87,7 @@ if test "x$enable_gtest" = "xyes" ; then
                 AC_MSG_ERROR([no gtest sources found])
             fi
         else
+            cmakelists="$GTEST_SOURCE/CMakeLists.txt"
             if test ! -d $GTEST_SOURCE/src -a -d $GTEST_SOURCE/googletest; then
                 GTEST_SOURCE=$GTEST_SOURCE/googletest
             fi
@@ -104,10 +106,11 @@ if test "x$enable_gtest" = "xyes" ; then
 
         # Versions starting from 1.8.0 are put in the googletest directory. If the basename
         # returns googletest string, we need to cut it off and try basename again.
-        cmakelists=
         if test "$GTEST_VERSION" = "googletest"; then
             GTEST_VERSION=${GTEST_SOURCE%"/googletest"}
-            cmakelists="$GTEST_VERSION/CMakeLists.txt"
+            if test -f "$GTEST_VERSION/CMakeLists.txt" ; then
+                cmakelists="$GTEST_VERSION/CMakeLists.txt"
+            fi
             GTEST_VERSION=$(basename "$GTEST_VERSION")
         fi
         GTEST_VERSION="${GTEST_VERSION#googletest-release-}"