summaryrefslogtreecommitdiff
path: root/guile-readline
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2007-07-29 14:58:21 +0000
committerLudovic Courtès <ludo@gnu.org>2007-07-29 14:58:21 +0000
commit6caac03c93f3c0657a9487ee175b2779eae0f747 (patch)
tree6ce7faaa1aac04c3a283ada14f00f32df266c327 /guile-readline
parentf6b4d9b42eeabd38068bf18ae612c20c723b5368 (diff)
Changes from arch/CVS synchronization
Diffstat (limited to 'guile-readline')
-rw-r--r--guile-readline/ChangeLog6
-rw-r--r--guile-readline/Makefile.am10
2 files changed, 12 insertions, 4 deletions
diff --git a/guile-readline/ChangeLog b/guile-readline/ChangeLog
index 94cd83e71..a599a6699 100644
--- a/guile-readline/ChangeLog
+++ b/guile-readline/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-29 Ludovic Courtès <ludo@gnu.org>
+
+ * Makefile.am (INCLUDES): Add Gnulib includes.
+ (libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_LIBADD): Added
+ `../lib/libgnu.la'.
+
2007-07-15 Ludovic Courtès <ludo@gnu.org>
* LIBGUILEREADLINE-VERSION
diff --git a/guile-readline/Makefile.am b/guile-readline/Makefile.am
index f1f038755..50523e5b3 100644
--- a/guile-readline/Makefile.am
+++ b/guile-readline/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with Automake to create Makefile.in
##
-## Copyright (C) 1998, 1999, 2000, 2001, 2004, 2006 Free Software Foundation, Inc.
+## Copyright (C) 1998, 1999, 2000, 2001, 2004, 2006, 2007 Free Software Foundation, Inc.
##
## This file is part of GUILE.
##
@@ -25,15 +25,17 @@ SUBDIRS = ice-9
DEFS = @DEFS@ @EXTRA_DEFS@
## Check for headers in $(srcdir)/.., so that #include
## <libguile/MUMBLE.h> will find MUMBLE.h in this dir when we're
-## building.
-INCLUDES = -I. -I.. -I$(srcdir)/..
+## building. Also look for Gnulib headers in `lib'.
+INCLUDES = -I. -I.. -I$(srcdir)/.. \
+ -I$(top_srcdir)/lib -I$(top_builddir)/lib
GUILE_SNARF = ../libguile/guile-snarf
lib_LTLIBRARIES = libguilereadline-v-@LIBGUILEREADLINE_MAJOR@.la
libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_SOURCES = readline.c
-libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_LIBADD = ../libguile/libguile.la
+libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_LIBADD = \
+ ../libguile/libguile.la ../lib/libgnu.la
libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_LDFLAGS = -version-info @LIBGUILEREADLINE_INTERFACE@ -export-dynamic -no-undefined