Changeset 1776 for trunk


Ignore:
Timestamp:
29/11/11 12:56:43 (6 months ago)
Author:
Freddie Akeroyd
Message:

Fixes for earlier autoconf versions. Refs #307

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Makefile.am

    r1775 r1776  
    5656 
    5757ChangeLog : 
    58         svn2cl --non-interactive --authors=svn2cl_nexus_authors.xml . 
     58        touch $@ 
     59if HAVE_SVN2CL 
     60        @echo "Generating ChangeLog from svn via svn2cl" 
     61        $(SVN2CL) --non-interactive --authors=svn2cl_nexus_authors.xml . 
     62endif 
     63 
     64#dist-hook : ChangeLog 
    5965 
    6066maintainer-clean-local: 

  • trunk/autogen.sh

    r1095 r1776  
    1616. ./autoversion.sh 
    1717 
    18 touch AUTHORS ChangeLog NEWS README 
     18touch AUTHORS NEWS README 
     19rm -f ChangeLog 
    1920 
    2021# Discover what version of autoconf we are using. 

  • trunk/configure.ac

    r1775 r1776  
    3232AC_REVISION($Revision$) 
    3333 
    34 m4_define([ISODATE],m4_esyscmd_s([date +%Y%m%d]))dnl 
     34m4_define([ISODATE],m4_esyscmd([date +%Y%m%d | tr -d '\n' ]))dnl 
    3535dnl m4_define([SVNREV],m4_esyscmd_s([`svnversion`])) 
    36 m4_define([SVNREV],m4_esyscmd_s([svn info | grep Revision | awk '{print $2}']))dnl 
     36m4_define([SVNREV],m4_esyscmd([svn info | grep Revision | awk '{print $2}' | tr -d '\n' ]))dnl 
    3737m4_define([SVN_RELEASE],m4_join([],ISODATE,[svn],SVNREV)))dnl 
    3838 
    … …  
    5454AC_SUBST([SVN_REVISION]) 
    5555AC_SUBST([PACKAGE_RELEASE]) 
    56 AC_DEFINE([[NEXUS_VERSION]], "NEXUS_VERSION", [NeXus Version])dnl 
    57 AC_DEFINE([[NEXUS_RELEASE]], "NEXUS_RELEASE", [NeXus Release])dnl 
    58 AC_DEFINE([[PACKAGE_RELEASE]], "PACKAGE_RELEASE", [Package Release])dnl 
    59 AC_DEFINE([[SVN_REVISION]], "SVNREV", [SVN Revision])dnl 
     56# AC_DEFINE([NEXUS_VERSION], "NEXUS_VERSION", [NeXus Version])dnl 
     57# AC_DEFINE([NEXUS_RELEASE], "NEXUS_RELEASE", [NeXus Release])dnl 
     58# AC_DEFINE([PACKAGE_RELEASE], "PACKAGE_RELEASE", [Package Release])dnl 
     59AC_DEFINE([SVN_REVISION], "SVNREV", [SVN Revision])dnl 
    6060 
    6161 
    … …  
    301301AC_CHECK_PROGS(WGET,[wget]) 
    302302AC_CHECK_PROGS(XMLLINT,[xmllint]) 
     303AC_CHECK_PROGS(SVN2CL,[svn2cl]) 
    303304 
    304305 
    … …  
    774775AM_CONDITIONAL(HAVE_WGET, [test ! -z "$WGET"]) 
    775776AM_CONDITIONAL(HAVE_XMLLINT, [test ! -z "$XMLLINT"]) 
     777AM_CONDITIONAL(HAVE_SVN2CL, [test ! -z "$SVN2CL"]) 
    776778 
    777779AC_CONFIG_TESTDIR(test) 
Note: See TracChangeset for help on using the changeset viewer.