Changeset 569 for trunk/configure.ac

Timestamp:

Mar 13, 2008, 10:55:15 PM (15 years ago)

Author:

Peter Johansson

Message:

NOTE: may cause file name clash. Adding file
subversion_info.h'. Previously make' generated this file, and thus
you may experience a file name clash. Please remove subversion_info.h
prior updating.

Moved implementation of subversion_info to source file in order to
avoid re-compilations not needed. Using script move-if-change to
create source file.

File:

• trunk/configure.ac (modified) (4 diffs)

trunk/configure.ac

@@ -137 +137 @@
 
 wc_found="no";
-if (test `$SVNVERSION -n '.'` != "exported"); then
+if (test $have_svnversion != "no" && 
+    test `$SVNVERSION -n $srcdir` != "exported"); 
+then
    wc_found="yes";
 fi
-AC_CHECK_FILE("lib/subversion_info.h", info_found="yes", info_found="no")
+echo $wc_found
+AC_CHECK_FILE("$srcdir/lib/subversion_info.cc",info_found="yes",info_found="no")
 
 # Checking that a release (non-dev) has no pre in VERSION
@@ -157 +160 @@
                 bin/Makefile
                 lib/Makefile
-                test/Makefile
-                test/test_repo.sh 
-                test/check_repo_status.sh], 
-               [chmod +x test/test_repo.sh; 
-                chmod +x test/check_repo_status.sh])
+                test/Makefile])
 
 # Print failure status information about selected items, and exit if
@@ -170 +169 @@
 all_reqs_ok="true"
 
-# 
-if (test "$info_found" = "no" && test "$wc_found" = "no") ; then
-   AC_MSG_WARN([Cannot find sources (lib/subverion_info.h).])
+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, 
@@ -185 +184 @@
    fi
    all_reqs_ok="false"
+else
+   dnl test repo is not distributed
+   AC_CONFIG_FILES([test/test_repo.sh 
+                    test/check_repo_status.sh], 
+                   [chmod +x test/test_repo.sh; 
+                    chmod +x test/check_repo_status.sh])
+   
+fi
 fi