Skip to content

Commit a2d9c7a

Browse files
committed
Regenerated with automake-1.7.5.
1 parent 4b68bbd commit a2d9c7a

File tree

4 files changed

+43
-48
lines changed

4 files changed

+43
-48
lines changed

aclocal.m4

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# generated automatically by aclocal 1.7.3 -*- Autoconf -*-
1+
# generated automatically by aclocal 1.7.5 -*- Autoconf -*-
22

33
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
44
# Free Software Foundation, Inc.
@@ -16,7 +16,7 @@
1616
# This macro actually does too much some checks are only needed if
1717
# your package does certain things. But this isn't really a big deal.
1818

19-
# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
19+
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
2020
# Free Software Foundation, Inc.
2121

2222
# This program is free software; you can redistribute it and/or modify
@@ -34,14 +34,7 @@
3434
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
3535
# 02111-1307, USA.
3636

37-
# serial 9
38-
39-
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
40-
# written in clear, in which case automake, when reading aclocal.m4,
41-
# will think it sees a *use*, and therefore will trigger all it's
42-
# C support machinery. Also note that it means that autoscan, seeing
43-
# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
44-
37+
# serial 10
4538

4639
AC_PREREQ([2.54])
4740

@@ -170,7 +163,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"])
170163
# Call AM_AUTOMAKE_VERSION so it can be traced.
171164
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
172165
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
173-
[AM_AUTOMAKE_VERSION([1.7.3])])
166+
[AM_AUTOMAKE_VERSION([1.7.5])])
174167

175168
# Helper functions for option handling. -*- Autoconf -*-
176169

@@ -720,7 +713,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
720713

721714
# Check to see how 'make' treats includes. -*- Autoconf -*-
722715

723-
# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
716+
# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
724717

725718
# This program is free software; you can redistribute it and/or modify
726719
# it under the terms of the GNU General Public License as published by
@@ -745,8 +738,9 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
745738
AC_DEFUN([AM_MAKE_INCLUDE],
746739
[am_make=${MAKE-make}
747740
cat > confinc << 'END'
748-
doit:
741+
am__doit:
749742
@echo done
743+
.PHONY: am__doit
750744
END
751745
# If we don't find an include directive, just comment out the code.
752746
AC_MSG_CHECKING([for style of include used by $am_make])
@@ -774,9 +768,9 @@ if test "$am__include" = "#"; then
774768
_am_result=BSD
775769
fi
776770
fi
777-
AC_SUBST(am__include)
778-
AC_SUBST(am__quote)
779-
AC_MSG_RESULT($_am_result)
771+
AC_SUBST([am__include])
772+
AC_SUBST([am__quote])
773+
AC_MSG_RESULT([$_am_result])
780774
rm -f confinc confmf
781775
])
782776

configure

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2782,8 +2782,9 @@ DEPDIR="${am__leading_dot}deps"
27822782

27832783
am_make=${MAKE-make}
27842784
cat > confinc << 'END'
2785-
doit:
2785+
am__doit:
27862786
@echo done
2787+
.PHONY: am__doit
27872788
END
27882789
# If we don't find an include directive, just comment out the code.
27892790
echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
@@ -4748,7 +4749,7 @@ ia64-*-hpux*)
47484749
;;
47494750
*-*-irix6*)
47504751
# Find out which ABI we are using.
4751-
echo '#line 4751 "configure"' > conftest.$ac_ext
4752+
echo '#line 4752 "configure"' > conftest.$ac_ext
47524753
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
47534754
(eval $ac_compile) 2>&5
47544755
ac_status=$?
@@ -6014,7 +6015,7 @@ fi
60146015

60156016

