summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>1999-12-29 10:03:37 +1100
committerDamien Miller <djm@mindrot.org>1999-12-29 10:03:37 +1100
commite79334a2b06d4c897c4b764e5e94af72320e3ea9 (patch)
treeab7a0c37678f1967601f3884997996fedefdb480
parent9550a76c3716acc1a591dd9604cbc958a92ad891 (diff)
- Autodetect perl, patch from David Rankin
<drankin@bohemians.lexington.ky.us>
-rw-r--r--ChangeLog2
-rw-r--r--Makefile.in3
-rw-r--r--configure.in2
3 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a61a18cd..680462f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
- Applied another NetBSD portability patch from David Rankin
<drankin@bohemians.lexington.ky.us>
- Fix --with-default-path option.
+ - Autodetect perl, patch from David Rankin
+ <drankin@bohemians.lexington.ky.us>
19991228
- Replacement for getpagesize() for systems which lack it
diff --git a/Makefile.in b/Makefile.in
index 2f2e31e8..72ac0a81 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -25,6 +25,7 @@ LIBWRAP=@LIBWRAP@
AR=@AR@
RANLIB=@RANLIB@
INSTALL=@INSTALL@
+PERL=@PERL@
LDFLAGS=-L. @LDFLAGS@
GNOME_CFLAGS=`gnome-config --cflags gnome gnomeui`
@@ -89,7 +90,7 @@ clean:
*.1 *.8 sshd_config ssh_config
manpages:
- $(FIXPATHS) -Dsysconfdir=${sysconfdir} $(srcdir)/*.1.in $(srcdir)/*.8.in \
+ $(PERL) $(FIXPATHS) -Dsysconfdir=${sysconfdir} $(srcdir)/*.1.in $(srcdir)/*.8.in \
$(srcdir)/ssh_config.in $(srcdir)/sshd_config.in
install: all
diff --git a/configure.in b/configure.in
index 6d03beca..ae8afdf4 100644
--- a/configure.in
+++ b/configure.in
@@ -9,6 +9,8 @@ AC_PROG_CPP
AC_PROG_RANLIB
AC_PROG_INSTALL
AC_CHECK_PROG(AR, ar, ar)
+AC_PATH_PROG(PERL, perl)
+AC_SUBST(PERL)
AC_PATH_PROG(xauth_path, xauth)
dnl Use ip address instead of hostname in $DISPLAY