Call testheaders.sh with locally detected shell.

Fixes problems where bash shell is not available at /bin/bash

Also replaces some remaining relative paths with the build top dir variable.

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 12db3a17b55ba4b5eca10e50561f8055bbf4f135..ccbc4c884e8058cba158bf72eff2ce3186f89c19 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -103,7 +103,7 @@ check_PROGRAMS= \
 ## Special Universal .h dependency test script
 ## aborts if error encountered
 testHeaders: $(top_srcdir)/include/*.h
-       $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "$(top_srcdir)/include" || exit 1
+       $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "$(top_srcdir)/include" || exit 1
 
 tests_testAll_SOURCES= \
        tests/testArray.h \

diff --git a/src/Makefile.am b/src/Makefile.am
index 46cb0147056866a631df65c431bb5b355c88edd0..3c463b31a8e09b6db0d6becfc8f14a67d74d92ed 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1180,9 +1180,9 @@ check_PROGRAMS+= testHeaders \
 ## Special Universal .h dependency test script
 ## aborts if error encountered
 testHeaders: *.h DiskIO/*.h ICAP/*.h
-       ../test-suite/testheaders.sh "$(CXXCOMPILE)" "." || exit 1
-       ../test-suite/testheaders.sh "$(CXXCOMPILE)" "DiskIO" || exit 1
-       ../test-suite/testheaders.sh "$(CXXCOMPILE)" "ICAP" || exit 1
+       $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "." || exit 1
+       $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "DiskIO" || exit 1
+       $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "ICAP" || exit 1
 ## src/repl/ has no .h files and its own makefile.
 
 

diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am
index e9b90d32b5bac421f4d2cbd7c1a8f5893a2fc6c0..d87b2fc2139f38bae2f44305a8ad05f07b0e7e00 100644 (file)
--- a/src/auth/Makefile.am
+++ b/src/auth/Makefile.am
@@ -25,8 +25,8 @@ check_PROGRAMS= testHeaders
 ## Special Universal .h dependency test script
 ## aborts if error encountered
 testHeaders: basic/*.h digest/*.h ntlm/*.h negotiate/*.h
-       ../../test-suite/testheaders.sh "$(CXXCOMPILE)" "basic" || exit 1
-       ../../test-suite/testheaders.sh "$(CXXCOMPILE)" "digest" || exit 1
-       ../../test-suite/testheaders.sh "$(CXXCOMPILE)" "ntlm" || exit 1
-       ../../test-suite/testheaders.sh "$(CXXCOMPILE)" "negotiate" || exit 1
+       $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "basic" || exit 1
+       $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "digest" || exit 1
+       $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "ntlm" || exit 1
+       $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "negotiate" || exit 1
 ## ./ has no .h files

diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 7db120d14195bc0a1a02dc9c8c1758436a53b18e..1643f69a3528d0591793db6eecb52d05c422607d 100644 (file)
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -37,8 +37,8 @@ check_PROGRAMS=testHeaders
 ## Special Universal .h dependency test script
 ## aborts if error encountered
 testHeaders: ufs/*.h coss/*.h
-       ../../test-suite/testheaders.sh "$(CXXCOMPILE)" "ufs" || exit 1
-       ../../test-suite/testheaders.sh "$(CXXCOMPILE)" "coss" || exit 1
+       $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "ufs" || exit 1
+       $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "coss" || exit 1
 ## diskd/ has no .h files
 ## aufs/ has no .h files
 ## ./ has no .h files

diff --git a/src/repl/Makefile.am b/src/repl/Makefile.am
index 382c7b4c1431c1f57558f357bc4f5609c5c1f60c..3d68b1051736d5bc1318a2436e2929141d48c59f 100644 (file)
--- a/src/repl/Makefile.am
+++ b/src/repl/Makefile.am
@@ -23,6 +23,6 @@ check_PROGRAMS= testHeaders
 ## Special Universal .h dependency test script
 ## aborts if error encountered
 testHeaders: heap/*.h
-       $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "heap" || exit 1
+       $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "heap" || exit 1
 ## ./ has no .h files.
 ## ./lru/ has no .h files.