Submitted By Bernard Leak: bernard at brenda hyphen arkle dot demon dot co dot uk
Date  2006-09-24 (Sunday September 24th 2006)
Initial Package Version 7.15.5
Upstream Status Submitted upstream
Origin  Me!
Description  Corrects searches for config.h if $(builddir) is NOT $(srcdir)

#Output of diff -Nru curl-7.15.5/lib/setup.h{-old,}
--- curl-7.15.5/lib/setup.h-old	2006-08-04 14:45:03.000000000 +0100
+++ curl-7.15.5/lib/setup.h	2006-09-24 17:55:37.000000000 +0100
@@ -48,7 +48,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "lib/config.h"
 #else
 
 #ifdef _WIN32_WCE

#Output of diff -Nru curl-7.15.5/lib/url.c{-old,}
--- curl-7.15.5/lib/url.c-old	2006-08-02 19:08:06.000000000 +0100
+++ curl-7.15.5/lib/url.c	2006-09-24 19:00:13.000000000 +0100
@@ -129,7 +129,7 @@
 #include "connect.h"
 #include "inet_ntop.h"
 #include "http_ntlm.h"
-#include <ca-bundle.h>
+#include "lib/ca-bundle.h"
 
 #if defined(HAVE_INET_NTOA_R) && !defined(HAVE_INET_NTOA_R_DECL)
 #include "inet_ntoa_r.h"

#Output of diff -Nru curl-7.15.5/src/setup.h{-old,}
--- curl-7.15.5/src/setup.h-old	2006-08-04 14:45:03.000000000 +0100
+++ curl-7.15.5/src/setup.h	2006-09-24 17:55:47.000000000 +0100
@@ -41,7 +41,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "src/config.h"
 #else
 
 #ifdef WIN32

#Output of diff -Nru curl-7.15.5/lib/Makefile.am{-old,}
--- curl-7.15.5/lib/Makefile.am-old	2006-07-25 23:46:38.000000000 +0100
+++ curl-7.15.5/lib/Makefile.am	2006-09-24 17:57:54.000000000 +0100
@@ -43,7 +43,7 @@
 # we use srcdir/include for the static global include files
 # we use builddir/lib for the generated lib/config.h file to get found
 # we use srcdir/lib for the lib-private header files
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/lib -I$(top_srcdir)/lib
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)/include
 
 VERSION=-version-info 3:0:0
 

#Output of diff -Nru curl-7.15.5/src/Makefile.am{-old,}
--- curl-7.15.5/src/Makefile.am-old	2005-03-31 08:02:03.000000000 +0100
+++ curl-7.15.5/src/Makefile.am	19:40:08.000000000 +0100
@@ -26,7 +26,6 @@
 # we use srcdir/include for the static global include files
 # we use builddir/src for the generated include files to get found
 # we use srcdir/lib for the header files we "borrow" from the lib
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/include -I$(top_builddir)/src \
-	-I$(top_srcdir)/lib
+INCLUDES = -I$(srcdir) -I$(top_builddir) -I$(top_srcdir)/include -I$(top_srcdir)/lib 
 
 bin_PROGRAMS = curl

#Output of diff -Nru curl-7.15.5/tests/libtest/Makefile.am{-old,}
--- curl-7.15.5/tests/libtest/Makefile.am-old	2006-06-08 23:43:21.000000000 +0100
+++ curl-7.15.5/tests/libtest/Makefile.am	2006-09-24 19:29:03.000000000 +0100
@@ -28,9 +28,10 @@
 # -I$(top_srcdir)/lib is for the setup.h file, included by test.h
 # -I$(top_builddir)/lib is for the config.h file, possibly included by the
 # setup.h file
-INCLUDES = -I$(top_srcdir)/include/curl \
-           -I$(top_srcdir)/lib \
-           -I$(top_builddir)/lib
+INCLUDES = -I$(srcdir) \
+           -I$(top_builddir) \
+           -I$(top_srcdir)/include/curl \
+           -I$(top_srcdir)/lib
 
 LIBDIR = $(top_builddir)/lib
 

