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:
parent
1a8204254a
commit
48d5e25d03
|
@ -1,3 +1,5 @@
|
||||||
|
ACLOCAL_AMFLAGS = -I build/m4/sparkleshare -I build/m4/shamrock -I build/m4/shave
|
||||||
|
|
||||||
basedirs = build Sparkles Sparkles/Git
|
basedirs = build Sparkles Sparkles/Git
|
||||||
|
|
||||||
SUBDIRS = $(basedirs) $(GUISUBDIRS)
|
SUBDIRS = $(basedirs) $(GUISUBDIRS)
|
||||||
|
|
|
@ -5,6 +5,9 @@ AC_PREREQ([2.54])
|
||||||
AC_INIT([SparkleShare], sparkleshare_version)
|
AC_INIT([SparkleShare], sparkleshare_version)
|
||||||
AM_INIT_AUTOMAKE([1.11 dist-bzip2 dist-zip foreign tar-pax])
|
AM_INIT_AUTOMAKE([1.11 dist-bzip2 dist-zip foreign tar-pax])
|
||||||
AM_MAINTAINER_MODE
|
AM_MAINTAINER_MODE
|
||||||
|
LT_INIT
|
||||||
|
|
||||||
|
AC_CONFIG_MACRO_DIRS([build/m4/sparkleshare build/m4/shamrock build/m4/shave])
|
||||||
|
|
||||||
dnl Export Version Info
|
dnl Export Version Info
|
||||||
AC_SUBST([ASM_VERSION], [sparkleshare_version])
|
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])
|
AC_MSG_ERROR([pkg-config is not installed])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_SUBST([ACLOCAL_AMFLAGS], ["-I build/m4/sparkleshare -I build/m4/shamrock -I build/m4/shave \${ACLOCAL_FLAGS}"])
|
|
||||||
|
|
||||||
SHAMROCK_EXPAND_LIBDIR
|
SHAMROCK_EXPAND_LIBDIR
|
||||||
SHAMROCK_EXPAND_BINDIR
|
SHAMROCK_EXPAND_BINDIR
|
||||||
SHAMROCK_EXPAND_DATADIR
|
SHAMROCK_EXPAND_DATADIR
|
||||||
|
|
Loading…
Reference in a new issue