summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-03-05 16:22:59 +1100
committerDamien Miller <djm@mindrot.org>2000-03-05 16:22:59 +1100
commit9fb07e4b8baa291d7fda56e8621780cfd1fde287 (patch)
tree91aba95035988c58eda264de6707f8c3f03d1d61
parentfac99cd12a9b4480284c4d4229b2e842bc1065f7 (diff)
- Check for getpagesize in libucb.a if not found in libc. Fix for old
Solaris from Andre Lucas <andre.lucas@dial.pipex.com>
-rw-r--r--ChangeLog2
-rw-r--r--acconfig.h3
-rw-r--r--configure.in8
3 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e5511c91a..6a0e45148 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
120000305 120000305
2 - Fix DEC compile fix 2 - Fix DEC compile fix
3 - Explicitly seed OpenSSL's PRNG before checking rsa_alive() 3 - Explicitly seed OpenSSL's PRNG before checking rsa_alive()
4 - Check for getpagesize in libucb.a if not found in libc. Fix for old
5 Solaris from Andre Lucas <andre.lucas@dial.pipex.com>
4 6
520000303 720000303
6 - Added "make host-key" target, Suggestion from Dominik Brettnacher 8 - Added "make host-key" target, Suggestion from Dominik Brettnacher
diff --git a/acconfig.h b/acconfig.h
index 530c52815..b0414cd2b 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -92,6 +92,9 @@
92/* Define if your libraries define daemon() */ 92/* Define if your libraries define daemon() */
93#undef HAVE_DAEMON 93#undef HAVE_DAEMON
94 94
95/* Define if your libraries define getpagesize() */
96#undef HAVE_GETPAGESIZE
97
95/* Define if xauth is found in your path */ 98/* Define if xauth is found in your path */
96#undef XAUTH_PATH 99#undef XAUTH_PATH
97 100
diff --git a/configure.in b/configure.in
index c93811c75..c9bd33b02 100644
--- a/configure.in
+++ b/configure.in
@@ -62,6 +62,7 @@ case "$host" in
62 ;; 62 ;;
63*-*-solaris*) 63*-*-solaris*)
64 need_dash_r=1 64 need_dash_r=1
65 LDFLAGS="-L/usr/ucblib"
65 AC_DEFINE(USE_UTMPX) 66 AC_DEFINE(USE_UTMPX)
66 ;; 67 ;;
67*-*-sysv*) 68*-*-sysv*)
@@ -87,7 +88,7 @@ fi
87AC_CHECK_HEADERS(bstring.h endian.h lastlog.h login.h maillock.h netdb.h netgroup.h paths.h poll.h pty.h shadow.h security/pam_appl.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h sys/poll.h sys/select.h sys/stropts.h sys/sysmacros.h sys/time.h sys/ttcompat.h stddef.h util.h utmp.h utmpx.h) 88AC_CHECK_HEADERS(bstring.h endian.h lastlog.h login.h maillock.h netdb.h netgroup.h paths.h poll.h pty.h shadow.h security/pam_appl.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h sys/poll.h sys/select.h sys/stropts.h sys/sysmacros.h sys/time.h sys/ttcompat.h stddef.h util.h utmp.h utmpx.h)
88 89
89# Checks for library functions. 90# Checks for library functions.
90AC_CHECK_FUNCS(arc4random bindresvport_af freeaddrinfo gai_strerror getaddrinfo getpagesize getnameinfo innetgr md5_crypt mkdtemp openpty rresvport_af setenv seteuid setlogin setproctitle setreuid snprintf strlcat strlcpy updwtmpx vsnprintf _getpty) 91AC_CHECK_FUNCS(arc4random bindresvport_af freeaddrinfo gai_strerror getaddrinfo getnameinfo innetgr md5_crypt mkdtemp openpty rresvport_af setenv seteuid setlogin setproctitle setreuid snprintf strlcat strlcpy updwtmpx vsnprintf _getpty)
91 92
92AC_CHECK_FUNC(login, 93AC_CHECK_FUNC(login,
93 [AC_DEFINE(HAVE_LOGIN)], 94 [AC_DEFINE(HAVE_LOGIN)],
@@ -99,6 +100,11 @@ AC_CHECK_FUNC(daemon,
99 [AC_CHECK_LIB(bsd, daemon, [LIBS="$LIBS -lbsd"; AC_DEFINE(HAVE_DAEMON)])] 100 [AC_CHECK_LIB(bsd, daemon, [LIBS="$LIBS -lbsd"; AC_DEFINE(HAVE_DAEMON)])]
100) 101)
101 102
103AC_CHECK_FUNC(getpagesize,
104 [AC_DEFINE(HAVE_GETPAGESIZE)],
105 [AC_CHECK_LIB(ucb, getpagesize, [LIBS="$LIBS -lucb"; AC_DEFINE(HAVE_GETPAGESIZE)])]
106)
107
102AC_ARG_WITH(pam, 108AC_ARG_WITH(pam,
103 [ --without-pam Disable PAM support ], 109 [ --without-pam Disable PAM support ],
104 [ 110 [