generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
from CVS tree.
This commit is contained in:
Yang Tse
2008-07-07 02:11:21 +00:00
parent 7820391cb9
commit d816a11bca
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ares/configure.ac
View File

@@ -1,9 +1,12 @@
AC_INIT([c-ares],[1.5.1],[daniel@haxx.se])
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])
AM_CONFIG_HEADER([config.h])
AM_MAINTAINER_MODE
AM_INIT_AUTOMAKE
dnl SED is mandatory for configure process and libtool.
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
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 Detect the canonical host and target build environment
dnl

4
ares/maketgz
View File

@@ -38,7 +38,7 @@ if(!-f "configure") {
`./buildconf`;
}
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
print "makes a new configure script\n";
@@ -54,5 +54,7 @@ print "running make dist\n";
print "removing temporary configure.ac file\n";
`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";