build: look for Perl in configure.

Bison uses "/usr/bin/perl" or "perl" in several places, and it does
not appear to be a problem.  But, at least to make it simpler to
change PERL on the make command line, check for perl in configure.

* configure.ac (PERL): New.
* doc/Doxyfile.in, doc/local.mk, examples/local.mk,
* tests/bison.in: Use it.

diff --git a/configure.ac b/configure.ac
index abe2a530dcdceb38c8a8e08eb02e288a119737ac..4005b50da4538ce1920e9d9075a03ad1e8a6e75a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -122,6 +122,10 @@ AC_PROG_GNU_M4
 AC_DEFINE_UNQUOTED([M4], ["$M4"], [Define to the GNU M4 executable name.])
 AC_DEFINE_UNQUOTED([M4_GNU_OPTION], ["$M4_GNU"], [Define to "-g" if GNU M4
 supports -g, otherwise to "".])
 AC_DEFINE_UNQUOTED([M4], ["$M4"], [Define to the GNU M4 executable name.])
 AC_DEFINE_UNQUOTED([M4_GNU_OPTION], ["$M4_GNU"], [Define to "-g" if GNU M4
 supports -g, otherwise to "".])

+AC_PATH_PROG([PERL], [perl])
+if test -z "$PERL"; then
+   AC_MSG_ERROR([perl not found])
+fi

 AM_MISSING_PROG([HELP2MAN], [help2man])
 AC_PATH_PROG([XSLTPROC], [xsltproc])
 AC_SUBST([XSLTPROC])
 AM_MISSING_PROG([HELP2MAN], [help2man])
 AC_PATH_PROG([XSLTPROC], [xsltproc])
 AC_SUBST([XSLTPROC])

diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 1c2fa95ef0fa28d4c96ea8c03508e1ecde9872f7..d9264f0f83ba2b2024238ae2555a7768c77ab6e4 100644 (file)
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -1579,7 +1579,7 @@ EXTERNAL_GROUPS        = YES
 # The PERL_PATH should be the absolute path and name of the perl script
 # interpreter (i.e. the result of `which perl').
 
 # The PERL_PATH should be the absolute path and name of the perl script
 # interpreter (i.e. the result of `which perl').
 

-PERL_PATH              = /usr/bin/perl
+PERL_PATH              = @PERL@

 
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool
 
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool

diff --git a/doc/local.mk b/doc/local.mk
index d5f8d2a4f58fd0ab8905360a60a79f9dee455f22..f7a96c2324f6e960a09d5609d930f901cc04e309 100644 (file)
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -36,7 +36,7 @@ $(CROSS_OPTIONS_TEXI): doc/bison.help $(CROSS_OPTIONS_PL)
        $(AM_V_GEN){ test ! -f $@ || cat $@; } >$@~
        $(AM_V_at)test ! -f $@.tmp || rm -f $@.tmp
        $(AM_V_at)src/bison$(EXEEXT) --help |                            \
        $(AM_V_GEN){ test ! -f $@ || cat $@; } >$@~
        $(AM_V_at)test ! -f $@.tmp || rm -f $@.tmp
        $(AM_V_at)src/bison$(EXEEXT) --help |                            \

-         perl $(CROSS_OPTIONS_PL) $(top_srcdir)/src/scan-gram.l >$@.tmp
+         $(PERL) $(CROSS_OPTIONS_PL) $(top_srcdir)/src/scan-gram.l >$@.tmp

        $(AM_V_at)diff -u $@~ $@.tmp || true
        $(AM_V_at)mv $@.tmp $@
 MAINTAINERCLEANFILES = $(CROSS_OPTIONS_TEXI)
        $(AM_V_at)diff -u $@~ $@.tmp || true
        $(AM_V_at)mv $@.tmp $@
 MAINTAINERCLEANFILES = $(CROSS_OPTIONS_TEXI)


@@ -127,6 +127,7 @@ html-local: doc/Doxyfile
 
 edit = sed -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
           -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
 
 edit = sed -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
           -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \

+          -e 's,@PERL\@,$(PERL),g' \

           -e 's,@top_builddir\@,$(top_builddir),g' \
           -e 's,@top_srcdir\@,$(top_srcdir),g'
 
           -e 's,@top_builddir\@,$(top_builddir),g' \
           -e 's,@top_srcdir\@,$(top_srcdir),g'
 

diff --git a/examples/local.mk b/examples/local.mk
index 680edfa1895dac61c4c38246dc12b51275923875..5ab8225b3078676e7c6f5a9022f3397359d68852 100644 (file)
--- a/examples/local.mk
+++ b/examples/local.mk
@@ -22,7 +22,6 @@ TEST_LOG_COMPILER = $(top_srcdir)/examples/test
 
 doc = $(top_srcdir)/doc/bison.texinfo
 extexi = $(top_srcdir)/examples/extexi
 
 doc = $(top_srcdir)/doc/bison.texinfo
 extexi = $(top_srcdir)/examples/extexi

-PERL = perl

 extract = VERSION="$(VERSION)" $(PERL) -f $(extexi) $(doc) --
 extracted =
 CLEANFILES += $(extracted) examples/extracted.stamp
 extract = VERSION="$(VERSION)" $(PERL) -f $(extexi) $(doc) --
 extracted =
 CLEANFILES += $(extracted) examples/extracted.stamp

diff --git a/tests/bison.in b/tests/bison.in
index 651178d316053b865f5fc8a93d9f2e8bb6bf0f8f..aedd75d99e58865992b2ee65a5cb6f835eeca3c0 100644 (file)
--- a/tests/bison.in
+++ b/tests/bison.in
@@ -19,6 +19,7 @@
 
 abs_top_srcdir='@abs_top_srcdir@'
 abs_top_builddir='@abs_top_builddir@'
 
 abs_top_srcdir='@abs_top_srcdir@'
 abs_top_builddir='@abs_top_builddir@'

+: ${PERL='@perl@'}

 
 # Use the shipped files, not those installed.
 BISON_PKGDATADIR=$abs_top_srcdir/data
 
 # Use the shipped files, not those installed.
 BISON_PKGDATADIR=$abs_top_srcdir/data


@@ -34,7 +35,6 @@ for i
 do
   case $i in
     */src/parse-gram.y)
 do
   case $i in
     */src/parse-gram.y)

-    : ${PERL=perl}

     if $PERL --version >/dev/null; then
       # We are called by ylwrap which still uses y.tab.*, and
       # post-processes the synclines on y.tab.c itself.  Don't let it
     if $PERL --version >/dev/null; then
       # We are called by ylwrap which still uses y.tab.*, and
       # post-processes the synclines on y.tab.c itself.  Don't let it