Changeset 564

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:

• build_support/ac_c_long_long.m4 (added)
• build_support/svndigest.m4 (modified) (2 props)
• configure.ac (modified) (4 diffs)
• lib/Makefile.am (modified) (1 diff)
• lib/subversion_info.h.in (modified) (1 diff)

trunk/configure.ac

@@ -53 +53 @@
 AC_LANG(C++)
 
+# Let user overide default CXXFLAGS
+if test "${CXXFLAGS+set}" != set; then
+  CXXFLAGS=""  # Setting CXXFLAGS here to prevent expansion in AC_PROG_CXX
+fi
 # Checks for programs.
 AC_PROG_CPP
@@ -65 +69 @@
 # 'long long' types).
 CXXFLAGS="-Wall -pedantic -Wno-long-long"
+sinclude(./build_support/ac_c_long_long.m4)
+AC_C_LONG_LONG()
 
 AC_ARG_ENABLE(debug,
@@ -201 +207 @@
 fi
 
+if test $ac_cv_c_long_long = no; then
+   AC_MSG_WARN([Compiler $CXX does not support `long long'.
+          svndigest must be compiled with a compiler that supports `long long'.])
+   all_reqs_ok="false"
+fi
+
 if (test "$all_reqs_ok" = "false") ; then
     AC_MSG_ERROR([Some pre-requisites were not fulfilled, aborting
@@ -213 +225 @@
 # Some more messages.
 AC_MSG_NOTICE([])
-AC_MSG_NOTICE([   Ready to compile the executables of svndiget])
+AC_MSG_NOTICE([   Ready to compile the executables of svndigest $VERSION])
 AC_MSG_NOTICE([   The following flags and libs will be used:])
 AC_MSG_NOTICE([   +++++++++++++++++++++++++++++++++++++++++++++++])
+AC_MSG_NOTICE([    Compiler:           CXX=\"$CXX\"])
 AC_MSG_NOTICE([    Preprocessor flags: CPPFLAGS=\"$CPPFLAGS\"])
 AC_MSG_NOTICE([    C++ flags:          CXXFLAGS=\"$CXXFLAGS\"])

trunk/lib/Makefile.am

@@ -64 +64 @@
 
 subversion_info.h.tmp: FORCE
-  @echo '// svn_version.h generated from svn_version.h.in.' > $@ ;\
+  @echo '// subversion_info.h generated from subversion_info.h.in.' > $@ ;\
   revision=`$(SVNVERSION) $(top_srcdir)` ;\
   year=`svn info $(top_srcdir)|$(SED) -n  's/.*Date: \(.*\)-..-.*/\1/p'`;\

trunk/lib/subversion_info.h.in

@@ -1 +1 @@
 // $Id$
 
-#ifndef _theplu_svndigest_svn_revision_
-#define _theplu_svndigest_svn_revision_
+#ifndef _theplu_svndigest_subversion_info_
+#define _theplu_svndigest_subversion_info_
 
 /*
-  Copyright (C) 2007 Peter Johansson
+  Copyright (C) 2007, 2008 Peter Johansson
 
   This file is part of svndigest, http://trac.thep.lu.se/svndigest