diff --git a/include/curl/Makefile.am b/include/curl/Makefile.am index c45332b0d..71a60916c 100644 --- a/include/curl/Makefile.am +++ b/include/curl/Makefile.am @@ -1,8 +1,3 @@ pkginclude_HEADERS = \ - curl.h \ - easy.h \ - mprintf.h \ - stdcheaders.h \ - types.h \ - multi.h + curl.h curlver.h easy.h mprintf.h stdcheaders.h types.h multi.h pkgincludedir= $(includedir)/curl diff --git a/include/curl/curl.h b/include/curl/curl.h index 0a3b32717..a81c915d6 100644 --- a/include/curl/curl.h +++ b/include/curl/curl.h @@ -27,31 +27,7 @@ http://curl.haxx.se/libcurl/ */ -/* This is the version number of the libcurl package from which this header - file origins: */ -#define LIBCURL_VERSION "7.11.0-CVS" - -/* This is the numeric version of the libcurl version number, meant for easier - parsing and comparions by programs. The LIBCURL_VERSION_NUM define will - always follow this syntax: - - 0xXXYYZZ - - Where XX, YY and ZZ are the main version, release and patch numbers in - hexadecimal. All three numbers are always represented using two digits. 1.2 - would appear as "0x010200" while version 9.11.7 appears as "0x090b07". - - This 6-digit hexadecimal number does not show pre-release number, and it is - always a greater number in a more recent release. It makes comparisons with - greater than and less than work. -*/ -#define LIBCURL_VERSION_NUM 0x070b00 - -/* The numeric version number is also available "in parts" by using these - defines: */ -#define LIBCURL_VERSION_MAJOR 7 -#define LIBCURL_VERSION_MINOR 11 -#define LIBCURL_VERSION_PATCH 0 +#include "curlver.h" /* the libcurl version defines */ #include #include diff --git a/include/curl/curlver.h b/include/curl/curlver.h new file mode 100644 index 000000000..5bda9d703 --- /dev/null +++ b/include/curl/curlver.h @@ -0,0 +1,55 @@ +#ifndef __CURL_CURLVER_H +#define __CURL_CURLVER_H +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) 1998 - 2004, Daniel Stenberg, , et al. + * + * This software is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at http://curl.haxx.se/docs/copyright.html. + * + * You may opt to use, copy, modify, merge, publish, distribute and/or sell + * copies of the Software, and permit persons to whom the Software is + * furnished to do so, under the terms of the COPYING file. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + * $Id$ + ***************************************************************************/ + +/* This header file contains nothing but libcurl version info, generated by + a script at release-time. This was made its own header file in 7.11.2 */ + +/* This is the version number of the libcurl package from which this header + file origins: */ +#define LIBCURL_VERSION "7.11.0-CVS" + +/* This is the numeric version of the libcurl version number, meant for easier + parsing and comparions by programs. The LIBCURL_VERSION_NUM define will + always follow this syntax: + + 0xXXYYZZ + + Where XX, YY and ZZ are the main version, release and patch numbers in + hexadecimal. All three numbers are always represented using two digits. 1.2 + would appear as "0x010200" while version 9.11.7 appears as "0x090b07". + + This 6-digit hexadecimal number does not show pre-release number, and it is + always a greater number in a more recent release. It makes comparisons with + greater than and less than work. +*/ +#define LIBCURL_VERSION_NUM 0x070b00 + +/* The numeric version number is also available "in parts" by using these + defines: */ +#define LIBCURL_VERSION_MAJOR 7 +#define LIBCURL_VERSION_MINOR 11 +#define LIBCURL_VERSION_PATCH 0 + +#endif /* __CURL_CURLVER_H */ diff --git a/maketgz b/maketgz index 4e7bdaef6..0ae985f74 100755 --- a/maketgz +++ b/maketgz @@ -20,7 +20,7 @@ patch=`echo $libversion |cut -d. -f3 | cut -d- -f1 | sed -e "s/[^0-9]//g"` numeric=`echo "obase=16; $major*256*256 + $minor*256 + $patch" | bc` -HEADER=include/curl/curl.h +HEADER=include/curl/curlver.h CHEADER=src/version.h # Replace version number in header file: