diff options
Diffstat (limited to 'guile-readline')
-rw-r--r-- | guile-readline/Makefile.in | 3 | ||||
-rw-r--r-- | guile-readline/aclocal.m4 | 9 | ||||
-rwxr-xr-x | guile-readline/configure | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/guile-readline/Makefile.in b/guile-readline/Makefile.in index f4577e121..c0e269c07 100644 --- a/guile-readline/Makefile.in +++ b/guile-readline/Makefile.in @@ -82,6 +82,8 @@ lib_LTLIBRARIES = libguilereadline.la libguilereadline_la_SOURCES = readline.h readline.c +BUILT_SOURCES = readline.x + scmdir = $(datadir)/guile scm_DATA = readline-activator.scm @@ -367,6 +369,7 @@ distclean-generic: -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean-am: mostlyclean-libLTLIBRARIES mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ mostlyclean-generic diff --git a/guile-readline/aclocal.m4 b/guile-readline/aclocal.m4 index e93667054..3172a65b4 100644 --- a/guile-readline/aclocal.m4 +++ b/guile-readline/aclocal.m4 @@ -103,7 +103,7 @@ fi AC_SUBST($1)]) -# serial 39 AC_PROG_LIBTOOL +# serial 40 AC_PROG_LIBTOOL AC_DEFUN(AC_PROG_LIBTOOL, [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl @@ -464,6 +464,7 @@ AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; esac LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la + INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl']) ]) # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for @@ -487,9 +488,11 @@ AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl if test x"$enable_ltdl_install" = x"yes"; then ac_configure_args="$ac_configure_args --enable-ltdl-install" LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la + INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl']) else ac_configure_args="$ac_configure_args --enable-ltdl-install=no" LIBLTDL="-lltdl" + INCLTDL= fi ]) @@ -502,6 +505,6 @@ AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl -dnl This is just to quiet aclocal about the macro not being used -if(a,b,[AC_DISABLE_FAST_INSTALL])dnl +dnl This is just to silence aclocal about the macro not being used +ifelse([AC_DISABLE_FAST_INSTALL])dnl diff --git a/guile-readline/configure b/guile-readline/configure index efe2ca952..278721f94 100755 --- a/guile-readline/configure +++ b/guile-readline/configure @@ -1545,7 +1545,7 @@ else fi if test $ac_cv_lib_readline_main = no; then - { echo "configure: error: libreadline was not found on your system." 1>&2; exit 1; } + echo "configure: warning: libreadline was not found on your system." 1>&2 fi for ac_func in rl_clear_signals rl_cleanup_after_signal |