60166017
# Provide some information about the compiler.
6017-
echo "$as_me:6017:" \
6018+
echo "$as_me:6018:" \
60186019
"checking for Fortran 77 compiler version" >&5
60196020
ac_compiler=`set X $ac_compile; echo $2`
60206021
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -7019,11 +7020,11 @@ else
70197020
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
70207021
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
70217022
-e 's:$: $lt_compiler_flag:'`
7022-
(eval echo "\"\$as_me:7022: $lt_compile\"" >&5)
7023+
(eval echo "\"\$as_me:7023: $lt_compile\"" >&5)
70237024
(eval "$lt_compile" 2>conftest.err)
70247025
ac_status=$?
70257026
cat conftest.err >&5
7026-
echo "$as_me:7026: \$? = $ac_status" >&5
7027+
echo "$as_me:7027: \$? = $ac_status" >&5
70277028
if (exit $ac_status) && test -s "$ac_outfile"; then
70287029
# The compiler can only warn and ignore the option if not recognized
70297030
# So say no if there are warnings
@@ -7251,11 +7252,11 @@ else
72517252
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
72527253
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
72537254
-e 's:$: $lt_compiler_flag:'`
7254-
(eval echo "\"\$as_me:7254: $lt_compile\"" >&5)
7255+
(eval echo "\"\$as_me:7255: $lt_compile\"" >&5)
72557256
(eval "$lt_compile" 2>conftest.err)
72567257
ac_status=$?
72577258
cat conftest.err >&5
7258-
echo "$as_me:7258: \$? = $ac_status" >&5
7259+
echo "$as_me:7259: \$? = $ac_status" >&5
72597260
if (exit $ac_status) && test -s "$ac_outfile"; then
72607261
# The compiler can only warn and ignore the option if not recognized
72617262
# So say no if there are warnings
@@ -7318,11 +7319,11 @@ else
73187319
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
73197320
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
73207321
-e 's:$: $lt_compiler_flag:'`
7321-
(eval echo "\"\$as_me:7321: $lt_compile\"" >&5)
7322+
(eval echo "\"\$as_me:7322: $lt_compile\"" >&5)
73227323
(eval "$lt_compile" 2>out/conftest.err)
73237324
ac_status=$?
73247325
cat out/conftest.err >&5
7325-
echo "$as_me:7325: \$? = $ac_status" >&5
7326+
echo "$as_me:7326: \$? = $ac_status" >&5
73267327
if (exit $ac_status) && test -s out/conftest2.$ac_objext
73277328
then
73287329
# The compiler can only warn and ignore the option if not recognized
@@ -9342,7 +9343,7 @@ else
93429343
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
93439344
lt_status=$lt_dlunknown
93449345
cat > conftest.$ac_ext <<EOF
9345-
#line 9345 "configure"
9346+
#line 9346 "configure"
93469347
#include "confdefs.h"
93479348

93489349
#if HAVE_DLFCN_H
@@ -9440,7 +9441,7 @@ else
94409441
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
94419442
lt_status=$lt_dlunknown
94429443
cat > conftest.$ac_ext <<EOF
9443-
#line 9443 "configure"
9444+
#line 9444 "configure"
94449445
#include "confdefs.h"
94459446

94469447
#if HAVE_DLFCN_H
@@ -11572,11 +11573,11 @@ else
1157211573
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
1157311574
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1157411575
-e 's:$: $lt_compiler_flag:'`
11575-
(eval echo "\"\$as_me:11575: $lt_compile\"" >&5)
11576+
(eval echo "\"\$as_me:11576: $lt_compile\"" >&5)
1157611577
(eval "$lt_compile" 2>conftest.err)
1157711578
ac_status=$?
1157811579
cat conftest.err >&5
11579-
echo "$as_me:11579: \$? = $ac_status" >&5
11580+
echo "$as_me:11580: \$? = $ac_status" >&5
1158011581
if (exit $ac_status) && test -s "$ac_outfile"; then
1158111582
# The compiler can only warn and ignore the option if not recognized
1158211583
# So say no if there are warnings
@@ -11639,11 +11640,11 @@ else
1163911640
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
1164011641
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1164111642
-e 's:$: $lt_compiler_flag:'`
11642-
(eval echo "\"\$as_me:11642: $lt_compile\"" >&5)
11643+
(eval echo "\"\$as_me:11643: $lt_compile\"" >&5)
1164311644
(eval "$lt_compile" 2>out/conftest.err)
1164411645
ac_status=$?
1164511646
cat out/conftest.err >&5
11646-
echo "$as_me:11646: \$? = $ac_status" >&5
11647+
echo "$as_me:11647: \$? = $ac_status" >&5
1164711648
if (exit $ac_status) && test -s out/conftest2.$ac_objext
1164811649
then
1164911650
# The compiler can only warn and ignore the option if not recognized
@@ -12894,7 +12895,7 @@ else
1289412895
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1289512896
lt_status=$lt_dlunknown
1289612897
cat > conftest.$ac_ext <<EOF
12897-
#line 12897 "configure"
12898+
#line 12898 "configure"
1289812899
#include "confdefs.h"
1289912900

1290012901
#if HAVE_DLFCN_H
@@ -12992,7 +12993,7 @@ else
1299212993
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1299312994
lt_status=$lt_dlunknown
1299412995
cat > conftest.$ac_ext <<EOF
12995-
#line 12995 "configure"
12996+
#line 12996 "configure"
1299612997
#include "confdefs.h"
1299712998

1299812999
#if HAVE_DLFCN_H
@@ -13814,11 +13815,11 @@ else
1381413815
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
1381513816
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1381613817
-e 's:$: $lt_compiler_flag:'`
13817-
(eval echo "\"\$as_me:13817: $lt_compile\"" >&5)
13818+
(eval echo "\"\$as_me:13818: $lt_compile\"" >&5)
1381813819
(eval "$lt_compile" 2>conftest.err)
1381913820
ac_status=$?
1382013821
cat conftest.err >&5
13821-
echo "$as_me:13821: \$? = $ac_status" >&5
13822+
echo "$as_me:13822: \$? = $ac_status" >&5
1382213823
if (exit $ac_status) && test -s "$ac_outfile"; then
1382313824
# The compiler can only warn and ignore the option if not recognized
1382413825
# So say no if there are warnings
@@ -13881,11 +13882,11 @@ else
1388113882
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
1388213883
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1388313884
-e 's:$: $lt_compiler_flag:'`
13884-
(eval echo "\"\$as_me:13884: $lt_compile\"" >&5)
13885+
(eval echo "\"\$as_me:13885: $lt_compile\"" >&5)
1388513886
(eval "$lt_compile" 2>out/conftest.err)
1388613887
ac_status=$?
1388713888
cat out/conftest.err >&5
13888-
echo "$as_me:13888: \$? = $ac_status" >&5
13889+
echo "$as_me:13889: \$? = $ac_status" >&5
1388913890
if (exit $ac_status) && test -s out/conftest2.$ac_objext
1389013891
then
1389113892
# The compiler can only warn and ignore the option if not recognized
@@ -15833,11 +15834,11 @@ else
1583315834
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
1583415835
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1583515836
-e 's:$: $lt_compiler_flag:'`
15836-
(eval echo "\"\$as_me:15836: $lt_compile\"" >&5)
15837+
(eval echo "\"\$as_me:15837: $lt_compile\"" >&5)
1583715838
(eval "$lt_compile" 2>conftest.err)
1583815839
ac_status=$?
1583915840
cat conftest.err >&5
15840-
echo "$as_me:15840: \$? = $ac_status" >&5
15841+
echo "$as_me:15841: \$? = $ac_status" >&5
1584115842
if (exit $ac_status) && test -s "$ac_outfile"; then
1584215843
# The compiler can only warn and ignore the option if not recognized
1584315844
# So say no if there are warnings
@@ -16065,11 +16066,11 @@ else
1606516066
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
1606616067
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1606716068
-e 's:$: $lt_compiler_flag:'`
16068-
(eval echo "\"\$as_me:16068: $lt_compile\"" >&5)
16069+
(eval echo "\"\$as_me:16069: $lt_compile\"" >&5)
1606916070
(eval "$lt_compile" 2>conftest.err)
1607016071
ac_status=$?
1607116072
cat conftest.err >&5
16072-
echo "$as_me:16072: \$? = $ac_status" >&5
16073+
echo "$as_me:16073: \$? = $ac_status" >&5
1607316074
if (exit $ac_status) && test -s "$ac_outfile"; then
1607416075
# The compiler can only warn and ignore the option if not recognized
1607516076
# So say no if there are warnings
@@ -16132,11 +16133,11 @@ else
1613216133
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
1613316134
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1613416135
-e 's:$: $lt_compiler_flag:'`
16135-
(eval echo "\"\$as_me:16135: $lt_compile\"" >&5)
16136+
(eval echo "\"\$as_me:16136: $lt_compile\"" >&5)
1613616137
(eval "$lt_compile" 2>out/conftest.err)
1613716138
ac_status=$?
1613816139
cat out/conftest.err >&5
16139-
echo "$as_me:16139: \$? = $ac_status" >&5
16140+
echo "$as_me:16140: \$? = $ac_status" >&5
1614016141
if (exit $ac_status) && test -s out/conftest2.$ac_objext
1614116142
then
1614216143
# The compiler can only warn and ignore the option if not recognized
@@ -18156,7 +18157,7 @@ else
1815618157
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1815718158
lt_status=$lt_dlunknown
1815818159
cat > conftest.$ac_ext <<EOF
18159-
#line 18159 "configure"
18160+
#line 18160 "configure"
1816018161
#include "confdefs.h"
1816118162

