Applied patch from Patrick Welche (all scripts moved in the 'config' and 'm4'
directories).
This commit is contained in:
parent
2907cf36ad
commit
f84c3a6a0c
@ -26,6 +26,7 @@
|
|||||||
docdir = $(LIBTIFF_DOCDIR)
|
docdir = $(LIBTIFF_DOCDIR)
|
||||||
|
|
||||||
AUTOMAKE_OPTIONS = dist-zip foreign
|
AUTOMAKE_OPTIONS = dist-zip foreign
|
||||||
|
ACLOCAL_AMFLAGS = -I ./m4 --output=./m4/aclocal.m4
|
||||||
|
|
||||||
docfiles = \
|
docfiles = \
|
||||||
COPYRIGHT \
|
COPYRIGHT \
|
||||||
|
8
aclocal.m4
vendored
8
aclocal.m4
vendored
@ -1,4 +1,4 @@
|
|||||||
# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
|
# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
|
||||||
|
|
||||||
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
|
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
|
||||||
# 2005 Free Software Foundation, Inc.
|
# 2005 Free Software Foundation, Inc.
|
||||||
@ -28,7 +28,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
|
|||||||
# Call AM_AUTOMAKE_VERSION so it can be traced.
|
# Call AM_AUTOMAKE_VERSION so it can be traced.
|
||||||
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
|
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
|
||||||
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
|
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
|
||||||
[AM_AUTOMAKE_VERSION([1.9.5])])
|
[AM_AUTOMAKE_VERSION([1.9.6])])
|
||||||
|
|
||||||
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
|
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
|
||||||
|
|
||||||
@ -905,5 +905,5 @@ AC_SUBST([am__tar])
|
|||||||
AC_SUBST([am__untar])
|
AC_SUBST([am__untar])
|
||||||
]) # _AM_PROG_TAR
|
]) # _AM_PROG_TAR
|
||||||
|
|
||||||
m4_include([libtool.m4])
|
m4_include([m4/acinclude.m4])
|
||||||
m4_include([acinclude.m4])
|
m4_include([m4/libtool.m4])
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
set -x
|
set -x
|
||||||
libtoolize --force --copy
|
libtoolize --force --copy
|
||||||
aclocal -I .
|
aclocal -I ./m4
|
||||||
autoheader
|
autoheader
|
||||||
automake --foreign --add-missing --copy
|
automake --foreign --add-missing --copy
|
||||||
autoconf
|
autoconf
|
||||||
|
@ -25,14 +25,15 @@ dnl OF THIS SOFTWARE.
|
|||||||
dnl Process this file with autoconf to produce a configure script.
|
dnl Process this file with autoconf to produce a configure script.
|
||||||
|
|
||||||
AC_PREREQ(2.59)
|
AC_PREREQ(2.59)
|
||||||
AC_INIT([LibTIFF Software], 3.7.3, [tiff@remotesensing.org], tiff)
|
AC_INIT([LibTIFF Software], 3.7.4, [tiff@lists.maptools.org], tiff)
|
||||||
|
AC_CONFIG_AUX_DIR(config)
|
||||||
|
AC_CONFIG_MACRO_DIR(m4)
|
||||||
AC_LANG(C)
|
AC_LANG(C)
|
||||||
|
|
||||||
dnl Compute the canonical target-system type variable
|
dnl Compute the canonical target-system type variable
|
||||||
AC_CANONICAL_TARGET
|
AC_CANONICAL_TARGET
|
||||||
|
|
||||||
AM_INIT_AUTOMAKE
|
AM_INIT_AUTOMAKE
|
||||||
AM_PROG_CC_C_O
|
|
||||||
dnl Do not rebuild generated files every time
|
dnl Do not rebuild generated files every time
|
||||||
AM_MAINTAINER_MODE
|
AM_MAINTAINER_MODE
|
||||||
|
|
||||||
@ -40,7 +41,7 @@ dnl Versioning.
|
|||||||
dnl Don't fill the ALPHA_VERSION field, if not applicable.
|
dnl Don't fill the ALPHA_VERSION field, if not applicable.
|
||||||
LIBTIFF_MAJOR_VERSION=3
|
LIBTIFF_MAJOR_VERSION=3
|
||||||
LIBTIFF_MINOR_VERSION=7
|
LIBTIFF_MINOR_VERSION=7
|
||||||
LIBTIFF_MICRO_VERSION=3
|
LIBTIFF_MICRO_VERSION=4
|
||||||
LIBTIFF_ALPHA_VERSION=
|
LIBTIFF_ALPHA_VERSION=
|
||||||
LIBTIFF_VERSION=$LIBTIFF_MAJOR_VERSION.$LIBTIFF_MINOR_VERSION.$LIBTIFF_MICRO_VERSION$LIBTIFF_ALPHA_VERSION
|
LIBTIFF_VERSION=$LIBTIFF_MAJOR_VERSION.$LIBTIFF_MINOR_VERSION.$LIBTIFF_MICRO_VERSION$LIBTIFF_ALPHA_VERSION
|
||||||
dnl This will be used with the 'make release' target
|
dnl This will be used with the 'make release' target
|
||||||
@ -69,6 +70,7 @@ AC_SUBST(LIBTIFF_RELEASE_DATE)
|
|||||||
|
|
||||||
dnl Checks for programs.
|
dnl Checks for programs.
|
||||||
AC_PROG_CC
|
AC_PROG_CC
|
||||||
|
AM_PROG_CC_C_O
|
||||||
|
|
||||||
dnl We want warnings. As many warnings as possible.
|
dnl We want warnings. As many warnings as possible.
|
||||||
VL_PROG_CC_WARNINGS()
|
VL_PROG_CC_WARNINGS()
|
||||||
|
Loading…
Reference in New Issue
Block a user