Skip to content

Commit 1ed22d8

Browse files
committed
bump version
1 parent 9360fb5 commit 1ed22d8

File tree

17 files changed

+314
-494
lines changed

17 files changed

+314
-494
lines changed

Makefile.in

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

44
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15,23 +15,6 @@
1515

1616
@SET_MAKE@
1717
VPATH = @srcdir@
18-
am__make_dryrun = \
19-
{ \
20-
am__dry=no; \
21-
case $$MAKEFLAGS in \
22-
*\\[\ \ ]*) \
23-
echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
24-
| grep '^AM OK$$' >/dev/null || am__dry=yes;; \
25-
*) \
26-
for am__flg in $$MAKEFLAGS; do \
27-
case $$am__flg in \
28-
*=*|--*) ;; \
29-
*n*) am__dry=yes; break;; \
30-
esac; \
31-
done;; \
32-
esac; \
33-
test $$am__dry = yes; \
34-
}
3518
pkgdatadir = $(datadir)/@PACKAGE@
3619
pkgincludedir = $(includedir)/@PACKAGE@
3720
pkglibdir = $(libdir)/@PACKAGE@
@@ -79,11 +62,6 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
7962
install-pdf-recursive install-ps-recursive install-recursive \
8063
installcheck-recursive installdirs-recursive pdf-recursive \
8164
ps-recursive uninstall-recursive
82-
am__can_run_installinfo = \
83-
case $$AM_UPDATE_INFO_DIR in \
84-
n|no|NO) false;; \
85-
*) (install-info --version) >/dev/null 2>&1;; \
86-
esac
8765
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
8866
am__vpath_adj = case $$p in \
8967
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -349,18 +327,11 @@ distclean-libtool:
349327
-rm -f libtool config.lt
350328
install-man8: $(man_MANS)
351329
@$(NORMAL_INSTALL)
352-
@list1=''; \
353-
list2='$(man_MANS)'; \
354-
test -n "$(man8dir)" \
355-
&& test -n "`echo $$list1$$list2`" \
356-
|| exit 0; \
357-
echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \
358-
$(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \
359-
{ for i in $$list1; do echo "$$i"; done; \
360-
if test -n "$$list2"; then \
361-
for i in $$list2; do echo "$$i"; done \
362-
| sed -n '/\.8[a-z]*$$/p'; \
363-
fi; \
330+
test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
331+
@list=''; test -n "$(man8dir)" || exit 0; \
332+
{ for i in $$list; do echo "$$i"; done; \
333+
l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
334+
sed -n '/\.8[a-z]*$$/p'; \
364335
} | while read p; do \
365336
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
366337
echo "$$d$$p"; echo "$$p"; \
@@ -573,10 +544,13 @@ distdir: $(DISTFILES)
573544
done
574545
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
575546
if test "$$subdir" = .; then :; else \
576-
$(am__make_dryrun) \
577-
|| test -d "$(distdir)/$$subdir" \
578-
|| $(MKDIR_P) "$(distdir)/$$subdir" \
579-
|| exit 1; \
547+
test -d "$(distdir)/$$subdir" \
548+
|| $(MKDIR_P) "$(distdir)/$$subdir" \
549+
|| exit 1; \
550+
fi; \
551+
done
552+
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
553+
if test "$$subdir" = .; then :; else \
580554
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
581555
$(am__relativize); \
582556
new_distdir=$$reldir; \
@@ -662,7 +636,7 @@ distcheck: dist
662636
*.zip*) \
663637
unzip $(distdir).zip ;;\
664638
esac
665-
chmod -R a-w $(distdir); chmod u+w $(distdir)
639+
chmod -R a-w $(distdir); chmod a+w $(distdir)
666640
mkdir $(distdir)/_build
667641
mkdir $(distdir)/_inst
668642
chmod a-w $(distdir)

aclocal.m4

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
1+
# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
22

33
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
44
# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
@@ -14,8 +14,8 @@
1414

1515
m4_ifndef([AC_AUTOCONF_VERSION],
1616
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
17-
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
18-
[m4_warning([this file was generated for autoconf 2.69.
17+
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
18+
[m4_warning([this file was generated for autoconf 2.68.
1919
You have another version of autoconf. It may work, but is not guaranteed to.
2020
If you have problems, you may need to regenerate the build system entirely.
2121
To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -38,7 +38,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
3838
[am__api_version='1.11'
3939
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
4040
dnl require some minimum version. Point them to the right macro.
41-
m4_if([$1], [1.11.6], [],
41+
m4_if([$1], [1.11.3], [],
4242
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
4343
])
4444

@@ -54,7 +54,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
5454
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
5555
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
5656
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
57-
[AM_AUTOMAKE_VERSION([1.11.6])dnl
57+
[AM_AUTOMAKE_VERSION([1.11.3])dnl
5858
m4_ifndef([AC_AUTOCONF_VERSION],
5959
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
6060
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

ar-lib

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Wrapper for Microsoft lib.exe
33

44
me=ar-lib
5-
scriptversion=2012-03-01.08; # UTC
5+
scriptversion=2012-01-30.22; # UTC
66

77
# Copyright (C) 2010, 2012 Free Software Foundation, Inc.
88
# Written by Peter Rosin <peda@lysator.liu.se>.
@@ -153,9 +153,7 @@ action=${action#-}
153153
delete=
154154
extract=
155155
list=
156-
quick=
157156
replace=
158-
index=
159157
create=
160158

161159
while test -n "$action"
@@ -164,10 +162,7 @@ do
164162
d*) delete=yes ;;
165163
x*) extract=yes ;;
166164
t*) list=yes ;;
167-
q*) quick=yes ;;
168165
r*) replace=yes ;;
169-
s*) index=yes ;;
170-
S*) ;; # the index is always updated implicitly
171166
c*) create=yes ;;
172167
u*) ;; # TODO: don't ignore the update modifier
173168
v*) ;; # TODO: don't ignore the verbose modifier
@@ -178,8 +173,8 @@ do
178173
action=${action#?}
179174
done
180175

181-
case $delete$extract$list$quick$replace,$index in
182-
yes,* | ,yes)
176+
case $delete$extract$list$replace in
177+
yes)
183178
;;
184179
yesyes*)
185180
func_error "more than one action specified"
@@ -230,7 +225,7 @@ elif test -n "$extract"; then
230225
done
231226
fi
232227

233-
elif test -n "$quick$replace"; then
228+
elif test -n "$replace"; then
234229
if test ! -f "$orig_archive"; then
235230
if test -z "$create"; then
236231
echo "$me: creating $orig_archive"

compile

Lines changed: 29 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#! /bin/sh
22
# Wrapper for compilers which do not understand '-c -o'.
33

4-
scriptversion=2012-03-05.13; # UTC
4+
scriptversion=2012-01-04.17; # UTC
55

66
# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
77
# Software Foundation, Inc.
@@ -79,48 +79,6 @@ func_file_conv ()
7979
esac
8080
}
8181

