Mercurial > hg > svapp

comparison acinclude.m4 @ 200:2c33d6bbea15

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Set LIBS properly when optional pkg-config package found
author Chris Cannam
date Wed, 22 Sep 2010 12:28:37 +0100
parents 78336f4b8935
children 7f6fad69f7fd
comparison
equal deleted inserted replaced
199:799ef3b24c21 200:2c33d6bbea15
33 SV_MODULE_FAILED=1 33 SV_MODULE_FAILED=1
34 if test -z "$SV_MODULE_VERSION_TEST" ; then 34 if test -z "$SV_MODULE_VERSION_TEST" ; then
35 SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE 35 SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE
36 fi 36 fi
37 if test -n "$PKG_CONFIG"; then 37 if test -n "$PKG_CONFIG"; then
38 PKG_CHECK_MODULES($1,[$SV_MODULE_VERSION_TEST],[HAVES="$HAVES $SV_MODULE_HAVE";SV_MODULE_FAILED=""],[AC_MSG_NOTICE([Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means])]) 38 PKG_CHECK_MODULES($1,[$SV_MODULE_VERSION_TEST],[HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $$1_CFLAGS";LIBS="$LIBS $$1_LIBS";SV_MODULE_FAILED=""],[AC_MSG_NOTICE([Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means])])
39 fi 39 fi
40 if test -n "$SV_MODULE_FAILED"; then 40 if test -n "$SV_MODULE_FAILED"; then
41 AC_CHECK_HEADER([$SV_MODULE_HEADER],[HAVES="$HAVES $SV_MODULE_HAVE";SV_MODULE_FAILED=""],[AC_MSG_NOTICE([Failed to find header $SV_MODULE_HEADER for optional module $SV_MODULE_MODULE])]) 41 AC_CHECK_HEADER([$SV_MODULE_HEADER],[HAVES="$HAVES $SV_MODULE_HAVE";SV_MODULE_FAILED=""],[AC_MSG_NOTICE([Failed to find header $SV_MODULE_HEADER for optional module $SV_MODULE_MODULE])])
42 if test -z "$SV_MODULE_FAILED"; then 42 if test -z "$SV_MODULE_FAILED"; then
43 if test -n "$SV_MODULE_LIB"; then 43 if test -n "$SV_MODULE_LIB"; then