summaryrefslogtreecommitdiff
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 a61a18cd6..680462f5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
2 - Applied another NetBSD portability patch from David Rankin 2 - Applied another NetBSD portability patch from David Rankin
3 <drankin@bohemians.lexington.ky.us> 3 <drankin@bohemians.lexington.ky.us>
4 - Fix --with-default-path option. 4 - Fix --with-default-path option.
5 - Autodetect perl, patch from David Rankin
6 <drankin@bohemians.lexington.ky.us>
5 7
619991228 819991228
7 - Replacement for getpagesize() for systems which lack it 9 - Replacement for getpagesize() for systems which lack it
diff --git a/Makefile.in b/Makefile.in
index 2f2e31e81..72ac0a81e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -25,6 +25,7 @@ LIBWRAP=@LIBWRAP@
25AR=@AR@ 25AR=@AR@
26RANLIB=@RANLIB@ 26RANLIB=@RANLIB@
27INSTALL=@INSTALL@ 27INSTALL=@INSTALL@
28PERL=@PERL@
28LDFLAGS=-L. @LDFLAGS@ 29LDFLAGS=-L. @LDFLAGS@
29 30
30GNOME_CFLAGS=`gnome-config --cflags gnome gnomeui` 31GNOME_CFLAGS=`gnome-config --cflags gnome gnomeui`
@@ -89,7 +90,7 @@ clean:
89 *.1 *.8 sshd_config ssh_config 90 *.1 *.8 sshd_config ssh_config
90 91
91manpages: 92manpages:
92 $(FIXPATHS) -Dsysconfdir=${sysconfdir} $(srcdir)/*.1.in $(srcdir)/*.8.in \ 93 $(PERL) $(FIXPATHS) -Dsysconfdir=${sysconfdir} $(srcdir)/*.1.in $(srcdir)/*.8.in \
93 $(srcdir)/ssh_config.in $(srcdir)/sshd_config.in 94 $(srcdir)/ssh_config.in $(srcdir)/sshd_config.in
94 95
95install: all 96install: all
diff --git a/configure.in b/configure.in
index 6d03beca7..ae8afdf4d 100644
--- a/configure.in
+++ b/configure.in
@@ -9,6 +9,8 @@ AC_PROG_CPP
9AC_PROG_RANLIB 9AC_PROG_RANLIB
10AC_PROG_INSTALL 10AC_PROG_INSTALL
11AC_CHECK_PROG(AR, ar, ar) 11AC_CHECK_PROG(AR, ar, ar)
12AC_PATH_PROG(PERL, perl)
13AC_SUBST(PERL)
12AC_PATH_PROG(xauth_path, xauth) 14AC_PATH_PROG(xauth_path, xauth)
13 15
14dnl Use ip address instead of hostname in $DISPLAY 16dnl Use ip address instead of hostname in $DISPLAY