Mercurial > hg > svcore

comparison acinclude.m4 @ 671:59ae875b017b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Skip tests for modules when {module}_LIBS is provided by user
author Chris Cannam
date Tue, 08 Mar 2011 10:31:12 +0000
parents 3270c92deacd
children 5f75414d85f6
comparison
equal deleted inserted replaced
670:9e29bf7ce1ff 671:59ae875b017b
6 SV_MODULE_HEADER=$3 6 SV_MODULE_HEADER=$3
7 SV_MODULE_LIB=$4 7 SV_MODULE_LIB=$4
8 SV_MODULE_FUNC=$5 8 SV_MODULE_FUNC=$5
9 SV_MODULE_HAVE=HAVE_$(echo $1 | tr '[a-z]' '[A-Z]') 9 SV_MODULE_HAVE=HAVE_$(echo $1 | tr '[a-z]' '[A-Z]')
10 SV_MODULE_FAILED=1 10 SV_MODULE_FAILED=1
11 if test -n "$$1_LIBS" ; then
12 AC_MSG_NOTICE([User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE])
13 SV_MODULE_FAILED=""
14 fi
11 if test -z "$SV_MODULE_VERSION_TEST" ; then 15 if test -z "$SV_MODULE_VERSION_TEST" ; then
12 SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE 16 SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE
13 fi 17 fi
14 if test -n "$PKG_CONFIG"; then 18 if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
15 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 required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means])]) 19 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 required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means])])
16 fi 20 fi
17 if test -n "$SV_MODULE_FAILED"; then 21 if test -n "$SV_MODULE_FAILED"; then
18 AC_CHECK_HEADER([$SV_MODULE_HEADER],[HAVES="$HAVES $SV_MODULE_HAVE"],[AC_MSG_ERROR([Failed to find header $SV_MODULE_HEADER for required module $SV_MODULE_MODULE])]) 22 AC_CHECK_HEADER([$SV_MODULE_HEADER],[HAVES="$HAVES $SV_MODULE_HAVE"],[AC_MSG_ERROR([Failed to find header $SV_MODULE_HEADER for required module $SV_MODULE_MODULE])])
19 if test -n "$SV_MODULE_LIB"; then 23 if test -n "$SV_MODULE_LIB"; then
29 SV_MODULE_HEADER=$3 33 SV_MODULE_HEADER=$3
30 SV_MODULE_LIB=$4 34 SV_MODULE_LIB=$4
31 SV_MODULE_FUNC=$5 35 SV_MODULE_FUNC=$5
32 SV_MODULE_HAVE=HAVE_$(echo $1 | tr '[a-z]' '[A-Z]') 36 SV_MODULE_HAVE=HAVE_$(echo $1 | tr '[a-z]' '[A-Z]')
33 SV_MODULE_FAILED=1 37 SV_MODULE_FAILED=1
38 if test -n "$$1_LIBS" ; then
39 AC_MSG_NOTICE([User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE])
40 SV_MODULE_FAILED=""
41 fi
34 if test -z "$SV_MODULE_VERSION_TEST" ; then 42 if test -z "$SV_MODULE_VERSION_TEST" ; then
35 SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE 43 SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE
36 fi 44 fi
37 if test -n "$PKG_CONFIG"; then 45 if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
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])]) 46 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 47 fi
40 if test -n "$SV_MODULE_FAILED"; then 48 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])]) 49 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 50 if test -z "$SV_MODULE_FAILED"; then