Changeset 21:40d6f625e549 in lemon-1.2

Timestamp:

01/03/08 11:12:27 (17 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Parents:

19:5e9f3d3c115b (diff), 6:099a4f1844f1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Phase:

public

Message:

Merge

File:

• configure.ac (modified) (3 diffs)

configure.ac

@@ -7 +7 @@
 m4_define([lemon_version_nano], [])
 m4_define([lemon_version_tag], [hg])
-m4_define([lemon_hg_revision], [m4_normalize(esyscmd([hg tip |grep ^changeset |cut -d ':' -f 3]))])
-m4_define([lemon_version], [lemon_version_major().lemon_version_minor()ifelse(lemon_version_micro(), [], [], [.lemon_version_micro()])ifelse(lemon_version_nano(), [], [], [.lemon_version_nano()])ifelse(lemon_version_tag(), [], [], lemon_version_tag(), [hg], [[_]lemon_version_tag()[]lemon_hg_revision()], [[_]lemon_version_tag()])])
+m4_define([lemon_hg_revision], [m4_normalize(esyscmd([hg id -i]))])
+m4_define([lemon_version], [lemon_version_major().lemon_version_minor()ifelse(lemon_version_micro(), [], [], [.lemon_version_micro()])ifelse(lemon_version_nano(), [], [], [.lemon_version_nano()])ifelse(lemon_version_tag(), [], [], lemon_version_tag(), [hg], [[_]lemon_version_tag()[_]lemon_hg_revision()], [[_]lemon_version_tag()])])
 
 AC_PREREQ([2.59])
@@ -138 +138 @@
 echo SOPLEX support................ : $lx_soplex_found
 echo
-echo Build benchmarks.............. : $enable_benchmark
-echo Build demo programs........... : $enable_demo
-echo Build additional tools........ : $enable_tools
+echo build benchmarks.............. : $enable_benchmark
+echo build demo programs........... : $enable_demo
+echo build additional tools........ : $enable_tools
 echo
 echo The packace will be installed in
@@ -153 +153 @@
 
 echo
-echo Configure complete, now type \'make\' and then \'make install\'.
+echo configure complete, now type \'make\' and then \'make install\'.
 echo