configure: Add the m4 macros directories correctly.

Signed-off-by: Thanh Tung Nguyen <thngtong@gmail.com>
[rebased, reworded the commit message]
Signed-off-by: Andrew Shadura <andrew.shadura@collabora.co.uk>
This commit is contained in:
Thanh Tung Nguyen 2015-12-25 17:43:08 +00:00 committed by Andrew Shadura
parent 1a8204254a
commit 48d5e25d03
2 changed files with 5 additions and 2 deletions

View file

@ -1,3 +1,5 @@
ACLOCAL_AMFLAGS = -I build/m4/sparkleshare -I build/m4/shamrock -I build/m4/shave
basedirs = build Sparkles Sparkles/Git
SUBDIRS = $(basedirs) $(GUISUBDIRS)

View file

@ -5,6 +5,9 @@ AC_PREREQ([2.54])
AC_INIT([SparkleShare], sparkleshare_version)
AM_INIT_AUTOMAKE([1.11 dist-bzip2 dist-zip foreign tar-pax])
AM_MAINTAINER_MODE
LT_INIT
AC_CONFIG_MACRO_DIRS([build/m4/sparkleshare build/m4/shamrock build/m4/shave])
dnl Export Version Info
AC_SUBST([ASM_VERSION], [sparkleshare_version])
@ -15,8 +18,6 @@ if test "x$PKG_CONFIG" = "xno"; then
AC_MSG_ERROR([pkg-config is not installed])
fi
AC_SUBST([ACLOCAL_AMFLAGS], ["-I build/m4/sparkleshare -I build/m4/shamrock -I build/m4/shave \${ACLOCAL_FLAGS}"])
SHAMROCK_EXPAND_LIBDIR
SHAMROCK_EXPAND_BINDIR
SHAMROCK_EXPAND_DATADIR