[GiNaC-list] [PATCH] build system: wipe deprecated autoconf macros
Sheplyakov Alexei
varg at theor.jinr.ru
Thu Jun 30 08:08:26 CEST 2005
Oops, I've forgotten to attach the patch itself!
--
ROOT: an octopus made by nailing extra legs onto a cat.
-------------- next part --------------
Index: configure.ac
===================================================================
RCS file: /home/cvs/GiNaC/configure.ac,v
retrieving revision 1.21.2.1
diff -r1.21.2.1 configure.ac
3,6d2
< AC_INIT
< AC_CONFIG_SRCDIR(ginac/basic.cpp)
< AC_PREREQ(2.50)
<
10,13c6,9
< dnl GINACLIB_MICRO_VERSION += 1;
< dnl GINACLIB_INTERFACE_AGE += 1;
< dnl GINACLIB_BINARY_AGE += 1;
< dnl if any functions have been added, set GINACLIB_INTERFACE_AGE to 0.
---
> dnl ginac_micro_version += 1;
> dnl ginac_interface_age += 1;
> dnl ginac_binary_age += 1;
> dnl if any functions have been added, set ginac_interface_age to 0.
15,16c11,27
< dnl set GINACLIB_BINARY_AGE and GINACLIB_INTERFACE_AGE to 0.
< dnl
---
> dnl set ginac_binary_age and ginac_interface_age to 0.
>
> m4_define([ginac_major_version], [1])
> m4_define([ginac_minor_version], [3])
> m4_define([ginac_micro_version], [1])
> m4_define([ginac_version], [ginac_major_version.ginac_minor_version.ginac_micro_version])
> m4_define([ginac_release], [ginac_major_version.ginac_minor_version])
> m4_define([ginac_interface_age], [0])
> m4_define([ginac_binary_age], [1])
>
> AC_INIT([GiNaC], ginac_version, [<ginac-bugs at ginac.de>])
> AC_PREREQ(2.52)
> AC_CONFIG_SRCDIR(ginac/basic.cpp)
> AC_CONFIG_HEADERS(config.h)
> dnl This defines PACKAGE and VERSION.
> AM_INIT_AUTOMAKE([gnu 1.7 dist-bzip2])
>
20,27c31,39
<
< GINACLIB_MAJOR_VERSION=1
< GINACLIB_MINOR_VERSION=3
< GINACLIB_MICRO_VERSION=1
< GINACLIB_INTERFACE_AGE=0
< GINACLIB_BINARY_AGE=1
< GINACLIB_VERSION=$GINACLIB_MAJOR_VERSION.$GINACLIB_MINOR_VERSION.$GINACLIB_MICRO_VERSION
<
---
> dnl
> dnl Apparently, it *can* be renamed to GINAC_MAJOR_VERSION
> dnl (as of autoconf 2.59), but then one need to %s/GINACLIB/GINAC/g
> dnl in a bunch of files - Alexei
>
> GINACLIB_MAJOR_VERSION=ginac_major_version
> GINACLIB_MINOR_VERSION=ginac_minor_version
> GINACLIB_MICRO_VERSION=ginac_micro_version
> GINACLIB_VERSION=ginac_version
31,32d42
< AC_SUBST(GINACLIB_INTERFACE_AGE)
< AC_SUBST(GINACLIB_BINARY_AGE)
53,56c63,67
< LT_RELEASE=$GINACLIB_MAJOR_VERSION.$GINACLIB_MINOR_VERSION
< LT_CURRENT=`expr $GINACLIB_MICRO_VERSION - $GINACLIB_INTERFACE_AGE`
< LT_REVISION=$GINACLIB_INTERFACE_AGE
< LT_AGE=`expr $GINACLIB_BINARY_AGE - $GINACLIB_INTERFACE_AGE`
---
> m4_define([lt_revision], [ginac_interface_age])
> m4_define([lt_current], [m4_eval(ginac_micro_version - ginac_interface_age)])
> m4_define([lt_age], [m4_eval(ginac_binary_age - ginac_interface_age)])
> LT_VERSION_INFO="lt_current:lt_revision:lt_age"
> LT_RELEASE="ginac_release"
57a69
> AC_SUBST(LT_VERSION_INFO)
59,61d70
< AC_SUBST(LT_CURRENT)
< AC_SUBST(LT_REVISION)
< AC_SUBST(LT_AGE)
63,65d71
< dnl This defines PACKAGE and VERSION.
< AM_CONFIG_HEADER(config.h)
< AM_INIT_AUTOMAKE([GiNaC], $GINACLIB_VERSION)
Index: Makefile.am
===================================================================
RCS file: /home/cvs/GiNaC/Makefile.am,v
retrieving revision 1.15
diff -r1.15 Makefile.am
5,7d4
< # Requires automake 1.4
< AUTOMAKE_OPTIONS = 1.4
<
Index: autogen.sh
===================================================================
RCS file: /home/cvs/GiNaC/autogen.sh,v
retrieving revision 1.5
diff -r1.5 autogen.sh
1,79d0
< #! /bin/sh
< # Run this to generate all the initial makefiles, etc.
< # This was lifted from the Gimp, and adapted slightly by
< # Christian Bauer.
<
< DIE=0
<
< PROG=GiNaC
<
< # Check how echo works in this /bin/sh
< case `echo -n` in
< -n) _echo_n= _echo_c='\c';;
< *) _echo_n=-n _echo_c=;;
< esac
<
< (autoconf --version) < /dev/null > /dev/null 2>&1 || {
< echo
< echo "You must have autoconf installed to compile $PROG."
< echo "Download the appropriate package for your distribution,"
< echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
< DIE=1
< }
<
< (libtoolize --version) < /dev/null > /dev/null 2>&1 || {
< echo
< echo "You must have libtool installed to compile $PROG."
< echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.4.tar.gz"
< echo "(or a newer version if it is available)"
< DIE=1
< }
<
< (automake --version) < /dev/null > /dev/null 2>&1 || {
< echo
< echo "You must have automake installed to compile $PROG."
< echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.4.tar.gz"
< echo "(or a newer version if it is available)"
< DIE=1
< }
<
< (aclocal --version) < /dev/null > /dev/null 2>&1 || {
< echo
< echo "**Error**: Missing aclocal. The version of automake"
< echo "installed doesn't appear recent enough."
< echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.4.tar.gz"
< echo "(or a newer version if it is available)"
< DIE=1
< }
<
< if test "$DIE" -eq 1; then
< exit 1
< fi
<
< aclocalinclude="$ACLOCAL_FLAGS"; \
< (echo $_echo_n " + Running aclocal: $_echo_c"; \
< aclocal $aclocalinclude; \
< echo "done.") && \
< (echo $_echo_n " + Running libtoolize: $_echo_c"; \
< libtoolize --force --copy >/dev/null 2>&1; \
< echo "done.") && \
< (echo $_echo_n " + Running autoheader: $_echo_c"; \
< autoheader; \
< echo "done.") && \
< (echo $_echo_n " + Running automake: $_echo_c"; \
< automake --gnu --add-missing --copy; \
< echo "done.") && \
< (echo $_echo_n " + Running autoconf: $_echo_c"; \
< autoconf; \
< echo "done.")
<
< rm -f config.cache
<
< if [ x"$NO_CONFIGURE" = "x" ]; then
< echo " + Running 'configure $@':"
< if [ -z "$*" ]; then
< echo " ** If you wish to pass arguments to ./configure, please"
< echo " ** specify them on the command line."
< fi
< ./configure "$@"
< fi
Index: ginac/Makefile.am
===================================================================
RCS file: /home/cvs/GiNaC/ginac/Makefile.am,v
retrieving revision 1.33
diff -r1.33 Makefile.am
13,14c13
< libginac_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
< -release $(LT_RELEASE)
---
> libginac_la_LDFLAGS = -version-info $(LT_VERSION_INFO) -release $(LT_RELEASE)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : http://www.cebix.net/pipermail/ginac-list/attachments/20050630/58d254ff/attachment.pgp
More information about the GiNaC-list
mailing list