#Output of diff -Nru curl-7.15.5/tests/server/Makefile.am{-old,}
--- curl-7.15.5/tests/server/Makefile.am-old	2006-01-09 13:17:14.000000000 +0000
+++ curl-7.15.5/tests/server/Makefile.am	2006-09-24 19:37:29.000000000 +0100
@@ -23,7 +23,7 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/include
+INCLUDES = -I$(srcdir) -I$(top_builddir) -I$(top_srcdir)/include -I$(top_srcdir)/lib 
 
 noinst_PROGRAMS = sws getpart sockfilt resolve tftpd
 

#Output of diff -Nru curl-7.15.5/lib/Makefile.in{-old,}
--- curl-7.15.5/lib/Makefile.in-old	2006-08-04 14:45:24.000000000 +0100
+++ curl-7.15.5/lib/Makefile.in	2006-09-24 17:57:23.000000000 +0100
@@ -283,7 +283,7 @@
 # we use srcdir/include for the static global include files
 # we use builddir/lib for the generated lib/config.h file to get found
 # we use srcdir/lib for the lib-private header files
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/lib -I$(top_srcdir)/lib
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)/include
 
 # This flag accepts an argument of the form current[:revision[:age]]. So,
 # passing -version-info 3:12:1 sets current to 3, revision to 12, and age to

#Output of diff -Nru curl-7.15.5/src/Makefile.in{-old,}
--- curl-7.15.5/src/Makefile.in-old	2006-08-04 14:45:26.000000000 +0100
+++ curl-7.15.5/src/Makefile.in	2006-09-24 17:57:00.000000000 +0100
@@ -256,8 +256,7 @@
 # we use srcdir/include for the static global include files
 # we use builddir/src for the generated include files to get found
 # we use srcdir/lib for the header files we "borrow" from the lib
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/include -I$(top_builddir)/src \
-	-I$(top_srcdir)/lib
+INCLUDES = -I$(srcdir) -I$(top_builddir) -I$(top_srcdir)/include -I$(top_srcdir)/lib
 
 
 # libcurl has sources that provide functions named curlx_* that aren't part of

#Output of diff -Nru curl-7.15.5/tests/libtest/Makefile.in{-old,}
--- curl-7.15.5/tests/libtest/Makefile.in-old	2006-08-04 14:45:27.000000000 +0100
+++ curl-7.15.5/tests/libtest/Makefile.in	2006-09-24 19:29:12.000000000 +0100
@@ -322,9 +322,10 @@
 # -I$(top_srcdir)/lib is for the setup.h file, included by test.h
 # -I$(top_builddir)/lib is for the config.h file, possibly included by the
 # setup.h file
-INCLUDES = -I$(top_srcdir)/include/curl \
-           -I$(top_srcdir)/lib \
-           -I$(top_builddir)/lib
+INCLUDES = -I$(srcdir) \
+           -I$(top_builddir) \
+           -I$(top_srcdir)/include/curl \
+           -I$(top_srcdir)/lib
 
 LIBDIR = $(top_builddir)/lib
 

#Output of diff -Nru curl-7.15.5/tests/server/Makefile.in{-old,}
--- curl-7.15.5/tests/server/Makefile.in-old	2006-08-04 14:45:27.000000000 +0100
+++ curl-7.15.5/tests/server/Makefile.in	2006-09-24 19:37:03.000000000 +0100
@@ -261,7 +261,7 @@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 AUTOMAKE_OPTIONS = foreign
-INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/include
+INCLUDES = -I$(srcdir) -I$(top_builddir) -I$(top_srcdir)/include -I$(top_srcdir)/lib
 useful = getpart.c getpart.h $(top_srcdir)/lib/strequal.c	\
  $(top_srcdir)/lib/base64.c $(top_srcdir)/lib/mprintf.c		\
  $(top_srcdir)/lib/memdebug.c $(top_srcdir)/lib/timeval.c