Mercurial > hg > svcore
comparison acinclude.m4 @ 672:5f75414d85f6
* When using user-supplied {module}_LIBS, actually insert them into LIBS...
author | Chris Cannam |
---|---|
date | Tue, 08 Mar 2011 10:46:36 +0000 |
parents | 59ae875b017b |
children | a98af74f8e2f |
comparison
equal
deleted
inserted
replaced
671:59ae875b017b | 672:5f75414d85f6 |
---|---|
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 | 11 if test -n "$$1_LIBS" ; then |
12 AC_MSG_NOTICE([User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE]) | 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" | |
13 SV_MODULE_FAILED="" | 15 SV_MODULE_FAILED="" |
14 fi | 16 fi |
15 if test -z "$SV_MODULE_VERSION_TEST" ; then | 17 if test -z "$SV_MODULE_VERSION_TEST" ; then |
16 SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE | 18 SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE |
17 fi | 19 fi |
35 SV_MODULE_FUNC=$5 | 37 SV_MODULE_FUNC=$5 |
36 SV_MODULE_HAVE=HAVE_$(echo $1 | tr '[a-z]' '[A-Z]') | 38 SV_MODULE_HAVE=HAVE_$(echo $1 | tr '[a-z]' '[A-Z]') |
37 SV_MODULE_FAILED=1 | 39 SV_MODULE_FAILED=1 |
38 if test -n "$$1_LIBS" ; then | 40 if test -n "$$1_LIBS" ; then |
39 AC_MSG_NOTICE([User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE]) | 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" | |
40 SV_MODULE_FAILED="" | 44 SV_MODULE_FAILED="" |
41 fi | 45 fi |
42 if test -z "$SV_MODULE_VERSION_TEST" ; then | 46 if test -z "$SV_MODULE_VERSION_TEST" ; then |
43 SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE | 47 SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE |
44 fi | 48 fi |