Skip to content

Commit

Permalink
configure now picks out the version string from gmtl/Version.h and su…
Browse files Browse the repository at this point in the history
…pplies

it to gmtl-config. Now we need only to update the version string in
gmtl/Version.h.


git-svn-id: https://ggt.svn.sourceforge.net/svnroot/ggt/trunk/GGT/modules/GMTL@531 6382ae23-ed94-47d5-a97d-470f0bc4535f
  • Loading branch information
nonchocoboy committed Jun 3, 2002
1 parent 8eca887 commit d9ed7bd
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
12 changes: 9 additions & 3 deletions configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
#
# -----------------------------------------------------------------
# File: $RCSfile: configure.in,v $
# Date modified: $Date: 2002-05-29 21:25:12 $
# Version: $Revision: 1.5 $
# Date modified: $Date: 2002-06-03 22:11:49 $
# Version: $Revision: 1.6 $
# -----------------------------------------------------------------
#
# ********************************************************** ggt-head end
Expand All @@ -33,7 +33,7 @@
#
# *********************************************************** ggt-cpr end

AC_REVISION($Revision: 1.5 $)
AC_REVISION($Revision: 1.6 $)
AC_INIT(gmtl/gmtl.h)
AC_CANONICAL_SYSTEM
case $target_os in
Expand Down Expand Up @@ -61,12 +61,18 @@ gmtl_cxxflags=''
gmtl_extra_cxxflags=''
gmtl_extra_include_dirs=''

# Pick out the GMTL version from gmtl/Version.h
VERSION_STRING=`grep '^#define *GMTL_VERSION *' "$srcdir/gmtl/Version.h" | sed -e 's/.*GMTL_VERSION *\([0-9]*\.[0-9]*\.[0-9]*\)$/\1/'`


AC_SUBST(GMTLROOT_ABS)
AC_SUBST(topdir)
AC_SUBST(gmtl_cxxflags)
AC_SUBST(gmtl_extra_cxxflags)
AC_SUBST(gmtl_extra_include_dirs)

AC_SUBST(VERSION_STRING)

AC_OUTPUT(gmtl-config
Makefile,
[ sed -e 's/^\(%.*\)/#\1/g' gmtl-config > gmtl-config.tmp
Expand Down
6 changes: 3 additions & 3 deletions gmtl-config.in
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
#
# -----------------------------------------------------------------
# File: $RCSfile: gmtl-config.in,v $
# Date modified: $Date: 2002-04-24 14:56:52 $
# Version: $Revision: 1.2 $
# Date modified: $Date: 2002-06-03 22:11:49 $
# Version: $Revision: 1.3 $
# -----------------------------------------------------------------
#
# ********************************************************** ggt-head end
Expand Down Expand Up @@ -112,7 +112,7 @@ while test $# -gt 0; do
echo_exec_prefix=yes
;;
--version)
echo @MAJOR_VERSION@.@MINOR_VERSION@.@MICRO_VERSION@
echo @VERSION_STRING@
;;
--cxxflags)
echo_cxxflags=yes
Expand Down

0 comments on commit d9ed7bd

Please sign in to comment.