srcdir != builddir fixes

	* tests/httpd.conf.in:
	* tests/Makefile.am:
	* tests/ssl-test.c: srcdir != builddir fixes

svn path=/trunk/; revision=937

diff --git a/ChangeLog b/ChangeLog
index b91447c..0e0cb86 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@
 
        * NEWS: update
 
+       * tests/httpd.conf.in: 
+       * tests/Makefile.am: 
+       * tests/ssl-test.c: srcdir != builddir fixes
+
 2007-10-05  Dan Winship  <danw@gnome.org>
 
        * libsoup/soup-connection-ntlm.c (ntlm_authorize_pre): Don't crash

diff --git a/tests/Makefile.am b/tests/Makefile.am
index c4ea17d..0ec9235 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -35,6 +35,7 @@ revserver_SOURCES = revserver.c
 simple_httpd_SOURCES = simple-httpd.c
 simple_proxy_SOURCES = simple-proxy.c
 ssl_test_SOURCES = ssl-test.c
+ssl_test_CFLAGS = -DSRCDIR=\""$(srcdir)"\"
 uri_parsing_SOURCES = uri-parsing.c
 xmlrpc_test_SOURCES = xmlrpc-test.c apache-wrapper.c apache-wrapper.h
 

diff --git a/tests/httpd.conf.in b/tests/httpd.conf.in
index 202ade3..86c5bbe 100644 (file)
--- a/tests/httpd.conf.in
+++ b/tests/httpd.conf.in
@@ -28,7 +28,7 @@ LoadModule proxy_http_module    @APACHE_MODULE_DIR@/mod_proxy_http.so
 LoadModule proxy_connect_module @APACHE_MODULE_DIR@/mod_proxy_connect.so
 LoadModule ssl_module           @APACHE_SSL_MODULE_DIR@/mod_ssl.so
 
-DirectoryIndex httpd.pid
+DirectoryIndex httpd.conf.in
 TypesConfig /dev/null
 AddType application/x-httpd-php .php
 
@@ -83,7 +83,7 @@ Listen 127.0.0.1:47527
 
     AuthType Basic
     AuthName realm1
-    AuthUserFile ./htpasswd
+    AuthUserFile @srcdir@/htpasswd
     Require valid-user
   </Proxy>
 
@@ -94,7 +94,7 @@ Listen 127.0.0.1:47527
 
     AuthType Basic
     AuthName realm1
-    AuthUserFile ./htpasswd
+    AuthUserFile @srcdir@/htpasswd
     Require valid-user
   </Proxy>
 
@@ -124,7 +124,7 @@ Listen 127.0.0.1:47528
 
     AuthType Basic
     AuthName realm1
-    AuthUserFile ./htpasswd
+    AuthUserFile @srcdir@/htpasswd
     Require user no-such-user
   </Proxy>
 
@@ -135,7 +135,7 @@ Listen 127.0.0.1:47528
 
     AuthType Basic
     AuthName realm1
-    AuthUserFile ./htpasswd
+    AuthUserFile @srcdir@/htpasswd
     Require user no-such-user
   </Proxy>
 
@@ -154,22 +154,22 @@ Listen 127.0.0.1:47528
   <VirtualHost 127.0.0.1:47525>
     SSLEngine on
 
-    SSLCertificateFile test-cert.pem
-    SSLCertificateKeyFile test-key.pem
+    SSLCertificateFile @srcdir@/test-cert.pem
+    SSLCertificateKeyFile @srcdir@/test-key.pem
 
   </VirtualHost>
 </IfModule>
 
 
 # Basic auth tests
-Alias /Basic/realm1/realm2/realm1 @builddir@
-Alias /Basic/realm1/realm2 @builddir@
-Alias /Basic/realm1/subdir @builddir@
-Alias /Basic/realm1/not @builddir@
-Alias /Basic/realm1 @builddir@
-Alias /Basic/realm2 @builddir@
-Alias /Basic/realm3 @builddir@
-Alias /Basic @builddir@
+Alias /Basic/realm1/realm2/realm1 @srcdir@
+Alias /Basic/realm1/realm2 @srcdir@
+Alias /Basic/realm1/subdir @srcdir@
+Alias /Basic/realm1/not @srcdir@
+Alias /Basic/realm1 @srcdir@
+Alias /Basic/realm2 @srcdir@
+Alias /Basic/realm3 @srcdir@
+Alias /Basic @srcdir@
 
 <Location /Basic/realm1>
   AuthType Basic
@@ -214,14 +214,14 @@ Alias /Basic @builddir@
 </Location>
 
 # Digest auth tests
-Alias /Digest/realm1/realm2/realm1 @builddir@
-Alias /Digest/realm1/realm2 @builddir@
-Alias /Digest/realm1/subdir @builddir@
-Alias /Digest/realm1/not @builddir@
-Alias /Digest/realm1 @builddir@
-Alias /Digest/realm2 @builddir@
-Alias /Digest/realm3 @builddir@
-Alias /Digest @builddir@
+Alias /Digest/realm1/realm2/realm1 @srcdir@
+Alias /Digest/realm1/realm2 @srcdir@
+Alias /Digest/realm1/subdir @srcdir@
+Alias /Digest/realm1/not @srcdir@
+Alias /Digest/realm1 @srcdir@
+Alias /Digest/realm2 @srcdir@
+Alias /Digest/realm3 @srcdir@
+Alias /Digest @srcdir@
 
 <Location /Digest/realm1>
   AuthType Digest

diff --git a/tests/ssl-test.c b/tests/ssl-test.c
index be6ea8a..31c3d5c 100644 (file)
--- a/tests/ssl-test.c
+++ b/tests/ssl-test.c
@@ -63,8 +63,8 @@ server_write (gnutls_session_t session, char *buf, int bufsize)
        }
 }
 
-const char *ssl_cert_file = "test-cert.pem";
-const char *ssl_key_file = "test-key.pem";
+const char *ssl_cert_file = SRCDIR "/test-cert.pem";
+const char *ssl_key_file = SRCDIR "/test-key.pem";
 
 static gpointer
 server_thread (gpointer user_data)