Skip to content

Commit

Permalink
Remove gtest lib from source tree
Browse files Browse the repository at this point in the history
  • Loading branch information
raoulh committed Mar 25, 2015
1 parent d3f9570 commit 3d74027
Show file tree
Hide file tree
Showing 41 changed files with 49 additions and 31,724 deletions.
2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ACLOCAL_AMFLAGS = -I m4

SUBDIRS = src data lib tests
SUBDIRS = src data tests

if HAVE_PO

Expand Down
64 changes: 34 additions & 30 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -148,30 +148,30 @@ fi
# Configure pthreads.
ACX_PTHREAD([have_pthread=yes])

# Define gtest variables
GTEST_VERSION="1.7.0"
if test "x$have_pthread" = "xyes"; then
GTEST_CPPFLAGS="-DGTEST_HAS_PTHREAD=1"
GTEST_CXXFLAGS="$PTHREAD_CFLAGS"
GTEST_LDFLAGS=
GTEST_LIBS="$PTHREAD_LIBS"
#check for gtest
AC_LANG_PUSH([C++])
AC_CHECK_HEADERS([gtest/gtest.h], [have_gtest="yes"])
AM_CONDITIONAL([HAVE_GTEST], [test "x${have_gtest}" = "xyes"])
AC_LANG_POP([C++])
if test "x${have_gtest}" == "xyes"
then
GTEST_INFO="make check"
else
GTEST_CPPFLAGS="-DGTEST_HAS_PTHREAD=0"
GTEST_CXXFLAGS=
GTEST_LDFLAGS=
GTEST_LIBS=
GTEST_INFO="install gtest to run this test"
fi
AC_SUBST([GTEST_VERSION])
AC_SUBST([GTEST_CPPFLAGS])
AC_SUBST([GTEST_CXXFLAGS])
AC_SUBST([GTEST_LDFLAGS])
AC_SUBST([GTEST_LIBS])

#check for autobahn test suite
AC_CHECK_PROG(HAVE_AUTOBAHN, wstest2, yes)
AM_CONDITIONAL([HAVE_AUTOBAHN], [test "x${HAVE_AUTOBAHN}" = "xyes"])
if test "x${HAVE_AUTOBAHN}" == "xyes"
then
WS_INFO="make check"
else
WS_INFO="install autobahn testsuite to run this test"
fi

AC_CONFIG_FILES([
Makefile
lib/Makefile
lib/gtest/Makefile
tests/Makefile
src/Makefile
src/lib/Makefile
Expand Down Expand Up @@ -207,19 +207,23 @@ echo
echo
echo "Configuration Options Summary:"
echo
echo "Compilation............: make (or gmake)"
echo " CPPFLAGS.............: $CPPFLAGS"
echo " CFLAGS...............: $CFLAGS"
echo " LDFLAGS..............: $LDFLAGS"
echo "Compilation............................: make (or gmake)"
echo " CPPFLAGS.............................: $CPPFLAGS"
echo " CFLAGS...............................: $CFLAGS"
echo " LDFLAGS..............................: $LDFLAGS"
echo
echo "Test Suite:"
echo " gtest library........................: $GTEST_INFO"
echo " Autobahn Websocket test suite........: $WS_INFO"
echo
echo "Installation...........: make install (as root if needed, with 'su' or 'sudo')"
echo " prefix...............: $prefix"
echo "Installation...........................: make install (as root if needed, with 'su' or 'sudo')"
echo " prefix...............................: $prefix"
echo
echo " Build Calaos Server...: yes"
echo " Build Calaos Home.....: $have_calaos_home_dep"
echo " Build theme.......... : $build_theme"
echo " Build Calaos Server...................: yes"
echo " Build Calaos Home.....................: $have_calaos_home_dep"
echo " Build theme...........................: $build_theme"
echo
echo " One Wire support......: ${have_owcapi}"
echo " EWebkit support.......: ${have_ewebkit}"
echo " Ecore_X support.......: ${have_ecore_x}"
echo " One Wire support......................: ${have_owcapi}"
echo " EWebkit support.......................: ${have_ewebkit}"
echo " Ecore_X support.......................: ${have_ecore_x}"
echo
1 change: 0 additions & 1 deletion lib/Makefile.am

This file was deleted.

56 changes: 0 additions & 56 deletions lib/gtest/Makefile.am

This file was deleted.

Loading

0 comments on commit 3d74027

Please sign in to comment.