tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-29 16:54:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

- (bal) split CFLAGS into CFLAGS and CPPFLAGS in configure.in and Makefile.

Browse Source 
Suggested by Wilfredo Sanchez <wsanchez@apple.com>
This commit is contained in:
Ben Lindstrom 2000-12-18 19:58:57 +00:00
parent 1004c7eb9e
commit 28bfc0da69
4 changed files with 42 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,5 +1,7 @@
20001218 20001218
- (stevesk) rsa.c: entropy.h not needed. - (stevesk) rsa.c: entropy.h not needed.
- (bal) split CFLAGS into CFLAGS and CPPFLAGS in configure.in and Makefile.
Suggested by Wilfredo Sanchez <wsanchez@apple.com>
20001216 20001216
- (stevesk) OpenBSD CVS updates: - (stevesk) OpenBSD CVS updates:

3
Makefile.in
View File

@ -20,7 +20,8 @@ ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass
CC=@CC@ CC=@CC@
LD=@LD@ LD=@LD@
PATHS=-DETCDIR=\"$(sysconfdir)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DSSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\" PATHS=-DETCDIR=\"$(sysconfdir)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DSSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\"
CFLAGS=@CFLAGS@ $(PATHS) @DEFS@ CFLAGS=@CFLAGS@
CPPFLAGS=@CPPFLAGS@ -I. -I$(srcdir) $(PATHS) @DEFS@
LIBS=@LIBS@ LIBS=@LIBS@
AR=@AR@ AR=@AR@
RANLIB=@RANLIB@ RANLIB=@RANLIB@

3
TODO
View File

@ -44,6 +44,9 @@ Clean up configure/makefiles:
- Replace the whole u_intXX_t evilness in acconfig.h with something better??? - Replace the whole u_intXX_t evilness in acconfig.h with something better???
- Consider splitting the u_intXX_t test for sys/bitype.h into seperate test
to allow people to (right/wrongfully) link against Bind directly.
- Move all "openbsd-compat" files to it's own directory. Consider doing the - Move all "openbsd-compat" files to it's own directory. Consider doing the
same with libssh. I don't think we need to split ssh, sshd, etc into their same with libssh. I don't think we need to split ssh, sshd, etc into their
own directory. own directory.

53
configure.in
View File

