From 6bf110510cad22b0a4e620624b70c31a179b68c9 Mon Sep 17 00:00:00 2001 From: "Rafael G. Martins" Date: Fri, 26 Feb 2016 02:37:57 +0100 Subject: build: use squareball m4 macro --- configure.ac | 25 ++----------------------- squareball | 2 +- 2 files changed, 3 insertions(+), 24 deletions(-) diff --git a/configure.ac b/configure.ac index ea03fd4..9a637a5 100644 --- a/configure.ac +++ b/configure.ac @@ -99,29 +99,8 @@ AC_CHECK_HEADERS([sys/types.h sys/stat.h time.h]) LT_LIB_M -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"], [ - PKG_CHECK_MODULES([SQUAREBALL], [squareball], [ - SQUAREBALL="system" - ], [ - 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"]) +m4_include([squareball/squareball.m4]) +SQUAREBALL_INIT AC_CONFIG_FILES([ Makefile diff --git a/squareball b/squareball index d27a18a..4a189aa 160000 --- a/squareball +++ b/squareball @@ -1 +1 @@ -Subproject commit d27a18aa60af17504ddeb81f85407978bbbd06ed +Subproject commit 4a189aacfd7e89c99330a1cd4768352b3263428c -- cgit v1.2.3-18-g5258