diff options
| author | Pedro Giffuni <pfg@apache.org> | 2011-11-24 15:21:24 +0000 |
|---|---|---|
| committer | Pedro Giffuni <pfg@apache.org> | 2011-11-24 15:21:24 +0000 |
| commit | fcd3ba7227013f6993f324395377a84a60ddbf28 (patch) | |
| tree | 8855b0c393563a02fb674ececd2f3becda260d33 /configure.in | |
| parent | 70010c2d7c6472ae40fb0a8fd97e9da159a220b8 (diff) | |
i118608 - IP clearance: Remove internal cppunit source, use system-cppunit instead. Patch by Andre Fischer (af).
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/configure.in b/configure.in index 0063719976b8..59966abced37 100644 --- a/configure.in +++ b/configure.in @@ -3727,6 +3727,9 @@ if test -n "$with_system_libwpd" -o -n "$with_system_libs" && \ AC_MSG_RESULT([external]) SYSTEM_LIBWPD=YES PKG_CHECK_MODULES( LIBWPD, libwpd-0.8 ) +else + AC_MSG_RESULT([no]) + SYSTEM_LIBWPD= fi AC_SUBST(SYSTEM_LIBWPD) AC_SUBST(LIBWPD_CFLAGS) @@ -3735,21 +3738,30 @@ AC_SUBST(LIBWPD_LIBS) dnl =================================================================== dnl Check for system cppunit dnl =================================================================== +WITH_CPPUNIT= AC_MSG_CHECKING([which cppunit to use]) if test -n "$with_system_cppunit" -o -n "$with_system_libs" && \ test "$with_system_cppunit" != "no"; then - AC_MSG_RESULT([external]) SYSTEM_CPPUNIT=YES # might work for earlier, too but go sure: - PKG_CHECK_MODULES( CPPUNIT, cppunit >= 1.12.0 ) + PKG_CHECK_MODULES( CPPUNIT, + cppunit >= 1.12.0, + WITH_CPPUNIT="YES", + WITH_CPPUNIT=") + if test -n "$WITH_CPPUNIT"; then + AC_MSG_RESULT([found system cppunit $CPPUNIT]) + else + AC_MSG_WARN([dit not find system cppunit version 1.12.0 or later]) + fi + else - AC_MSG_RESULT([internal]) + AC_MSG_WARN([not using cppunit]) SYSTEM_CPPUNIT=NO - BUILD_TYPE="$BUILD_TYPE CPPUNIT" fi AC_SUBST(SYSTEM_CPPUNIT) AC_SUBST(CPPUNIT_CFLAGS) AC_SUBST(CPPUNIT_LIBS) +AC_SUBST(WITH_CPPUNIT) dnl =================================================================== dnl Check whether freetype is available |