Fixed the bug introduced with the correction of VPATH

It's time to go on the beach at least leave make distcheck
and make check and VPATH building working

3 files changed, 3 insertions, 5 deletions

diff --git a/CHANGES b/CHANGES
index 1077b6f..b752374 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.17 -> 2.0:
+    - Fixed VPATH building with arbitrary directory structure
     - devzero2000: some minor fix to autofu and also a minor portability problem on AIX
       with the native compiler
     - devzero2000: add malloc vodo to testit.sh
diff --git a/auto/Makefile.am b/auto/Makefile.am
index 87aa601..0f24771 100644
--- a/auto/Makefile.am
+++ b/auto/Makefile.am
@@ -1,4 +1,4 @@
-TDIRS =	descriptors_storage header_compile_errors test_results tests
+TDIRS =	descriptors_storage header_compile_errors test_results tests logs
 
 EXTRA_DIST = types
 
diff --git a/test1.c b/test1.c
index 550e1df..b0e2c77 100644
--- a/test1.c
+++ b/test1.c
@@ -268,16 +268,13 @@ int main(int argc, const char ** argv)
 /*@=modobserver@*/
 /*@-temptrans@*/
     optCon = poptGetContext("test1", argc, argv, options, 0);
-/*@=temptrans@*/
-    (void) poptReadConfigFile(optCon, "./test-poptrc");
 #ifdef HAVE_STDLIB_H
     char * testpoptrc;
     testpoptrc = getenv ("testpoptrc");
     if (testpoptrc != NULL ) 
     (void) poptReadConfigFile(optCon, testpoptrc);
-    else
-    printf("something go wrong\n");
 #else
+    (void) poptReadConfigFile(optCon, "./test-poptrc");
 /* XXXX: make distcheck succed : test1 is in popt-<version>/_build */
     (void) poptReadConfigFile(optCon, "../../test-poptrc");
 #endif