Changeset 730
- Timestamp:
- Dec 15, 2008, 2:14:14 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/configure.ac
r729 r730 30 30 31 31 AC_PREREQ(2.60) 32 33 32 34 33 m4_include([build_support/version.m4]) … … 152 151 153 152 # checking if we build in a subversion WC 154 AC_MSG_CHECKING([if we build from subversion wc]) 155 wc_found="no"; 156 if (test "$SVNVERSION" != "no" && 157 test `$SVNVERSION -n $srcdir` != "exported"); 158 then 159 wc_found="yes"; 160 fi 161 AC_MSG_RESULT([$wc_found]) 162 AC_CHECK_FILE("$srcdir/lib/subversion_info.cc",info_found="yes",info_found="no") 163 164 165 # devel version should have svn WC and SVNVERSION installed 166 AM_CONDITIONAL(HAVE_SVN_WC, test "$wc_found" = "yes" ) 153 AC_CHECK_FILE([$srcdir/.svn], [wc_found="yes"], [wc_found="no"]) 154 AM_CONDITIONAL([HAVE_SVN_WC], [test "$wc_found" = "yes"]) 155 156 # checking if we have test repo 157 test_repo_filename=$srcdir/test/repo; 158 AC_CHECK_FILE([$test_repo_filename], [test_repo_found="yes"], 159 [test_repo_found="no"]) 160 AM_CONDITIONAL([HAVE_TEST_REPO], [test "$test_repo_found" = "yes"]) 161 if (test "$test_repo_found" = "yes"); then 162 dnl test repo is not distributed 163 AC_CONFIG_FILES([test/test_repo.sh], [chmod +x test/test_repo.sh]) 164 AC_CONFIG_FILES([test/check_repo_status.sh], 165 [chmod +x test/check_repo_status.sh]) 166 fi 167 167 168 168 … … 181 181 all_reqs_ok="true" 182 182 183 if (test "$wc_found" != "yes") ; then 184 if (test "$info_found" = "no") ; then 185 AC_MSG_WARN([Cannot find sources (lib/subversion_info.cc).]) 186 if (test "$svnversion" = "no") ; then 187 AC_MSG_WARN([If you grabbed the source from the subversion repository, 188 the file will be generated automatically. However, svnversion cannot 189 be found and therefore the file cannot be generated. Please install 190 svnversion and make sure it is in your search path.]) 191 else 192 AC_MSG_WARN([If you grabbed the source from the subversion repository, 193 the file will be generated automatically. However, the output from 194 svnversion was incorrect. Either your installation of svnversion is 195 is not healthy or there is something wrong with the repository.]) 196 fi 197 all_reqs_ok="false" 198 fi 199 else 200 dnl test repo is not distributed 201 AC_CONFIG_FILES([test/test_repo.sh], [chmod +x test/test_repo.sh]) 202 AC_CONFIG_FILES([test/check_repo_status.sh], [chmod +x test/check_repo_status.sh]) 183 if (test "$wc_found" = "yes"); then 184 # svnversion is required when building from svn wc 185 if (test "$svnversion" = "no"); then 186 all_reqs_ok="false"; 187 AC_MSG_WARN([dnl 188 Cannot find svnversion, which is required when building from a 189 subversion working copy. Please install svnversion and make sure it is 190 in your search path.]); 191 fi 192 if (test "$test_repo_found" = "no"); then 193 all_reqs_ok="false"; 194 AC_MSG_WARN([dnl 195 Cannot find test repository (test_repo_filename), which should be 196 available when building from a subversion working copy. Try svn 197 update in top directory.]); 198 fi 203 199 fi 204 200 -
trunk/test/Makefile.am
r697 r730 24 24 25 25 # these tests are only for developers since we do not distribute test repository 26 if HAVE_ SVN_WC26 if HAVE_TEST_REPO 27 27 check_PROGRAMS += copyright_test stats_test 28 28 endif … … 30 30 TESTS = $(check_PROGRAMS) 31 31 # these tests are only for developers since we do not distribute test repository 32 if HAVE_ SVN_WC32 if HAVE_TEST_REPO 33 33 TESTS += test_repo.sh check_repo_status.sh 34 34 endif
Note: See TracChangeset
for help on using the changeset viewer.