summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog8
-rw-r--r--configure.ac264
2 files changed, 139 insertions, 133 deletions
diff --git a/ChangeLog b/ChangeLog
index d7160af3a..8bfd2b878 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
120061003
2 - (tim) [configure.ac] Move CHECK_HEADERS test before platform specific
3 section so additional platform specific CHECK_HEADER tests will work
4 correctly. Fixes "<net/if_tap.h> on FreeBSD" problem report by des AT des.no
5 Feedback and "seems like a good idea" dtucker@
6
120061001 720061001
2 - (dtucker) [audit-bsm.c] Include errno.h. Pointed out by des at des.no. 8 - (dtucker) [audit-bsm.c] Include errno.h. Pointed out by des at des.no.
3 9
@@ -2509,4 +2515,4 @@
2509 OpenServer 6 and add osr5bigcrypt support so when someone migrates 2515 OpenServer 6 and add osr5bigcrypt support so when someone migrates
2510 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 2516 passwords between UnixWare and OpenServer they will still work. OK dtucker@
2511 2517
2512$Id: ChangeLog,v 1.4565 2006/09/30 22:09:50 dtucker Exp $ 2518$Id: ChangeLog,v 1.4566 2006/10/03 16:34:35 tim Exp $
diff --git a/configure.ac b/configure.ac
index 883708559..ecfa50c4b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.368 2006/09/29 10:16:51 dtucker Exp $ 1# $Id: configure.ac,v 1.369 2006/10/03 16:34:35 tim Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -15,7 +15,7 @@
15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 16
17AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) 17AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
18AC_REVISION($Revision: 1.368 $) 18AC_REVISION($Revision: 1.369 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20 20
21AC_CONFIG_HEADER(config.h) 21AC_CONFIG_HEADER(config.h)
@@ -127,6 +127,136 @@ AC_ARG_WITH(rpath,
127 ] 127 ]
128) 128)
129 129
130# Allow user to specify flags
131AC_ARG_WITH(cflags,
132 [ --with-cflags Specify additional flags to pass to compiler],
133 [
134 if test -n "$withval" && test "x$withval" != "xno" && \
135 test "x${withval}" != "xyes"; then
136 CFLAGS="$CFLAGS $withval"
137 fi
138 ]
139)
140AC_ARG_WITH(cppflags,
141 [ --with-cppflags Specify additional flags to pass to preprocessor] ,
142 [
143 if test -n "$withval" && test "x$withval" != "xno" && \
144 test "x${withval}" != "xyes"; then
145 CPPFLAGS="$CPPFLAGS $withval"
146 fi
147 ]
148)
149AC_ARG_WITH(ldflags,
150 [ --with-ldflags Specify additional flags to pass to linker],
151 [
152 if test -n "$withval" && test "x$withval" != "xno" && \
153 test "x${withval}" != "xyes"; then
154 LDFLAGS="$LDFLAGS $withval"
155 fi
156 ]
157)
158AC_ARG_WITH(libs,
159 [ --with-libs Specify additional libraries to link with],
160 [
161 if test -n "$withval" && test "x$withval" != "xno" && \
162 test "x${withval}" != "xyes"; then
163 LIBS="$LIBS $withval"
164 fi
165 ]
166)
167AC_ARG_WITH(Werror,
168 [ --with-Werror Build main code with -Werror],
169 [
170 if test -n "$withval" && test "x$withval" != "xno"; then
171 werror_flags="-Werror"
172 if test "x${withval}" != "xyes"; then
173 werror_flags="$withval"
174 fi
175 fi
176 ]
177)
178
179AC_CHECK_HEADERS( \
180 bstring.h \
181 crypt.h \
182 crypto/sha2.h \
183 dirent.h \
184 endian.h \
185 features.h \
186 fcntl.h \
187 floatingpoint.h \
188 getopt.h \
189 glob.h \
190 ia.h \
191 iaf.h \
192 limits.h \
193 login.h \
194 maillock.h \
195 ndir.h \
196 net/if_tun.h \
197 netdb.h \
198 netgroup.h \
199 pam/pam_appl.h \
200 paths.h \
201 pty.h \
202 readpassphrase.h \
203 rpc/types.h \
204 security/pam_appl.h \
205 sha2.h \
206 shadow.h \
207 stddef.h \
208 stdint.h \
209 string.h \
210 strings.h \
211 sys/audit.h \
212 sys/bitypes.h \
213 sys/bsdtty.h \
214 sys/cdefs.h \
215 sys/dir.h \
216 sys/mman.h \
217 sys/ndir.h \
218 sys/prctl.h \
219 sys/pstat.h \
220 sys/select.h \
221 sys/stat.h \
222 sys/stream.h \
223 sys/stropts.h \
224 sys/strtio.h \
225 sys/sysmacros.h \
226 sys/time.h \
227 sys/timers.h \
228 sys/un.h \
229 time.h \
230 tmpdir.h \
231 ttyent.h \
232 unistd.h \
233 usersec.h \
234 util.h \
235 utime.h \
236 utmp.h \
237 utmpx.h \
238 vis.h \
239)
240
241# lastlog.h requires sys/time.h to be included first on Solaris
242AC_CHECK_HEADERS(lastlog.h, [], [], [
243#ifdef HAVE_SYS_TIME_H
244# include <sys/time.h>
245#endif
246])
247
248# sys/ptms.h requires sys/stream.h to be included first on Solaris
249AC_CHECK_HEADERS(sys/ptms.h, [], [], [
250#ifdef HAVE_SYS_STREAM_H
251# include <sys/stream.h>
252#endif
253])
254
255# login_cap.h requires sys/types.h on NetBSD
256AC_CHECK_HEADERS(login_cap.h, [], [], [
257#include <sys/types.h>
258])
259
130# Messages for features tested for in target-specific section 260# Messages for features tested for in target-specific section
131SIA_MSG="no" 261SIA_MSG="no"
132SPC_MSG="no" 262SPC_MSG="no"
@@ -663,55 +793,6 @@ mips-sony-bsd|mips-sony-newsos4)
663 ;; 793 ;;
664esac 794esac
665 795
666# Allow user to specify flags
667AC_ARG_WITH(cflags,
668 [ --with-cflags Specify additional flags to pass to compiler],
669 [
670 if test -n "$withval" && test "x$withval" != "xno" && \
671 test "x${withval}" != "xyes"; then
672 CFLAGS="$CFLAGS $withval"
673 fi
674 ]
675)
676AC_ARG_WITH(cppflags,
677 [ --with-cppflags Specify additional flags to pass to preprocessor] ,
678 [
679 if test -n "$withval" && test "x$withval" != "xno" && \
680 test "x${withval}" != "xyes"; then
681 CPPFLAGS="$CPPFLAGS $withval"
682 fi
683 ]
684)
685AC_ARG_WITH(ldflags,
686 [ --with-ldflags Specify additional flags to pass to linker],
687 [
688 if test -n "$withval" && test "x$withval" != "xno" && \
689 test "x${withval}" != "xyes"; then
690 LDFLAGS="$LDFLAGS $withval"
691 fi
692 ]
693)
694AC_ARG_WITH(libs,
695 [ --with-libs Specify additional libraries to link with],
696 [
697 if test -n "$withval" && test "x$withval" != "xno" && \
698 test "x${withval}" != "xyes"; then
699 LIBS="$LIBS $withval"
700 fi
701 ]
702)
703AC_ARG_WITH(Werror,
704 [ --with-Werror Build main code with -Werror],
705 [
706 if test -n "$withval" && test "x$withval" != "xno"; then
707 werror_flags="-Werror"
708 if test "x${withval}" != "xyes"; then
709 werror_flags="$withval"
710 fi
711 fi
712 ]
713)
714
715AC_MSG_CHECKING(compiler and flags for sanity) 796AC_MSG_CHECKING(compiler and flags for sanity)
716AC_RUN_IFELSE( 797AC_RUN_IFELSE(
717 [AC_LANG_SOURCE([ 798 [AC_LANG_SOURCE([
@@ -727,87 +808,6 @@ int main(){exit(0);}
727) 808)
728 809
729dnl Checks for header files. 810dnl Checks for header files.
730AC_CHECK_HEADERS( \
731 bstring.h \
732 crypt.h \
733 crypto/sha2.h \
734 dirent.h \
735 endian.h \
736 features.h \
737 fcntl.h \
738 floatingpoint.h \
739 getopt.h \
740 glob.h \
741 ia.h \
742 iaf.h \
743 limits.h \
744 login.h \
745 maillock.h \
746 ndir.h \
747 net/if_tun.h \
748 netdb.h \
749 netgroup.h \
750 pam/pam_appl.h \
751 paths.h \
752 pty.h \
753 readpassphrase.h \
754 rpc/types.h \
755 security/pam_appl.h \
756 sha2.h \
757 shadow.h \
758 stddef.h \
759 stdint.h \
760 string.h \
761 strings.h \
762 sys/audit.h \
763 sys/bitypes.h \
764 sys/bsdtty.h \
765 sys/cdefs.h \
766 sys/dir.h \
767 sys/mman.h \
768 sys/ndir.h \
769 sys/prctl.h \
770 sys/pstat.h \
771 sys/select.h \
772 sys/stat.h \
773 sys/stream.h \
774 sys/stropts.h \
775 sys/strtio.h \
776 sys/sysmacros.h \
777 sys/time.h \
778 sys/timers.h \
779 sys/un.h \
780 time.h \
781 tmpdir.h \
782 ttyent.h \
783 unistd.h \
784 usersec.h \
785 util.h \
786 utime.h \
787 utmp.h \
788 utmpx.h \
789 vis.h \
790)
791
792# lastlog.h requires sys/time.h to be included first on Solaris
793AC_CHECK_HEADERS(lastlog.h, [], [], [
794#ifdef HAVE_SYS_TIME_H
795# include <sys/time.h>
796#endif
797])
798
799# sys/ptms.h requires sys/stream.h to be included first on Solaris
800AC_CHECK_HEADERS(sys/ptms.h, [], [], [
801#ifdef HAVE_SYS_STREAM_H
802# include <sys/stream.h>
803#endif
804])
805
806# login_cap.h requires sys/types.h on NetBSD
807AC_CHECK_HEADERS(login_cap.h, [], [], [
808#include <sys/types.h>
809])
810
811# Checks for libraries. 811# Checks for libraries.
812AC_CHECK_FUNC(yp_match, , AC_CHECK_LIB(nsl, yp_match)) 812AC_CHECK_FUNC(yp_match, , AC_CHECK_LIB(nsl, yp_match))
813AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt)) 813AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt))
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-14 05:44:51 +0000