fix c-ares version reported in generated libcares.pc file when building

from CVS tree.
pull/1/head
Yang Tse 17 years ago
parent 13f4c3ea54
commit 371f63f73a
  1. 13
      configure.ac
  2. 4
      maketgz

@ -1,9 +1,12 @@
AC_INIT([c-ares],[1.5.1],[daniel@haxx.se])
AC_PREREQ(2.57) AC_PREREQ(2.57)
dnl Version not hardcoded here. Fetched later from ares_version.h
AC_INIT([c-ares], [-],
[c-ares mailing list => http://cool.haxx.se/mailman/listinfo/c-ares])
AC_CONFIG_SRCDIR([ares_ipv6.h]) AC_CONFIG_SRCDIR([ares_ipv6.h])
AM_CONFIG_HEADER([config.h]) AM_CONFIG_HEADER([config.h])
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
AM_INIT_AUTOMAKE
dnl SED is mandatory for configure process and libtool. dnl SED is mandatory for configure process and libtool.
dnl Set it now and prevent it from being changed later. dnl Set it now and prevent it from being changed later.
@ -53,6 +56,12 @@ if test -z "$AR" || test "$AR" = "not_found"; then
fi fi
AC_SUBST([AR]) AC_SUBST([AR])
dnl Fetch c-ares version from ares_version.h
VERSION=`$SED -ne 's/^#define ARES_VERSION_STR "\(.*\)"/\1/p' ${srcdir}/ares_version.h`
AM_INIT_AUTOMAKE([c-ares], [$VERSION])
AC_MSG_CHECKING([c-ares version])
AC_MSG_RESULT([$VERSION])
dnl dnl
dnl Detect the canonical host and target build environment dnl Detect the canonical host and target build environment
dnl dnl

@ -38,7 +38,7 @@ if(!-f "configure") {
`./buildconf`; `./buildconf`;
} }
print "adding $version in the configure.ac file\n"; print "adding $version in the configure.ac file\n";
`sed -e 's/AC_INIT.*/AC_INIT([c-ares], [$version])/' < configure.ac > configure.ac.dist`; `sed -e 's/AC_INIT.*/AC_INIT([c-ares], [$version],/' < configure.ac > configure.ac.dist`;
# now make a new configure script with this # now make a new configure script with this
print "makes a new configure script\n"; print "makes a new configure script\n";
@ -54,5 +54,7 @@ print "running make dist\n";
print "removing temporary configure.ac file\n"; print "removing temporary configure.ac file\n";
`rm configure.ac.dist`; `rm configure.ac.dist`;
print "removing temporary ares_version.h file\n";
`rm ares_version.h.dist`;
print "NOTE: now cvs tag this release!\n"; print "NOTE: now cvs tag this release!\n";

Loading…
Cancel
Save