diff options
| author | Rafael G. Martins <rafael@rafaelmartins.eng.br> | 2016-02-26 03:59:11 +0100 |
|---|---|---|
| committer | Rafael G. Martins <rafael@rafaelmartins.eng.br> | 2016-02-26 03:59:11 +0100 |
| commit | f18c5d9d5c90212100936f37a739d8238edb5cc1 (patch) | |
| tree | 9cced070aff050e1dec6738cf074461572e077ac | |
| parent | 6bf110510cad22b0a4e620624b70c31a179b68c9 (diff) | |
| download | blogc-f18c5d9d5c90212100936f37a739d8238edb5cc1.tar.gz blogc-f18c5d9d5c90212100936f37a739d8238edb5cc1.tar.bz2 blogc-f18c5d9d5c90212100936f37a739d8238edb5cc1.zip | |
build: do not use macro for squareball
| -rw-r--r-- | configure.ac | 28 | ||||
| m--------- | squareball | 0 |
2 files changed, 24 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 9a637a5..54a6522 100644 --- a/configure.ac +++ b/configure.ac @@ -99,12 +99,32 @@ AC_CHECK_HEADERS([sys/types.h sys/stat.h time.h]) LT_LIB_M -m4_include([squareball/squareball.m4]) -SQUAREBALL_INIT +AC_ARG_WITH([squareball], [AS_HELP_STRING([--with-squareball=@<:@internal/system@:>@], + [whether to use library squareball from system [default=internal]])]) +AS_IF([test "x$with_squareball" = "xsystem"], [ + SQUAREBALL="system" + PKG_CHECK_MODULES([SQUAREBALL], [squareball], , [ + AC_MSG_ERROR([library squareball requested from system but not found]) + ]) +], [ + SQUAREBALL="internal" + SQUAREBALL_CFLAGS='-I$(top_srcdir)/squareball/src' + SQUAREBALL_LIBS='$(top_builddir)/squareball/libsquareball.la' + AC_SUBST(SQUAREBALL_LIBS) + AC_SUBST(SQUAREBALL_CFLAGS) + ac_configure_args_pre="$ac_configure_args" + ac_configure_args_post="$ac_configure_args --enable-bundleme" + ac_configure_args="$ac_configure_args_post" + AC_CONFIG_COMMANDS_PRE([ac_configure_args="$ac_configure_args_pre"]) + AC_CONFIG_COMMANDS_POST([ac_configure_args="$ac_configure_args_post"]) + AC_CONFIG_SUBDIRS([squareball]) + ac_configure_args="$ac_configure_args_pre" +]) +AM_CONDITIONAL(INTERNAL_SQUAREBALL, [test "x$with_squareball" != "xsystem"]) AC_CONFIG_FILES([ - Makefile - blogc.spec + Makefile + blogc.spec ]) AC_OUTPUT diff --git a/squareball b/squareball -Subproject 4a189aacfd7e89c99330a1cd4768352b3263428 +Subproject fca42dfa4e98632f50f7e3b2cc15d7abd677543 |