82-
# func_cl_dashL linkdir
83-
# Make cl look for libraries in LINKDIR
84-
func_cl_dashL ()
85-
{
86-
func_file_conv "$1"
87-
if test -z "$lib_path"; then
88-
lib_path=$file
89-
else
90-
lib_path="$lib_path;$file"
91-
fi
92-
linker_opts="$linker_opts -LIBPATH:$file"
93-
}
94-
95-
# func_cl_dashl library
96-
# Do a library search-path lookup for cl
97-
func_cl_dashl ()
98-
{
99-
lib=$1
100-
found=no
101-
save_IFS=$IFS
102-
IFS=';'
103-
for dir in $lib_path $LIB
104-
do
105-
IFS=$save_IFS
106-
if $shared && test -f "$dir/$lib.dll.lib"; then
107-
found=yes
108-
lib=$dir/$lib.dll.lib
109-
break
110-
fi
111-
if test -f "$dir/$lib.lib"; then
112-
found=yes
113-
lib=$dir/$lib.lib
114-
break
115-
fi
116-
done
117-
IFS=$save_IFS
118-
119-
if test "$found" != yes; then
120-
lib=$lib.lib
121-
fi
122-
}
123-
12482
# func_cl_wrapper cl arg...
12583
# Adjust compile command to suit cl
12684
func_cl_wrapper ()
@@ -151,34 +109,43 @@ func_cl_wrapper ()
151109
;;
152110
esac
153111
;;
154-
-I)
155-
eat=1
156-
func_file_conv "$2" mingw
157-
set x "$@" -I"$file"
158-
shift
159-
;;
160112
-I*)
161113
func_file_conv "${1#-I}" mingw
162114
set x "$@" -I"$file"
163115
shift
164116
;;
165-
-l)
166-
eat=1
167-
func_cl_dashl "$2"
168-
set x "$@" "$lib"
169-
shift
170-
;;
171117
-l*)
172-
func_cl_dashl "${1#-l}"
173-
set x "$@" "$lib"
118+
lib=${1#-l}
119+
found=no
120+
save_IFS=$IFS
121+
IFS=';'
122+
for dir in $lib_path $LIB
123+
do
124+
IFS=$save_IFS
125+
if $shared && test -f "$dir/$lib.dll.lib"; then
126+
found=yes
127+
set x "$@" "$dir/$lib.dll.lib"
128+
break
129+
fi
130+
if test -f "$dir/$lib.lib"; then
131+
found=yes
132+
set x "$@" "$dir/$lib.lib"
133+
break
134+
fi
135+
done
136+
IFS=$save_IFS
137+
138+
test "$found" != yes && set x "$@" "$lib.lib"
174139
shift
175140
;;
176-
-L)
177-
eat=1
178-
func_cl_dashL "$2"
179-
;;
180141
-L*)
181-
func_cl_dashL "${1#-L}"
142+
func_file_conv "${1#-L}"
143+
if test -z "$lib_path"; then
144+
lib_path=$file
145+
else
146+
lib_path="$lib_path;$file"
147+
fi
148+
linker_opts="$linker_opts -LIBPATH:$file"
182149
;;
183150
-static)
184151
shared=false

