aboutsummaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorThomas White <taw@bitwiz.org.uk>2012-11-24 00:58:49 +0100
committerThomas White <taw@bitwiz.org.uk>2012-11-24 00:58:49 +0100
commitd340f99af34d5fb30d869b8be6104f8c0efcb7a6 (patch)
treea3fbbb304ce085e25cddc0a1e84e2313dae58b4b /configure.ac
parentffe74eda7496d02f1c7a35446b1479524b4b38e3 (diff)
Build system fixes
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac7
1 files changed, 6 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 2118a7d..5dac98b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ AM_PROG_CC_C_O
AC_PROG_AWK
AC_PROG_INSTALL
AC_PROG_LN_S
-AC_PROG_RANLIB
+LT_INIT
AM_SILENT_RULES([yes])
AC_HEADER_STDC
@@ -57,6 +57,9 @@ PKG_CHECK_MODULES([GDK_pixbuf], [gdk-pixbuf], [],
gl_IGNORE_UNUSED_LIBRARIES
+LIBHARFATUM_CFLAGS="$CFLAGS -D_GNU_SOURCE $Cairo_CFLAGS"
+LIBHARFATUM_LIBS="$LIBS $Cairo_LIBS"
+AC_SUBST([LIBHARFATUM_LIBS])
CFLAGS="$CFLAGS $GTK_CFLAGS -D_GNU_SOURCE $libPNG_CFLAGS $Cairo_CFLAGS"
CFLAGS="$CFLAGS $GDK_pixbuf_CFLAGS $GDK_pixbuf_2_CFLAGS"
@@ -66,4 +69,6 @@ LIBS="$LIBS $GDK_pixbuf_2_LIBS $LDFLAGS"
AC_CONFIG_FILES(Makefile lib/Makefile)
+AC_CONFIG_FILES(libstorycode/Makefile libstorycode/lib/Makefile)
+AC_CONFIG_FILES(harfatum/Makefile harfatum/lib/Makefile)
AC_OUTPUT