Mercurial > hg > svcore
changeset 649:ba986753c3dd
* Set LIBS properly when optional pkg-config package found
| author | Chris Cannam |
|---|---|
| date | Wed, 22 Sep 2010 12:28:37 +0100 |
| parents | fd82ea0fc9f4 |
| children | f6ed1a7a920f |
| files | .hgignore acinclude.m4 configure.ac |
| diffstat | 3 files changed, 2 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgignore Wed Sep 22 11:24:20 2010 +0100 +++ b/.hgignore Wed Sep 22 12:28:37 2010 +0100 @@ -1,6 +1,7 @@ syntax: glob Makefile */Makefile +o/* */o/* */tmp_obj/* */tmp_moc/*
--- a/acinclude.m4 Wed Sep 22 11:24:20 2010 +0100 +++ b/acinclude.m4 Wed Sep 22 12:28:37 2010 +0100 @@ -35,7 +35,7 @@ SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE fi if test -n "$PKG_CONFIG"; then - 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])]) + 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])]) fi if test -n "$SV_MODULE_FAILED"; then 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])])
--- a/configure.ac Wed Sep 22 11:24:20 2010 +0100 +++ b/configure.ac Wed Sep 22 12:28:37 2010 +0100 @@ -108,14 +108,6 @@ AC_MSG_ERROR([qmake failed: Command was "$QMAKE -r"]) fi -# qmake builds our static libraries, which is fine -- what we'd really -# like to do afterwards is bundle them into a single .so with e.g. - -# gcc -Wl,--whole-archive */*.a -Wl,--no-whole-archive -o libsvcore.so - -# but how best to arrange this? if it's not possible, we'll presumably -# just have to use a single (q)make(project)file instead. - AC_MSG_NOTICE([ Configuration complete.