1816218163
#if HAVE_DLFCN_H
@@ -18254,7 +18255,7 @@ else
1825418255
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1825518256
lt_status=$lt_dlunknown
1825618257
cat > conftest.$ac_ext <<EOF
18257-
#line 18257 "configure"
18258+
#line 18258 "configure"
1825818259
#include "confdefs.h"
1825918260

1826018261
#if HAVE_DLFCN_H

libcharset/autoconf/aclocal.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# generated automatically by aclocal 1.7.3 -*- Autoconf -*-
1+
# generated automatically by aclocal 1.7.5 -*- Autoconf -*-
22

33
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
44
# Free Software Foundation, Inc.

srclib/Makefile.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Makefile.in generated by automake 1.7.3 from Makefile.am.
1+
# Makefile.in generated by automake 1.7.5 from Makefile.am.
22
# @configure_input@
33

44
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -216,6 +216,7 @@ libicrt_a_LIBADD = @ALLOCA@ @LIBOBJS@
216216

217217
INCLUDES = -I. -I$(srcdir)
218218
subdir = srclib
219+
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
219220
mkinstalldirs = $(SHELL) $(top_srcdir)/autoconf/mkinstalldirs
220221
CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/lib/config.h
221222
CONFIG_CLEAN_FILES =
@@ -375,7 +376,6 @@ check: check-am
375376
all-am: Makefile $(LIBRARIES)
376377

377378
installdirs:
378-
379379
install: install-am
380380
install-exec: install-exec-am
381381
install-data: install-data-am

0 commit comments

Comments
 (0)