Version number has been changed; use libtool versioning instead of
package release numbers.
This commit is contained in:
Andrey Kiselev
parent
635c6b8cec
commit
d8207f580b
89
configure
vendored
89
configure
vendored
@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.61 for LibTIFF Software 3.8.2.
|
||||
# Generated by GNU Autoconf 2.61 for LibTIFF Software 4.0.0alpha.
|
||||
#
|
||||
# Report bugs to <tiff@lists.maptools.org>.
|
||||
#
|
||||
@ -723,8 +723,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
|
||||
# Identity of this package.
|
||||
PACKAGE_NAME='LibTIFF Software'
|
||||
PACKAGE_TARNAME='tiff'
|
||||
PACKAGE_VERSION='3.8.2'
|
||||
PACKAGE_STRING='LibTIFF Software 3.8.2'
|
||||
PACKAGE_VERSION='4.0.0alpha'
|
||||
PACKAGE_STRING='LibTIFF Software 4.0.0alpha'
|
||||
PACKAGE_BUGREPORT='tiff@lists.maptools.org'
|
||||
|
||||
# Factoring default headers for most tests.
|
||||
@ -1425,7 +1425,7 @@ if test "$ac_init_help" = "long"; then
|
||||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
\`configure' configures LibTIFF Software 3.8.2 to adapt to many kinds of systems.
|
||||
\`configure' configures LibTIFF Software 4.0.0alpha to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
@ -1500,7 +1500,7 @@ fi
|
||||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of LibTIFF Software 3.8.2:";;
|
||||
short | recursive ) echo "Configuration of LibTIFF Software 4.0.0alpha:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
@ -1653,7 +1653,7 @@ fi
|
||||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
LibTIFF Software configure 3.8.2
|
||||
LibTIFF Software configure 4.0.0alpha
|
||||
generated by GNU Autoconf 2.61
|
||||
|
||||
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
||||
@ -1667,7 +1667,7 @@ cat >config.log <<_ACEOF
|
||||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by LibTIFF Software $as_me 3.8.2, which was
|
||||
It was created by LibTIFF Software $as_me 4.0.0alpha, which was
|
||||
generated by GNU Autoconf 2.61. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
@ -2472,7 +2472,7 @@ fi
|
||||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='tiff'
|
||||
VERSION='3.8.2'
|
||||
VERSION='4.0.0alpha'
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
@ -2643,25 +2643,30 @@ fi
|
||||
|
||||
|
||||
|
||||
LIBTIFF_MAJOR_VERSION=3
|
||||
LIBTIFF_MINOR_VERSION=8
|
||||
LIBTIFF_MICRO_VERSION=2
|
||||
LIBTIFF_ALPHA_VERSION=
|
||||
LIBTIFF_MAJOR_VERSION=4
|
||||
LIBTIFF_MINOR_VERSION=0
|
||||
LIBTIFF_MICRO_VERSION=0
|
||||
LIBTIFF_ALPHA_VERSION=alpha
|
||||
LIBTIFF_VERSION=$LIBTIFF_MAJOR_VERSION.$LIBTIFF_MINOR_VERSION.$LIBTIFF_MICRO_VERSION$LIBTIFF_ALPHA_VERSION
|
||||
LIBTIFF_RELEASE_DATE=`date +"%Y%m%d"`
|
||||
|
||||
LIBTIFF_CURRENT=5
|
||||
LIBTIFF_REVISION=0
|
||||
LIBTIFF_AGE=0
|
||||
LIBTIFF_VERSION_INFO=$LIBTIFF_CURRENT:$LIBTIFF_REVISION:$LIBTIFF_AGE
|
||||
|
||||
# This is a special hack for OpenBSD and MirOS systems. The dynamic linker
|
||||
# in OpenBSD uses some special semantics for shared libraries. Their soname
|
||||
# contains only two numbers, major and minor.
|
||||
# See http://bugzilla.remotesensing.org/show_bug.cgi?id=838 for details.
|
||||
case "$target_os" in
|
||||
openbsd* | mirbsd*)
|
||||
LIBTIFF_VERSION_INFO=$LIBTIFF_MAJOR_VERSION$LIBTIFF_MINOR_VERSION:$LIBTIFF_MICRO_VERSION$LIBTIFF_ALPHA_VERSION:0
|
||||
;;
|
||||
*)
|
||||
LIBTIFF_VERSION_INFO=$LIBTIFF_MAJOR_VERSION:$LIBTIFF_MINOR_VERSION:$LIBTIFF_MICRO_VERSION$LIBTIFF_ALPHA_VERSION
|
||||
;;
|
||||
esac
|
||||
#case "$target_os" in
|
||||
# openbsd* | mirbsd*)
|
||||
# LIBTIFF_VERSION_INFO=$LIBTIFF_MAJOR_VERSION$LIBTIFF_MINOR_VERSION:$LIBTIFF_MICRO_VERSION:0
|
||||
# ;;
|
||||
# *)
|
||||
# LIBTIFF_VERSION_INFO=$LIBTIFF_MAJOR_VERSION:$LIBTIFF_MINOR_VERSION:$LIBTIFF_MICRO_VERSION
|
||||
# ;;
|
||||
#esac
|
||||
|
||||
|
||||
|
||||
@ -5187,13 +5192,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
|
||||
else
|
||||
lt_cv_nm_interface="BSD nm"
|
||||
echo "int some_variable = 0;" > conftest.$ac_ext
|
||||
(eval echo "\"\$as_me:5190: $ac_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:5195: $ac_compile\"" >&5)
|
||||
(eval "$ac_compile" 2>conftest.err)
|
||||
cat conftest.err >&5
|
||||
(eval echo "\"\$as_me:5193: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
|
||||
(eval echo "\"\$as_me:5198: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
|
||||
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
|
||||
cat conftest.err >&5
|
||||
(eval echo "\"\$as_me:5196: output\"" >&5)
|
||||
(eval echo "\"\$as_me:5201: output\"" >&5)
|
||||
cat conftest.out >&5
|
||||
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
|
||||
lt_cv_nm_interface="MS dumpbin"
|
||||
@ -6292,7 +6297,7 @@ ia64-*-hpux*)
|
||||
;;
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 6295 "configure"' > conftest.$ac_ext
|
||||
echo '#line 6300 "configure"' > conftest.$ac_ext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
@ -7387,11 +7392,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:7390: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:7395: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:7394: \$? = $ac_status" >&5
|
||||
echo "$as_me:7399: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@ -7709,11 +7714,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:7712: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:7717: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:7716: \$? = $ac_status" >&5
|
||||
echo "$as_me:7721: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@ -7814,11 +7819,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:7817: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:7822: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:7821: \$? = $ac_status" >&5
|
||||
echo "$as_me:7826: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -7869,11 +7874,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:7872: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:7877: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:7876: \$? = $ac_status" >&5
|
||||
echo "$as_me:7881: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -10629,7 +10634,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 10632 "configure"
|
||||
#line 10637 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -10729,7 +10734,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 10732 "configure"
|
||||
#line 10737 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -23189,11 +23194,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:23192: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:23197: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:23196: \$? = $ac_status" >&5
|
||||
echo "$as_me:23201: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@ -23288,11 +23293,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:23291: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:23296: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:23295: \$? = $ac_status" >&5
|
||||
echo "$as_me:23300: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -23340,11 +23345,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:23343: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:23348: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:23347: \$? = $ac_status" >&5
|
||||
echo "$as_me:23352: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -25080,7 +25085,7 @@ exec 6>&1
|
||||
# report actual input values of CONFIG_FILES etc. instead of their
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
This file was extended by LibTIFF Software $as_me 3.8.2, which was
|
||||
This file was extended by LibTIFF Software $as_me 4.0.0alpha, which was
|
||||
generated by GNU Autoconf 2.61. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@ -25133,7 +25138,7 @@ Report bugs to <bug-autoconf@gnu.org>."
|
||||
_ACEOF
|
||||
cat >>$CONFIG_STATUS <<_ACEOF
|
||||
ac_cs_version="\\
|
||||
LibTIFF Software config.status 3.8.2
|
||||
LibTIFF Software config.status 4.0.0alpha
|
||||
configured by $0, generated by GNU Autoconf 2.61,
|
||||
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
|
||||
|
||||
|
||||
49
configure.ac
49
configure.ac
@ -25,7 +25,7 @@ dnl OF THIS SOFTWARE.
|
||||
dnl Process this file with autoconf to produce a configure script.
|
||||
|
||||
AC_PREREQ(2.59)
|
||||
AC_INIT([LibTIFF Software], 3.8.2, [tiff@lists.maptools.org], tiff)
|
||||
AC_INIT([LibTIFF Software], 4.0.0alpha, [tiff@lists.maptools.org], tiff)
|
||||
AC_CONFIG_AUX_DIR(config)
|
||||
AC_CONFIG_MACRO_DIR(m4)
|
||||
AC_LANG(C)
|
||||
@ -39,26 +39,49 @@ AM_MAINTAINER_MODE
|
||||
|
||||
dnl Versioning.
|
||||
dnl Don't fill the ALPHA_VERSION field, if not applicable.
|
||||
LIBTIFF_MAJOR_VERSION=3
|
||||
LIBTIFF_MINOR_VERSION=8
|
||||
LIBTIFF_MICRO_VERSION=2
|
||||
LIBTIFF_ALPHA_VERSION=
|
||||
LIBTIFF_MAJOR_VERSION=4
|
||||
LIBTIFF_MINOR_VERSION=0
|
||||
LIBTIFF_MICRO_VERSION=0
|
||||
LIBTIFF_ALPHA_VERSION=alpha
|
||||
LIBTIFF_VERSION=$LIBTIFF_MAJOR_VERSION.$LIBTIFF_MINOR_VERSION.$LIBTIFF_MICRO_VERSION$LIBTIFF_ALPHA_VERSION
|
||||
dnl This will be used with the 'make release' target
|
||||
LIBTIFF_RELEASE_DATE=`date +"%Y%m%d"`
|
||||
|
||||
dnl Following version updating rules are quoted from the libtool manual.
|
||||
dnl
|
||||
dnl - Update the version information only immediately before a public
|
||||
dnl release of your software. More frequent updates are unnecessary,
|
||||
dnl and only guarantee that the current interface number gets larger
|
||||
dnl faster.
|
||||
dnl
|
||||
dnl - If the library source code has not changed at all since the last
|
||||
dnl update, then increment REVISION (`C:R:A' becomes `C:r+1:A').
|
||||
dnl
|
||||
dnl - If any interfaces have been added, removed, or changed since the
|
||||
dnl last update, increment CURRENT, and set REVISION to 0.
|
||||
dnl
|
||||
dnl - If any interfaces have been added since the last public release,
|
||||
dnl then increment AGE.
|
||||
dnl
|
||||
dnl - If any interfaces have been removed since the last public release,
|
||||
dnl then set AGE to 0.
|
||||
LIBTIFF_CURRENT=5
|
||||
LIBTIFF_REVISION=0
|
||||
LIBTIFF_AGE=0
|
||||
LIBTIFF_VERSION_INFO=$LIBTIFF_CURRENT:$LIBTIFF_REVISION:$LIBTIFF_AGE
|
||||
|
||||
# This is a special hack for OpenBSD and MirOS systems. The dynamic linker
|
||||
# in OpenBSD uses some special semantics for shared libraries. Their soname
|
||||
# contains only two numbers, major and minor.
|
||||
# See http://bugzilla.remotesensing.org/show_bug.cgi?id=838 for details.
|
||||
case "$target_os" in
|
||||
openbsd* | mirbsd*)
|
||||
LIBTIFF_VERSION_INFO=$LIBTIFF_MAJOR_VERSION$LIBTIFF_MINOR_VERSION:$LIBTIFF_MICRO_VERSION$LIBTIFF_ALPHA_VERSION:0
|
||||
;;
|
||||
*)
|
||||
LIBTIFF_VERSION_INFO=$LIBTIFF_MAJOR_VERSION:$LIBTIFF_MINOR_VERSION:$LIBTIFF_MICRO_VERSION$LIBTIFF_ALPHA_VERSION
|
||||
;;
|
||||
esac
|
||||
#case "$target_os" in
|
||||
# openbsd* | mirbsd*)
|
||||
# LIBTIFF_VERSION_INFO=$LIBTIFF_MAJOR_VERSION$LIBTIFF_MINOR_VERSION:$LIBTIFF_MICRO_VERSION:0
|
||||
# ;;
|
||||
# *)
|
||||
# LIBTIFF_VERSION_INFO=$LIBTIFF_MAJOR_VERSION:$LIBTIFF_MINOR_VERSION:$LIBTIFF_MICRO_VERSION
|
||||
# ;;
|
||||
#esac
|
||||
|
||||
AC_SUBST(LIBTIFF_MAJOR_VERSION)
|
||||
AC_SUBST(LIBTIFF_MINOR_VERSION)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user