Attachment 298 Details for Bug 77 – Remove /usr/local as implicit include/library search path

[patch] Remove /usr/local as implicit include/library search path

configure-nolocal.diff (text/plain), 4.68 KB, created by Damien Miller on 2003-05-15 18:21:32 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2003-05-15 18:21:32 AEST

Size: 4.68 KB

patch

obsolete

>Index: configure.ac
>===================================================================
>RCS file: /var/cvs/openssh/configure.ac,v
>retrieving revision 1.120
>diff -u -r1.120 configure.ac
>--- configure.ac	15 May 2003 02:27:08 -0000	1.120
>+++ configure.ac	15 May 2003 08:20:43 -0000
>@@ -55,11 +55,11 @@
> case "$host" in
> *-*-aix*)
> 	AFS_LIBS="-lld"
>-	CPPFLAGS="$CPPFLAGS -I/usr/local/include"
>-	LDFLAGS="$LDFLAGS -L/usr/local/lib"
>+	CPPFLAGS="$CPPFLAGS"
>+	LDFLAGS="$LDFLAGS"
> 	AC_MSG_CHECKING([how to specify blibpath for linker ($LD)]) 
> 	if (test -z "$blibpath"); then
>-		blibpath="/usr/lib:/lib:/usr/local/lib"
>+		blibpath="/usr/lib:/lib"
> 	fi
> 	saved_LDFLAGS="$LDFLAGS"
> 	for tryflags in -blibpath: -Wl,-blibpath: -Wl,-rpath, ;do
>@@ -163,14 +163,14 @@
> 	AC_CHECK_LIB(xnet, t_error, ,AC_MSG_ERROR([*** -lxnet needed on HP-UX - check config.log ***]))
> 	;;
> *-*-irix5*)
>-	CPPFLAGS="$CPPFLAGS -I/usr/local/include"
>+	CPPFLAGS="$CPPFLAGS"
> 	LDFLAGS="$LDFLAGS"
> 	PATH="$PATH:/usr/etc"
> 	AC_DEFINE(BROKEN_INET_NTOA)
> 	AC_DEFINE(WITH_ABBREV_NO_TTY)
> 	;;
> *-*-irix6*)
>-	CPPFLAGS="$CPPFLAGS -I/usr/local/include"
>+	CPPFLAGS="$CPPFLAGS"
> 	LDFLAGS="$LDFLAGS"
> 	PATH="$PATH:/usr/etc"
> 	AC_DEFINE(WITH_IRIX_ARRAY)
>@@ -260,12 +260,12 @@
> 	AC_DEFINE(BROKEN_REALPATH)
> 	AC_DEFINE(USE_PIPES)
> 	AC_DEFINE(BROKEN_SAVED_UIDS)
>-	CPPFLAGS="$CPPFLAGS -I/usr/local/include"
>+	CPPFLAGS="$CPPFLAGS"
> 	CFLAGS="$CFLAGS"
> 	;;
> *-*-solaris*)
>-	CPPFLAGS="$CPPFLAGS -I/usr/local/include"
>-	LDFLAGS="$LDFLAGS -L/usr/local/lib -R/usr/local/lib" 
>+	CPPFLAGS="$CPPFLAGS"
>+	LDFLAGS="$LDFLAGS" 
> 	need_dash_r=1
> 	AC_DEFINE(PAM_SUN_CODEBASE)
> 	AC_DEFINE(LOGIN_NEEDS_UTMPX)
>@@ -295,15 +295,15 @@
> 	AC_DEFINE(USE_PIPES)
> 	;;
> *-ncr-sysv*)
>-	CPPFLAGS="$CPPFLAGS -I/usr/local/include"
>-	LDFLAGS="$LDFLAGS -L/usr/local/lib"
>+	CPPFLAGS="$CPPFLAGS"
>+	LDFLAGS="$LDFLAGS"
> 	LIBS="$LIBS -lc89"
> 	AC_DEFINE(USE_PIPES)
> 	;;
> *-sni-sysv*)
>-	CPPFLAGS="$CPPFLAGS -I/usr/local/include"
>+	CPPFLAGS="$CPPFLAGS"
> 	# /usr/ucblib MUST NOT be searched on ReliantUNIX
>-	LDFLAGS="$LDFLAGS -L/usr/local/lib"
>+	LDFLAGS="$LDFLAGS"
> 	IPADDR_IN_DISPLAY=yes
> 	AC_DEFINE(USE_PIPES)
> 	AC_DEFINE(IP_TOS_IS_BROKEN)
>@@ -312,22 +312,22 @@
> 	# otherwise you will find lots of "SIOCGPGRP errno 22" on syslog
> 	;;
> *-*-sysv4.2*)
>-	CPPFLAGS="$CPPFLAGS -I/usr/local/include"
>-	LDFLAGS="$LDFLAGS -L/usr/local/lib"
>+	CPPFLAGS="$CPPFLAGS"
>+	LDFLAGS="$LDFLAGS"
> 	AC_DEFINE(USE_PIPES)
> 	;;
> *-*-sysv5*)
>-	CPPFLAGS="$CPPFLAGS -I/usr/local/include"
>-	LDFLAGS="$LDFLAGS -L/usr/local/lib"
>+	CPPFLAGS="$CPPFLAGS"
>+	LDFLAGS="$LDFLAGS"
> 	AC_DEFINE(USE_PIPES)
> 	;;
> *-*-sysv*)
>-	CPPFLAGS="$CPPFLAGS -I/usr/local/include"
>-	LDFLAGS="$LDFLAGS -L/usr/local/lib"
>+	CPPFLAGS="$CPPFLAGS"
>+	LDFLAGS="$LDFLAGS"
> 	;;
> *-*-sco3.2v4*)
>-	CPPFLAGS="$CPPFLAGS -Dftruncate=chsize -I/usr/local/include"
>-	LDFLAGS="$LDFLAGS -L/usr/local/lib"
>+	CPPFLAGS="$CPPFLAGS -Dftruncate=chsize"
>+	LDFLAGS="$LDFLAGS"
> 	LIBS="$LIBS -los -lprot -lx -ltinfo -lm"
> 	RANLIB=true
> 	no_dev_ptmx=1
>@@ -344,8 +344,8 @@
> 	if test -z "$GCC"; then
> 		CFLAGS="$CFLAGS -belf"
> 	fi
>-	CPPFLAGS="$CPPFLAGS -I/usr/local/include"
>-	LDFLAGS="$LDFLAGS -L/usr/local/lib"
>+	CPPFLAGS="$CPPFLAGS"
>+	LDFLAGS="$LDFLAGS"
> 	LIBS="$LIBS -lprot -lx -ltinfo -lm"
> 	no_dev_ptmx=1
> 	AC_DEFINE(USE_PIPES)
>@@ -862,22 +862,9 @@
> 	]
> )
> LIBS="$LIBS -lcrypto"
>+LDFLAGS=${saved_LDFLAGS}
> AC_TRY_LINK_FUNC(RAND_add, AC_DEFINE(HAVE_OPENSSL),
>-	[
>-		dnl Check default openssl install dir
>-		if test -n "${need_dash_r}"; then
>-			LDFLAGS="-L/usr/local/ssl/lib -R/usr/local/ssl/lib ${saved_LDFLAGS}"
>-		else
>-			LDFLAGS="-L/usr/local/ssl/lib ${saved_LDFLAGS}"
>-		fi
>-		CPPFLAGS="-I/usr/local/ssl/include ${saved_CPPFLAGS}"
>-		AC_TRY_LINK_FUNC(RAND_add, AC_DEFINE(HAVE_OPENSSL),
>-			[
>-				AC_MSG_ERROR([*** Can't find recent OpenSSL libcrypto (see config.log for details) ***])
>-			]
>-		)
>-	]
>-)
>+	[AC_MSG_ERROR([*** Can't find recent OpenSSL libcrypto (see config.log for details) ***])])
> 
> # Determine OpenSSL header version
> AC_MSG_CHECKING([OpenSSL header version])
>@@ -1873,13 +1860,11 @@
>         [  --with-kerberos5=PATH   Enable Kerberos 5 support],
>         [
>                 if test "x$withval" != "xno" ; then
>-                        if test "x$withval" = "xyes" ; then
>-                                KRB5ROOT="/usr/local"
>-                        else
>+                        if test "x$withval" != "xyes" ; then
>                                 KRB5ROOT=${withval}
>+				CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include"
>+                        	LDFLAGS="$LDFLAGS -L${KRB5ROOT}/lib"
>                         fi
>-			CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include"
>-                        LDFLAGS="$LDFLAGS -L${KRB5ROOT}/lib"
>                         AC_DEFINE(KRB5)
> 			KRB5_MSG="yes"
>                         AC_MSG_CHECKING(whether we are using Heimdal)

Actions: View | Diff

Attachments on bug 77: 298