Changeset 730

Timestamp:

Dec 15, 2008, 2:14:14 PM (12 years ago)

Author:

Peter Johansson

Message:

Check if we HAVE_SVN_WC by looking for .svn directory rather
than relying on svnversion output.

Check if we HAVE_TEST_REPO by looking for test/repo. This variable is
used to activate test that need the test repo, i.e., they are
activated also in svn export mode.

refs #362 and #355

Location:

trunk

Files:

• configure.ac (modified) (3 diffs)
• test/Makefile.am (modified) (2 diffs)

trunk/configure.ac

@@ -30 +30 @@
 
 AC_PREREQ(2.60)
-
 
 m4_include([build_support/version.m4])
@@ -152 +151 @@
 
 # checking if we build in a subversion WC
-AC_MSG_CHECKING([if we build from subversion wc])
-wc_found="no";
-if (test "$SVNVERSION" != "no" && 
-  test `$SVNVERSION -n $srcdir` != "exported"); 
-then
-  wc_found="yes";
-fi
-AC_MSG_RESULT([$wc_found])
-AC_CHECK_FILE("$srcdir/lib/subversion_info.cc",info_found="yes",info_found="no")
-
-
-# devel version should have svn WC and SVNVERSION installed
-AM_CONDITIONAL(HAVE_SVN_WC, test "$wc_found" = "yes" )
+AC_CHECK_FILE([$srcdir/.svn], [wc_found="yes"], [wc_found="no"])
+AM_CONDITIONAL([HAVE_SVN_WC], [test "$wc_found" = "yes"])
+
+# checking if we have test repo
+test_repo_filename=$srcdir/test/repo;
+AC_CHECK_FILE([$test_repo_filename], [test_repo_found="yes"],
+              [test_repo_found="no"])
+AM_CONDITIONAL([HAVE_TEST_REPO], [test "$test_repo_found" = "yes"])
+if (test "$test_repo_found" = "yes"); then
+   dnl test repo is not distributed
+   AC_CONFIG_FILES([test/test_repo.sh], [chmod +x test/test_repo.sh])
+   AC_CONFIG_FILES([test/check_repo_status.sh], 
+                   [chmod +x test/check_repo_status.sh])   
+fi
 
 
@@ -181 +181 @@
 all_reqs_ok="true"
 
-if (test "$wc_found" != "yes") ; then
-if (test "$info_found" = "no") ; then
-   AC_MSG_WARN([Cannot find sources (lib/subversion_info.cc).])
-   if (test "$svnversion" = "no") ; then
-     AC_MSG_WARN([If you grabbed the source from the subversion repository, 
-     the file will be generated automatically. However, svnversion cannot 
-     be found and therefore the file cannot be generated. Please install 
-     svnversion and make sure it is in your search path.])
-   else
-     AC_MSG_WARN([If you grabbed the source from the subversion repository, 
-     the file will be generated automatically. However, the output from 
-     svnversion was incorrect. Either your installation of svnversion is 
-     is not healthy or there is something wrong with the repository.])
-   fi
-   all_reqs_ok="false"
-fi
-else
-  dnl test repo is not distributed
-  AC_CONFIG_FILES([test/test_repo.sh], [chmod +x test/test_repo.sh])
-  AC_CONFIG_FILES([test/check_repo_status.sh], [chmod +x test/check_repo_status.sh])   
+if (test "$wc_found" = "yes"); then 
+   # svnversion is required when building from svn wc
+   if (test "$svnversion" = "no"); then
+      all_reqs_ok="false";
+      AC_MSG_WARN([dnl
+Cannot find svnversion, which is required when building from a
+subversion working copy. Please install svnversion and make sure it is
+in your search path.]);
+   fi
+   if (test "$test_repo_found" = "no"); then
+      all_reqs_ok="false";
+      AC_MSG_WARN([dnl
+Cannot find test repository (test_repo_filename), which should be
+available when building from a subversion working copy. Try svn
+update in top directory.]);
+   fi
 fi
 

trunk/test/Makefile.am

@@ -24 +24 @@
 
 # these tests are only for developers since we do not distribute test repository
-if HAVE_SVN_WC
+if HAVE_TEST_REPO
 check_PROGRAMS += copyright_test stats_test
 endif
@@ -30 +30 @@
 TESTS = $(check_PROGRAMS)
 # these tests are only for developers since we do not distribute test repository
-if HAVE_SVN_WC
+if HAVE_TEST_REPO
 TESTS += test_repo.sh check_repo_status.sh
 endif