Mercurial > hg > xemacs-beta
diff configure.ac @ 5744:9c17f7be0b92
Require makeinfo 4.12 or later to build the info files. See xemacs-beta
message <CAD3FetiVVt_Lw8D6PCeA=_kwFbp8L0h9Y0LSA5QYL5BxxF=fWw@mail.gmail.com>
for the original bug report, and xemacs-patches message
<CAHCOHQm63J403HSyakhpxoO5jTO_OZ5-0rkgT36xbnTs0G3H8Q@mail.gmail.com>.
| author | Jerry James <james@xemacs.org> |
|---|---|
| date | Tue, 25 Jun 2013 15:31:58 -0600 |
| parents | a2912073be85 |
| children | 3ccb4aaf91c7 |
line wrap: on
line diff
--- a/configure.ac Sat Jun 22 09:06:34 2013 +0900 +++ b/configure.ac Tue Jun 25 15:31:58 2013 -0600 @@ -2586,6 +2586,27 @@ AC_PROG_INSTALL AC_PROG_YACC +dnl We need a recent version of makeinfo +AC_MSG_CHECKING([for makeinfo >= 4.12]) +MAKEINFO= +for prog in `which -a makeinfo`; do + mi_verstr=[`$prog --version | sed -rn '1s/.*+[[:blank:]]([^[:blank:]]+)$/\1/p'`] + mi_major=`echo $mi_verstr | cut -d. -f1` + mi_minor=`echo $mi_verstr | cut -d. -f2` + if test $mi_major -gt 4 || ( test $mi_major -eq 4 && test $mi_minor -gt 11 ); + then + MAKEINFO=$prog + break + fi +done +if test -z $MAKEINFO; then + AC_MSG_RESULT([no]) + AC_MSG_WARN([Makeinfo 4.12 or later required to build info files.]) +else + AC_MSG_RESULT([yes]) +fi +AC_CONFIG_FILES([man/Makefile]) + dnl checks for header files AC_CHECK_HEADERS(dnl a.out.h dnl @@ -5558,7 +5579,8 @@ AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS) AC_SUBST(LDFLAGS) -RECURSIVE_MAKE_ARGS="\$(MFLAGS) CC='\$(CC)' CFLAGS='\$(CFLAGS)' LDFLAGS='\$(LDFLAGS)' CPPFLAGS='\$(CPPFLAGS)'" +AC_SUBST(MAKEINFO) +RECURSIVE_MAKE_ARGS="\$(MFLAGS) CC='\$(CC)' CFLAGS='\$(CFLAGS)' LDFLAGS='\$(LDFLAGS)' CPPFLAGS='\$(CPPFLAGS)' MAKEINFO='\$(MAKEINFO)'" AC_SUBST(RECURSIVE_MAKE_ARGS) AC_SUBST(native_sound_lib,$with_native_sound_lib)