@ -41,13 +41,11 @@ if test "$GCC" = "yes"; then
CFLAGS="$CFLAGS -Wall" CFLAGS="$CFLAGS -Wall"
fi fi
CFLAGS="$CFLAGS -I. -I${srcdir-.}"
# Check for some target-specific stuff # Check for some target-specific stuff
case "$host" in case "$host" in
*-*-aix*) *-*-aix*)
AFS_LIBS="-lld" AFS_LIBS="-lld"
CFLAGS="$CFLAGS -I/usr/local/include" CPPFLAGS="$CPPFLAGS -I/usr/local/include"
LDFLAGS="$LDFLAGS -L/usr/local/lib" LDFLAGS="$LDFLAGS -L/usr/local/lib"
if (test "$LD" != "gcc" && test -z "$blibpath"); then if (test "$LD" != "gcc" && test -z "$blibpath"); then
blibpath="/usr/lib:/lib:/usr/local/lib" blibpath="/usr/lib:/lib:/usr/local/lib"
@ -77,7 +75,7 @@ case "$host" in
if test -z "$GCC"; then if test -z "$GCC"; then
CFLAGS="$CFLAGS -Ae" CFLAGS="$CFLAGS -Ae"
fi fi
CFLAGS="$CFLAGS -D_HPUX_SOURCE" CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE"
IPADDR_IN_DISPLAY=yes IPADDR_IN_DISPLAY=yes
AC_DEFINE(USE_PIPES) AC_DEFINE(USE_PIPES)
AC_DEFINE(DISABLE_SHADOW) AC_DEFINE(DISABLE_SHADOW)
@ -88,7 +86,7 @@ case "$host" in
mansubdir=cat mansubdir=cat
;; ;;
*-*-hpux11*) *-*-hpux11*)
CFLAGS="$CFLAGS -D_HPUX_SOURCE" CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE"
IPADDR_IN_DISPLAY=yes IPADDR_IN_DISPLAY=yes
AC_DEFINE(USE_PIPES) AC_DEFINE(USE_PIPES)
AC_DEFINE(DISABLE_SHADOW) AC_DEFINE(DISABLE_SHADOW)
@ -99,7 +97,7 @@ case "$host" in
mansubdir=cat mansubdir=cat
;; ;;
*-*-irix5*) *-*-irix5*)
CFLAGS="$CFLAGS -I/usr/local/include" CPPFLAGS="$CPPFLAGS -I/usr/local/include"
LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS"
PATH="$PATH:/usr/etc" PATH="$PATH:/usr/etc"
MANTYPE='$(CATMAN)' MANTYPE='$(CATMAN)'
@ -108,7 +106,7 @@ case "$host" in
AC_DEFINE(BROKEN_INET_NTOA) AC_DEFINE(BROKEN_INET_NTOA)
;; ;;
*-*-irix6*) *-*-irix6*)
CFLAGS="$CFLAGS -I/usr/local/include" CPPFLAGS="$CPPFLAGS -I/usr/local/include"
LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS"
PATH="$PATH:/usr/etc" PATH="$PATH:/usr/etc"
MANTYPE='$(CATMAN)' MANTYPE='$(CATMAN)'
@ -145,10 +143,10 @@ mips-sony-bsd|mips-sony-newsos4)
AC_DEFINE(HAVE_NEXT) AC_DEFINE(HAVE_NEXT)
AC_DEFINE(BROKEN_REALPATH) AC_DEFINE(BROKEN_REALPATH)
AC_DEFINE(USE_PIPES) AC_DEFINE(USE_PIPES)
CFLAGS="$CFLAGS -I/usr/local/include" CPPFLAGS="$CPPFLAGS -I/usr/local/include"
;; ;;
*-*-solaris*) *-*-solaris*)
CFLAGS="$CFLAGS -I/usr/local/include" CPPFLAGS="$CPPFLAGS -I/usr/local/include"
LDFLAGS="$LDFLAGS -L/usr/local/lib -R/usr/local/lib -L/usr/ucblib -R/usr/ucblib" LDFLAGS="$LDFLAGS -L/usr/local/lib -R/usr/local/lib -L/usr/ucblib -R/usr/ucblib"
need_dash_r=1 need_dash_r=1
# hardwire lastlog location (can't detect it on some versions) # hardwire lastlog location (can't detect it on some versions)
@ -164,7 +162,7 @@ mips-sony-bsd|mips-sony-newsos4)
fi fi
;; ;;
*-*-sunos4*) *-*-sunos4*)
CFLAGS="$CFLAGS -DSUNOS4" CPPFLAGS="$CPPFLAGS -DSUNOS4"
AC_CHECK_FUNCS(getpwanam) AC_CHECK_FUNCS(getpwanam)
conf_utmp_location=/etc/utmp conf_utmp_location=/etc/utmp
conf_wtmp_location=/var/adm/wtmp conf_wtmp_location=/var/adm/wtmp
@ -174,7 +172,7 @@ mips-sony-bsd|mips-sony-newsos4)
mansubdir=cat mansubdir=cat
;; ;;
*-sni-sysv*) *-sni-sysv*)
CFLAGS="$CFLAGS -I/usr/local/include" CPPFLAGS="$CPPFLAGS -I/usr/local/include"
LDFLAGS="$LDFLAGS -L/usr/local/lib -L/usr/ucblib" LDFLAGS="$LDFLAGS -L/usr/local/lib -L/usr/ucblib"
MANTYPE='$(CATMAN)' MANTYPE='$(CATMAN)'
AC_DEFINE(IP_TOS_IS_BROKEN) AC_DEFINE(IP_TOS_IS_BROKEN)
@ -182,7 +180,7 @@ mips-sony-bsd|mips-sony-newsos4)
LIBS="$LIBS -lgen -lnsl -lucb" LIBS="$LIBS -lgen -lnsl -lucb"
;; ;;
*-*-sysv4.2*) *-*-sysv4.2*)
CFLAGS="$CFLAGS -I/usr/local/include" CPPFLAGS="$CPPFLAGS -I/usr/local/include"
LDFLAGS="$LDFLAGS -L/usr/local/lib" LDFLAGS="$LDFLAGS -L/usr/local/lib"
MANTYPE='$(CATMAN)' MANTYPE='$(CATMAN)'
mansubdir=cat mansubdir=cat
@ -190,7 +188,7 @@ mips-sony-bsd|mips-sony-newsos4)
enable_suid_ssh=no enable_suid_ssh=no
;; ;;
*-*-sysv5*) *-*-sysv5*)
CFLAGS="$CFLAGS -I/usr/local/include" CPPFLAGS="$CPPFLAGS -I/usr/local/include"
LDFLAGS="$LDFLAGS -L/usr/local/lib" LDFLAGS="$LDFLAGS -L/usr/local/lib"
MANTYPE='$(CATMAN)' MANTYPE='$(CATMAN)'
mansubdir=cat mansubdir=cat
@ -198,7 +196,7 @@ mips-sony-bsd|mips-sony-newsos4)
enable_suid_ssh=no enable_suid_ssh=no
;; ;;
*-*-sysv*) *-*-sysv*)
CFLAGS="$CFLAGS -I/usr/local/include" CPPFLAGS="$CPPFLAGS -I/usr/local/include"
LDFLAGS="$LDFLAGS -L/usr/local/lib" LDFLAGS="$LDFLAGS -L/usr/local/lib"
MANTYPE='$(CATMAN)' MANTYPE='$(CATMAN)'
mansubdir=cat mansubdir=cat
@ -206,7 +204,7 @@ mips-sony-bsd|mips-sony-newsos4)
;; ;;
*-*-sco3.2v4*) *-*-sco3.2v4*)
AC_DEFINE(USE_PIPES) AC_DEFINE(USE_PIPES)
CFLAGS="$CFLAGS -Dftruncate=chsize -I/usr/local/include" CPPFLAGS="$CPPFLAGS -Dftruncate=chsize -I/usr/local/include"
LDFLAGS="$LDFLAGS -L/usr/local/lib" LDFLAGS="$LDFLAGS -L/usr/local/lib"
MANTYPE='$(CATMAN)' MANTYPE='$(CATMAN)'
mansubdir=cat mansubdir=cat
@ -219,7 +217,7 @@ mips-sony-bsd|mips-sony-newsos4)
AC_DEFINE(DISABLE_SHADOW) AC_DEFINE(DISABLE_SHADOW)
;; ;;
*-*-sco3.2v5*) *-*-sco3.2v5*)
CFLAGS="$CFLAGS -I/usr/local/include" CPPFLAGS="$CPPFLAGS -I/usr/local/include"
LDFLAGS="$LDFLAGS -L/usr/local/lib" LDFLAGS="$LDFLAGS -L/usr/local/lib"
MANTYPE='$(CATMAN)' MANTYPE='$(CATMAN)'
mansubdir=cat mansubdir=cat
@ -254,6 +252,14 @@ AC_ARG_WITH(cflags,
fi fi
] ]
) )
AC_ARG_WITH(cppflags,
[ --with-cppflags Specify additional flags to pass to preprocessor] ,
[
if test "x$withval" != "xno"; then
CPPFLAGS="$CPPFLAGS $withval"
fi
]
)
AC_ARG_WITH(ldflags, AC_ARG_WITH(ldflags,
[ --with-ldflags Specify additional flags to pass to linker], [ --with-ldflags Specify additional flags to pass to linker],
[ [
@ -396,7 +402,7 @@ AC_ARG_WITH(ssl-dir,
saved_LIBS="$LIBS" saved_LIBS="$LIBS"
saved_LDFLAGS="$LDFLAGS" saved_LDFLAGS="$LDFLAGS"
saved_CFLAGS="$CFLAGS" saved_CPPFLAGS="$CPPFLAGS"
if test "x$prefix" != "xNONE" ; then if test "x$prefix" != "xNONE" ; then
tryssldir="$tryssldir $prefix" tryssldir="$tryssldir $prefix"
fi fi
@ -405,7 +411,7 @@ AC_CACHE_CHECK([for OpenSSL directory], ac_cv_openssldir, [
for ssldir in $tryssldir "" /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl ; do for ssldir in $tryssldir "" /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl ; do
if test ! -z "$ssldir" ; then if test ! -z "$ssldir" ; then
LDFLAGS="$saved_LDFLAGS -L$ssldir/lib -L$ssldir" LDFLAGS="$saved_LDFLAGS -L$ssldir/lib -L$ssldir"
CFLAGS="$saved_CFLAGS -I$ssldir/include" CPPFLAGS="$saved_CPPFLAGS -I$ssldir/include"
if test ! -z "$need_dash_r" ; then if test ! -z "$need_dash_r" ; then
LDFLAGS="$LDFLAGS -R$ssldir/lib -R$ssldir" LDFLAGS="$LDFLAGS -R$ssldir/lib -R$ssldir"
fi fi
@ -454,7 +460,7 @@ if (test ! -z "$ac_cv_openssldir" && test "x$ac_cv_openssldir" != "x(system)") ;
AC_DEFINE(HAVE_OPENSSL) AC_DEFINE(HAVE_OPENSSL)
dnl Need to recover ssldir - test above runs in subshell dnl Need to recover ssldir - test above runs in subshell
ssldir=$ac_cv_openssldir ssldir=$ac_cv_openssldir
CFLAGS="$saved_CFLAGS -I$ssldir/include" CPPFLAGS="$saved_CPPFLAGS -I$ssldir/include"
LDFLAGS="$saved_LDFLAGS -L$ssldir/lib -L$ssldir" LDFLAGS="$saved_LDFLAGS -L$ssldir/lib -L$ssldir"
if test ! -z "$need_dash_r" ; then if test ! -z "$need_dash_r" ; then
LDFLAGS="$LDFLAGS -R$ssldir/lib -R$ssldir" LDFLAGS="$LDFLAGS -R$ssldir/lib -R$ssldir"
@ -1057,7 +1063,7 @@ AC_ARG_WITH(kerberos4,
if test "x$withval" != "xno" ; then if test "x$withval" != "xno" ; then
if test "x$withval" != "xyes" ; then if test "x$withval" != "xyes" ; then
CFLAGS="$CFLAGS -I${withval}/include" CPPFLAGS="$CPPFLAGS -I${withval}/include"
LDFLAGS="$LDFLAGS -L${withval}/lib" LDFLAGS="$LDFLAGS -L${withval}/lib"
if test ! -z "$need_dash_r" ; then if test ! -z "$need_dash_r" ; then
LDFLAGS="$LDFLAGS -R${withval}/lib" LDFLAGS="$LDFLAGS -R${withval}/lib"
@ -1067,7 +1073,7 @@ AC_ARG_WITH(kerberos4,
fi fi
else else
if test -d /usr/include/kerberosIV ; then if test -d /usr/include/kerberosIV ; then
CFLAGS="$CFLAGS -I/usr/include/kerberosIV" CPPFLAGS="$CPPFLAGS -I/usr/include/kerberosIV"
fi fi
fi fi
@ -1097,7 +1103,7 @@ AC_ARG_WITH(afs,
if test "x$withval" != "xno" ; then if test "x$withval" != "xno" ; then
if test "x$withval" != "xyes" ; then if test "x$withval" != "xyes" ; then
CFLAGS="$CFLAGS -I${withval}/include" CPPFLAGS="$CPPFLAGS -I${withval}/include"
LDFLAGS="$LDFLAGS -L${withval}/lib" LDFLAGS="$LDFLAGS -L${withval}/lib"
fi fi
@ -1124,7 +1130,7 @@ AC_ARG_WITH(skey,
if test "x$withval" != "xno" ; then if test "x$withval" != "xno" ; then
if test "x$withval" != "xyes" ; then if test "x$withval" != "xyes" ; then
CFLAGS="$CFLAGS -I${withval}/include" CPPFLAGS="$CPPFLAGS -I${withval}/include"
LDFLAGS="$LDFLAGS -L${withval}/lib" LDFLAGS="$LDFLAGS -L${withval}/lib"
fi fi
@ -1602,6 +1608,7 @@ echo ""
echo " Host: ${host}" echo " Host: ${host}"
echo " Compiler: ${CC}" echo " Compiler: ${CC}"
echo " Compiler flags: ${CFLAGS}" echo " Compiler flags: ${CFLAGS}"
echo "Preprocessor flags: ${CPPFLAGS}"
echo " Linker flags: ${LDFLAGS}" echo " Linker flags: ${LDFLAGS}"
echo " Libraries: ${LIBS}" echo " Libraries: ${LIBS}"