Changeset 569 for trunk/configure.ac


Ignore:
Timestamp:
Mar 13, 2008, 10:55:15 PM (13 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure.ac

    r568 r569  
    137137
    138138wc_found="no";
    139 if (test `$SVNVERSION -n '.'` != "exported"); then
     139if (test $have_svnversion != "no" &&
     140    test `$SVNVERSION -n $srcdir` != "exported");
     141then
    140142   wc_found="yes";
    141143fi
    142 AC_CHECK_FILE("lib/subversion_info.h", info_found="yes", info_found="no")
     144echo $wc_found
     145AC_CHECK_FILE("$srcdir/lib/subversion_info.cc",info_found="yes",info_found="no")
    143146
    144147# Checking that a release (non-dev) has no pre in VERSION
     
    157160                bin/Makefile
    158161                lib/Makefile
    159                 test/Makefile
    160                 test/test_repo.sh
    161                 test/check_repo_status.sh],
    162                [chmod +x test/test_repo.sh;
    163                 chmod +x test/check_repo_status.sh])
     162                test/Makefile])
    164163
    165164# Print failure status information about selected items, and exit if
     
    170169all_reqs_ok="true"
    171170
    172 #
    173 if (test "$info_found" = "no" && test "$wc_found" = "no") ; then
    174    AC_MSG_WARN([Cannot find sources (lib/subverion_info.h).])
     171if (test "$wc_found" != "yes") ; then
     172if (test "$info_found" = "no") ; then
     173   AC_MSG_WARN([Cannot find sources (lib/subversion_info.cc).])
    175174   if (test "$svnversion" = "no") ; then
    176175     AC_MSG_WARN([If you grabbed the source from the subversion repository,
     
    185184   fi
    186185   all_reqs_ok="false"
     186else
     187   dnl test repo is not distributed
     188   AC_CONFIG_FILES([test/test_repo.sh
     189                    test/check_repo_status.sh],
     190                   [chmod +x test/test_repo.sh;
     191                    chmod +x test/check_repo_status.sh])
     192   
     193fi
    187194fi
    188195
Note: See TracChangeset for help on using the changeset viewer.