OpenSSH 2.5.0p1

[mouring at etoh.eviladmin.org]

On Sat, 17 Feb 2001, Damien Miller wrote:
> On Fri, 16 Feb 2001 mouring at etoh.eviladmin.org wrote:
> > > Can we just detect [ $(srcdir) = "." ] and not do the -I?
> > 
> > That was my thought.  But I was not sure if it would go into configure.in
> > or the Makefile.in file.
> 
> Here is a patch that does this. Unfortunately as Gert pointed out, this
> doesn't fix it for the builddir != srcdir case.
> 

May I suggest a smaller patch.  Instead of assuming that we can do both
AIX and builddir != srcdir.  Lets value the platform support over the
latter case and enable builddir != srcdir via a ./configure option.  

I'll give you the fact that "--with-export-src" may not be the best
option name, but somewhere in the back of my mind that is what a few
other projects have used.

Then just document that some platforms (IE 'aix') may not support
--with-export-src at this time.

- Ben

diff -ur openssh/Makefile.in ossh/Makefile.in
--- openssh/Makefile.in	Wed Feb 14 21:01:59 2001
+++ ossh/Makefile.in	Fri Feb 16 18:17:45 2001
@@ -26,7 +26,7 @@
 CC=@CC@
 LD=@LD@
 CFLAGS=@CFLAGS@
-CPPFLAGS=@CPPFLAGS@ -I. -I$(srcdir)/openbsd-compat -I$(srcdir) $(PATHS) @DEFS@
+CPPFLAGS=@CPPFLAGS@ -I$(srcdir)/openbsd-compat $(PATHS) @DEFS@
 LIBS=@LIBS@
 AR=@AR@
 RANLIB=@RANLIB@
diff -ur openssh/configure.in ossh/configure.in
--- openssh/configure.in	Thu Feb 15 21:39:35 2001
+++ ossh/configure.in	Fri Feb 16 18:38:26 2001
@@ -267,6 +267,14 @@
 	;;
 esac
 
+# Allow user to enable compiling outside the source tree
+AC_ARG_WITH(export-src,
+	[  --with-export-src       Compile outside the source directory],
+	[ 
+		CPPFLAGS="$CPPFLAGS -I. -I${srcdir}" 
+	]
+)
+
 # Allow user to specify flags
 AC_ARG_WITH(cflags,
 	[  --with-cflags           Specify additional flags to pass to compiler],
diff -ur openssh/openbsd-compat/Makefile.in ossh/openbsd-compat/Makefile.in
--- openssh/openbsd-compat/Makefile.in	Thu Feb  8 20:57:54 2001
+++ ossh/openbsd-compat/Makefile.in	Fri Feb 16 18:19:41 2001
@@ -9,7 +9,7 @@
 CC=@CC@
 LD=@LD@
 CFLAGS=@CFLAGS@
-CPPFLAGS=@CPPFLAGS@ -I. -I.. -I$(srcdir) -I$(srcdir)/.. @DEFS@
+CPPFLAGS=@CPPFLAGS@ -I$(srcdir) -I$(srcdir)/.. @DEFS@
 LIBS=@LIBS@
 AR=@AR@
 RANLIB=@RANLIB@