Changeset 564


Ignore:
Timestamp:
Mar 7, 2008, 4:55:00 PM (13 years ago)
Author:
Peter Johansson
Message:

added test for long long, allow user to set CXXFLAGS, set properties in svndigest.m4, and minor change of generation of subversion_info.h

Location:
trunk
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/build_support/svndigest.m4

    • Property svn:eol-style set to native
    • Property svn:keywords set to Id
  • trunk/configure.ac

    r561 r564  
    5353AC_LANG(C++)
    5454
     55# Let user overide default CXXFLAGS
     56if test "${CXXFLAGS+set}" != set; then
     57  CXXFLAGS=""  # Setting CXXFLAGS here to prevent expansion in AC_PROG_CXX
     58fi
    5559# Checks for programs.
    5660AC_PROG_CPP
     
    6569# 'long long' types).
    6670CXXFLAGS="-Wall -pedantic -Wno-long-long"
     71sinclude(./build_support/ac_c_long_long.m4)
     72AC_C_LONG_LONG()
    6773
    6874AC_ARG_ENABLE(debug,
     
    201207fi
    202208
     209if test $ac_cv_c_long_long = no; then
     210   AC_MSG_WARN([Compiler $CXX does not support `long long'.
     211          svndigest must be compiled with a compiler that supports `long long'.])
     212   all_reqs_ok="false"
     213fi
     214
    203215if (test "$all_reqs_ok" = "false") ; then
    204216    AC_MSG_ERROR([Some pre-requisites were not fulfilled, aborting
     
    213225# Some more messages.
    214226AC_MSG_NOTICE([])
    215 AC_MSG_NOTICE([   Ready to compile the executables of svndiget])
     227AC_MSG_NOTICE([   Ready to compile the executables of svndigest $VERSION])
    216228AC_MSG_NOTICE([   The following flags and libs will be used:])
    217229AC_MSG_NOTICE([   +++++++++++++++++++++++++++++++++++++++++++++++])
     230AC_MSG_NOTICE([    Compiler:           CXX=\"$CXX\"])
    218231AC_MSG_NOTICE([    Preprocessor flags: CPPFLAGS=\"$CPPFLAGS\"])
    219232AC_MSG_NOTICE([    C++ flags:          CXXFLAGS=\"$CXXFLAGS\"])
  • trunk/lib/Makefile.am

    r562 r564  
    6464
    6565subversion_info.h.tmp: FORCE
    66   @echo '// svn_version.h generated from svn_version.h.in.' > $@ ;\
     66  @echo '// subversion_info.h generated from subversion_info.h.in.' > $@ ;\
    6767  revision=`$(SVNVERSION) $(top_srcdir)` ;\
    6868  year=`svn info $(top_srcdir)|$(SED) -n  's/.*Date: \(.*\)-..-.*/\1/p'`;\
  • trunk/lib/subversion_info.h.in

    r541 r564  
    11// $Id$
    22
    3 #ifndef _theplu_svndigest_svn_revision_
    4 #define _theplu_svndigest_svn_revision_
     3#ifndef _theplu_svndigest_subversion_info_
     4#define _theplu_svndigest_subversion_info_
    55
    66/*
    7   Copyright (C) 2007 Peter Johansson
     7  Copyright (C) 2007, 2008 Peter Johansson
    88
    99  This file is part of svndigest, http://trac.thep.lu.se/svndigest
Note: See TracChangeset for help on using the changeset viewer.