Revision: 13
Author: zaufi
Date: 2006-03-20 17:57:21 -0800 (Mon, 20 Mar 2006)
ViewCVS: http://svn.sourceforge.net/halfs/?rev=13&view=rev
Log Message:
-----------
implement SVN support + Solaris workarounds for defected sed
Modified Paths:
--------------
m4/trunk/ac_choose_boost.m4
m4/trunk/ac_path_gengetopt.m4
m4/trunk/ac_pkg_info_header.m4
Modified: m4/trunk/ac_choose_boost.m4
===================================================================
--- m4/trunk/ac_choose_boost.m4 2006-03-21 01:56:14 UTC (rev 12)
+++ m4/trunk/ac_choose_boost.m4 2006-03-21 01:57:21 UTC (rev 13)
@@ -1,5 +1,5 @@
##
-## $Header$
+## $Header: /a/c-repository/m4/ac_choose_boost.m4,v 1.3 2006/03/21 00:38:55 alex Exp $
##
##
## Copyright (c) 2003, 2004 by Zaufi
@@ -57,8 +57,8 @@
AC_CACHE_CHECK([boost version], [ac_cv_boost_version],
[
ac_cv_boost_version=`cat $ac_cv_boost_headers_installed_at/boost/version.hpp \
- | grep '^# *define *BOOST_VERSION *[0-9]\+$' \
- | sed 's,^# *define *BOOST_VERSION *\([0-9]\+\)$,\1,'`
+ | grep '^# *define *BOOST_VERSION *[0-9][0-9]*$' \
+ | sed 's,^# *define *BOOST_VERSION *\([0-9][0-9]*\)$,\1,'`
])
am_required_boost_version=ifelse([$1], , $ac_cv_boost_version, $1)
## Try to compile simple program
Modified: m4/trunk/ac_path_gengetopt.m4
===================================================================
--- m4/trunk/ac_path_gengetopt.m4 2006-03-21 01:56:14 UTC (rev 12)
+++ m4/trunk/ac_path_gengetopt.m4 2006-03-21 01:57:21 UTC (rev 13)
@@ -1,5 +1,5 @@
##
-## $Header$
+## $Header: /a/c-repository/m4/ac_path_gengetopt.m4,v 1.3 2006/03/21 00:38:55 alex Exp $
##
##
## 20/03/2002 by Zaufi
@@ -21,17 +21,17 @@
else
ggo_min_version=ifelse([$1], , 2.5, $1)
AC_MSG_CHECKING(for gengetopt vesion >= $ggo_min_version)
- ggo_version=`$GENGETOPT --version | head -n 1 | sed 's/^GNU gengetopt \([[0-9]]\+\.[[0-9]]\+\.*[[0-9]]*\).*/\1/'`
- ggo_major=`echo $ggo_version | sed 's/\([[0-9]]\+\)\.\([[0-9]]\+\)\.*\([[0-9]]*\)/\1/'`
- ggo_minor=`echo $ggo_version | sed 's/\([[0-9]]\+\)\.\([[0-9]]\+\)\.*\([[0-9]]*\)/\2/'`
- ggo_patch=`echo $ggo_version | sed 's/\([[0-9]]\+\)\.\([[0-9]]\+\)\.*\([[0-9]]*\)/\3/'`
+ ggo_version=`$GENGETOPT --version | head -n 1 | sed 's/^GNU gengetopt \([[0-9]][[0-9]]*\.[[0-9]][[0-9]]*\.*[[0-9]]*\).*/\1/'`
+ ggo_major=`echo $ggo_version | sed 's/\([[0-9]][[0-9]]*\)\.\([[0-9]][[0-9]]*\)\.*\([[0-9]]*\)/\1/'`
+ ggo_minor=`echo $ggo_version | sed 's/\([[0-9]][[0-9]]*\)\.\([[0-9]][[0-9]]*\)\.*\([[0-9]]*\)/\2/'`
+ ggo_patch=`echo $ggo_version | sed 's/\([[0-9]][[0-9]]*\)\.\([[0-9]][[0-9]]*\)\.*\([[0-9]]*\)/\3/'`
ggo_major=`test -z $ggo_major && echo 0 || echo $ggo_major`
ggo_minor=`test -z $ggo_minor && echo 0 || echo $ggo_minor`
ggo_patch=`test -z $ggo_patch && echo 0 || echo $ggo_patch`
##
- ggo_min_major=`echo $ggo_min_version | sed 's/\([[0-9]]\+\)\.\([[0-9]]\+\)\.*\([[0-9]]*\)/\1/'`
- ggo_min_minor=`echo $ggo_min_version | sed 's/\([[0-9]]\+\)\.\([[0-9]]\+\)\.*\([[0-9]]*\)/\2/'`
- ggo_min_patch=`echo $ggo_min_version | sed 's/\([[0-9]]\+\)\.\([[0-9]]\+\)\.*\([[0-9]]*\)/\3/'`
+ ggo_min_major=`echo $ggo_min_version | sed 's/\([[0-9]][[0-9]]*\)\.\([[0-9]][[0-9]]*\)\.*\([[0-9]]*\)/\1/'`
+ ggo_min_minor=`echo $ggo_min_version | sed 's/\([[0-9]][[0-9]]*\)\.\([[0-9]][[0-9]]*\)\.*\([[0-9]]*\)/\2/'`
+ ggo_min_patch=`echo $ggo_min_version | sed 's/\([[0-9]][[0-9]]*\)\.\([[0-9]][[0-9]]*\)\.*\([[0-9]]*\)/\3/'`
ggo_min_major=`test -z $ggo_min_major && echo 0 || echo $ggo_min_major`
ggo_min_minor=`test -z $ggo_min_minor && echo 0 || echo $ggo_min_minor`
ggo_min_patch=`test -z $ggo_min_patch && echo 0 || echo $ggo_min_patch`
Modified: m4/trunk/ac_pkg_info_header.m4
===================================================================
--- m4/trunk/ac_pkg_info_header.m4 2006-03-21 01:56:14 UTC (rev 12)
+++ m4/trunk/ac_pkg_info_header.m4 2006-03-21 01:57:21 UTC (rev 13)
@@ -1,8 +1,9 @@
##
-## $Header$
+## $Id: ac_pkg_info_header.m4,v 1.6 2006/03/21 00:38:55 alex Exp $
##
## Mon 24 Jun 2002 01:34:16 AM MSD by Zaufi -- initial implementation
## Tue 22 Mar 2005 02:56:18 AM MSK by Zaufi -- add macros to make cute configuration summary info block
+## Mon Mar 20 17:55:28 MSK 2006 by Zaufi -- add SVN support
##
##
@@ -48,21 +49,33 @@
AC_MSG_RESULT([])
fi
- # Check CVS tag
- if test -f $srcdir/CVS/Tag; then
- ac_pih_cvs_tag='CVS Branch: '`cat $srcdir/CVS/Tag | sed 's,^T\(.*\)$,\1,'`
- else if test -d $srcdir/CVS; then
- ac_pih_cvs_tag='CVS Branch: HEAD'
+ # detect VSC used
+ if test -d $srcdir/CVS; then
+ # Check CVS tag
+ if test -f $srcdir/CVS/Tag; then
+ ac_pih_tag='CVS Branch: '`cat $srcdir/CVS/Tag | sed 's,^T\(.*\)$,\1,'`
+ else
+ ac_pih_tag='CVS Branch: HEAD'
+ fi
+ else if test -d $srcdir/.svn; then
+ ac_svn_rep_root=`svn info | grep '^Repository Root' | sed 's,.*: \(.*\),\1,'`
+ ac_svn_mod_root=`svn info | grep '^URL' | sed 's,.*: \(.*\),\1,'`
+ ac_is_trunk=`echo $ac_svn_mod_root | sed "s,$ac_svn_rep_root,," | grep '^/[[^/]][[^/]]*/trunk.*'`
+ if test -n "$ac_is_trunk"; then
+ ac_pih_tag='SVN Branch: HEAD'
+ else
+ ac_pih_tag='SVN Branch: '`echo $ac_svn_mod_root | sed -e "s,$ac_svn_rep_root,," -e 's,.*branches/\([[^/]][[^/]]*\).*,\1,'`
+ fi
else
- ac_pih_cvs_tag="$PACKAGE_BUGREPORT"
+ ac_pih_tag="$PACKAGE_BUGREPORT"
fi fi
ac_pih_version_tag=" Version: $PACKAGE_VERSION "
- if test -n "$ac_pih_cvs_tag"; then
+ if test -n "$ac_pih_tag"; then
ac_pih_space_line=$ac_pih_space_line_org
- ac_pih_space_line=${ac_pih_space_line:0:$(( $ac_pih_length - ${#ac_pih_cvs_tag} - ${#ac_pih_version_tag} - 2))}
+ ac_pih_space_line=${ac_pih_space_line:0:$(( $ac_pih_length - ${#ac_pih_tag} - ${#ac_pih_version_tag} - 2))}
fi
- AC_MSG_RESULT([${ac_pih_version_tag}${ac_pih_space_line}${ac_pih_cvs_tag}])
+ AC_MSG_RESULT([${ac_pih_version_tag}${ac_pih_space_line}${ac_pih_tag}])
AC_MSG_RESULT([$ac_pih_hdrline])
])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