config.h.in

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -309,11 +309,6 @@
309309
# endif
310310
#endif
311311

312-
/* Enable large inode numbers on Mac OS X 10.5. */
313-
#ifndef _DARWIN_USE_64_BIT_INODE
314-
# define _DARWIN_USE_64_BIT_INODE 1
315-
#endif
316-
317312
/* Number of bits in a file offset, on hosts where this is settable. */
318313
#undef _FILE_OFFSET_BITS
319314

config.sub

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
55
# 2011, 2012 Free Software Foundation, Inc.
66

7-
timestamp='2012-04-18'
7+
timestamp='2012-02-10'
88

99
# This file is (in principle) common to ALL GNU software.
1010
# The presence of a machine in this file suggests that SOME GNU software
@@ -225,12 +225,6 @@ case $os in
225225
-isc*)
226226
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
227227
;;
228-
-lynx*178)
229-
os=-lynxos178
230-
;;
231-
-lynx*5)
232-
os=-lynxos5
233-
;;
234228
-lynx*)
235229
os=-lynxos
236230
;;
@@ -1543,9 +1537,6 @@ case $basic_machine in
15431537
c4x-* | tic4x-*)
15441538
os=-coff
15451539
;;
1546-
hexagon-*)
1547-
os=-elf
1548-
;;
15491540
tic54x-*)
15501541
os=-coff
15511542
;;

0 commit comments

Comments
 (0)