Mercurial > hg > sonic-annotator
comparison acinclude.m4 @ 48:f0e3651ad3b0
* Update config per recent changes to svcore
author | Chris Cannam |
---|---|
date | Tue, 08 Mar 2011 11:36:13 +0000 |
parents | 94d988cef54e |
children | d78c80be335f |
comparison
equal
deleted
inserted
replaced
47:91d20795a109 | 48:f0e3651ad3b0 |
---|---|
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 CXXFLAGS="$CXXFLAGS $$1_CFLAGS" | |
14 LIBS="$LIBS $$1_LIBS" | |
15 SV_MODULE_FAILED="" | |
16 fi | |
11 if test -z "$SV_MODULE_VERSION_TEST" ; then | 17 if test -z "$SV_MODULE_VERSION_TEST" ; then |
12 SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE | 18 SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE |
13 fi | 19 fi |
14 if test -n "$PKG_CONFIG"; then | 20 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])]) | 21 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 | 22 fi |
17 if test -n "$SV_MODULE_FAILED"; then | 23 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])]) | 24 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 | 25 if test -n "$SV_MODULE_LIB"; then |
29 SV_MODULE_HEADER=$3 | 35 SV_MODULE_HEADER=$3 |
30 SV_MODULE_LIB=$4 | 36 SV_MODULE_LIB=$4 |
31 SV_MODULE_FUNC=$5 | 37 SV_MODULE_FUNC=$5 |
32 SV_MODULE_HAVE=HAVE_$(echo $1 | tr '[a-z]' '[A-Z]') | 38 SV_MODULE_HAVE=HAVE_$(echo $1 | tr '[a-z]' '[A-Z]') |
33 SV_MODULE_FAILED=1 | 39 SV_MODULE_FAILED=1 |
40 if test -n "$$1_LIBS" ; then | |
41 AC_MSG_NOTICE([User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE]) | |
42 CXXFLAGS="$CXXFLAGS $$1_CFLAGS" | |
43 LIBS="$LIBS $$1_LIBS" | |
44 SV_MODULE_FAILED="" | |
45 fi | |
34 if test -z "$SV_MODULE_VERSION_TEST" ; then | 46 if test -z "$SV_MODULE_VERSION_TEST" ; then |
35 SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE | 47 SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE |
36 fi | 48 fi |
37 if test -n "$PKG_CONFIG"; then | 49 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])]) | 50 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 | 51 fi |
40 if test -n "$SV_MODULE_FAILED"; then | 52 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])]) | 53 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 | 54 if test -z "$SV_MODULE_FAILED"; then |