Merge lp:~kamalmostafa/ubuntu/lucid/libticables/merge-526694 into lp:ubuntu/lucid/libticables
- Lucid (10.04)
- merge-526694
- Merge into lucid
Proposed by
Kamal Mostafa
Status: | Merged |
---|---|
Merge reported by: | Kamal Mostafa |
Merged at revision: | not available |
Proposed branch: | lp:~kamalmostafa/ubuntu/lucid/libticables/merge-526694 |
Merge into: | lp:ubuntu/lucid/libticables |
Diff against target: |
17878 lines (+3024/-9444) 58 files modified
ChangeLog (+10/-1) Makefile.in (+21/-38) README (+1/-1) aclocal.m4 (+806/-1599) build/fedora/libticables2.spec (+0/-207) build/mingw/Makefile (+37/-58) build/mingw/Makefile.in (+7/-28) build/mingw/ticables2.rc (+5/-5) build/msvc/test_ticables2.dsp (+4/-4) build/msvc/ticables2.dsp (+18/-18) config.guess (+43/-17) config.sub (+64/-14) configure (+1775/-6899) configure.ac (+6/-6) debian/changelog (+0/-5) debian/compat (+0/-1) debian/control (+0/-29) debian/copyright (+0/-72) debian/docs (+0/-4) debian/libticables-dev.dirs (+0/-2) debian/libticables-dev.doc-base (+9/-0) debian/libticables-dev.docs (+0/-1) debian/libticables-dev.install (+0/-4) debian/libticables2-1.dirs (+0/-1) debian/libticables2-1.docs (+0/-1) debian/libticables2-1.install (+0/-2) debian/libticables2-1.postinst (+0/-36) debian/libticables2-1.postrm (+0/-12) debian/libticables2-1.udev (+0/-17) debian/libticables2-2.README.Debian (+32/-0) debian/libticables2-2.install (+2/-0) debian/libticables2-2.postinst (+22/-0) debian/libticables2-2.preinst (+15/-0) debian/rules (+0/-107) debian/udev/45-libticables.rules (+6/-0) docs/Makefile.in (+7/-28) po/fr.po (+1/-1) po/libticables2.pot (+1/-1) src/Makefile.in (+18/-40) src/data_log.c (+8/-1) src/data_log.h (+3/-1) src/hex2dbus.c (+1/-1) src/hex2nsp.c (+1/-1) src/linux/detect.c (+2/-1) src/linux/link_gry.c (+2/-2) src/linux/link_usb.c (+2/-2) src/log_dbus.c (+2/-8) src/log_dusb.c (+2/-8) src/log_hex.c (+2/-7) src/log_nsp.c (+2/-8) src/ticables.c (+2/-2) src/ticables.h (+3/-3) src/type2str.c (+22/-21) src/win32/dha/Makefile.in (+16/-38) src/win32/link_tie.c (+5/-3) src/win32/link_vti.c (+9/-4) src/win64/rwp/Makefile.in (+16/-38) tests/Makefile.in (+14/-36) |
To merge this branch: | bzr merge lp:~kamalmostafa/ubuntu/lucid/libticables/merge-526694 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu branches | Pending | ||
Review via email: mp+20007@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
Kamal Mostafa (kamalmostafa) wrote : | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'ChangeLog' |
2 | --- ChangeLog 2009-05-17 13:34:18 +0000 |
3 | +++ ChangeLog 2010-02-23 21:48:16 +0000 |
4 | @@ -1,7 +1,16 @@ |
5 | -SubVersion: $Id: ChangeLog 4035 2007-12-01 14:43:51Z roms $ |
6 | +SubVersion: $Id: ChangeLog 4252 2009-05-08 11:28:09Z roms $ |
7 | |
8 | Log: |
9 | |
10 | +- 03/05/2009, version 1.3.0: roms |
11 | + - removed obsolete virtual link cable |
12 | + - fixed possible buffer overflow in DBUS packet decompiler |
13 | + |
14 | +- 01/01/2009, version 1.2.1: roms |
15 | + - modified ticables_string_to_model to be case unsensitive like |
16 | + other functions |
17 | + - log files are stored now in the user's folder rather than a static location (Vista) |
18 | + |
19 | - 16/10/2007, version 1.2.0: roms |
20 | - reverted back a wrong commit done in rev. 3042 (31/10/2006 !!!): |
21 | USB reset code had been removed from slv_reset. |
22 | |
23 | === modified file 'Makefile.in' |
24 | --- Makefile.in 2009-05-17 13:34:18 +0000 |
25 | +++ Makefile.in 2010-02-23 21:48:16 +0000 |
26 | @@ -1,8 +1,8 @@ |
27 | -# Makefile.in generated by automake 1.10 from Makefile.am. |
28 | +# Makefile.in generated by automake 1.10.1 from Makefile.am. |
29 | # @configure_input@ |
30 | |
31 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
32 | -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. |
33 | +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
34 | # This Makefile.in is free software; the Free Software Foundation |
35 | # gives unlimited permission to copy and/or distribute it, |
36 | # with or without modifications, as long as this notice is preserved. |
37 | @@ -83,7 +83,6 @@ |
38 | distuninstallcheck_listfiles = find . -type f -print |
39 | distcleancheck_listfiles = find . -type f -print |
40 | ACLOCAL = @ACLOCAL@ |
41 | -ALLOCA = @ALLOCA@ |
42 | AMTAR = @AMTAR@ |
43 | AR = @AR@ |
44 | AS = @AS@ |
45 | @@ -91,12 +90,9 @@ |
46 | AUTOHEADER = @AUTOHEADER@ |
47 | AUTOMAKE = @AUTOMAKE@ |
48 | AWK = @AWK@ |
49 | -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ |
50 | -CATOBJEXT = @CATOBJEXT@ |
51 | CC = @CC@ |
52 | CCDEPMODE = @CCDEPMODE@ |
53 | CFLAGS = @CFLAGS@ |
54 | -CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ |
55 | CPP = @CPP@ |
56 | CPPFLAGS = @CPPFLAGS@ |
57 | CXX = @CXX@ |
58 | @@ -104,10 +100,10 @@ |
59 | CXXDEPMODE = @CXXDEPMODE@ |
60 | CXXFLAGS = @CXXFLAGS@ |
61 | CYGPATH_W = @CYGPATH_W@ |
62 | -DATADIRNAME = @DATADIRNAME@ |
63 | DEFS = @DEFS@ |
64 | DEPDIR = @DEPDIR@ |
65 | DLLTOOL = @DLLTOOL@ |
66 | +DSYMUTIL = @DSYMUTIL@ |
67 | ECHO = @ECHO@ |
68 | ECHO_C = @ECHO_C@ |
69 | ECHO_N = @ECHO_N@ |
70 | @@ -116,48 +112,31 @@ |
71 | EXEEXT = @EXEEXT@ |
72 | F77 = @F77@ |
73 | FFLAGS = @FFLAGS@ |
74 | -GENCAT = @GENCAT@ |
75 | -GLIBC2 = @GLIBC2@ |
76 | -GLIBC21 = @GLIBC21@ |
77 | +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ |
78 | GLIB_CFLAGS = @GLIB_CFLAGS@ |
79 | GLIB_LIBS = @GLIB_LIBS@ |
80 | GMSGFMT = @GMSGFMT@ |
81 | GMSGFMT_015 = @GMSGFMT_015@ |
82 | GREP = @GREP@ |
83 | -HAVE_ASPRINTF = @HAVE_ASPRINTF@ |
84 | -HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ |
85 | -HAVE_SNPRINTF = @HAVE_SNPRINTF@ |
86 | -HAVE_VISIBILITY = @HAVE_VISIBILITY@ |
87 | -HAVE_WPRINTF = @HAVE_WPRINTF@ |
88 | INSTALL = @INSTALL@ |
89 | INSTALL_DATA = @INSTALL_DATA@ |
90 | INSTALL_PROGRAM = @INSTALL_PROGRAM@ |
91 | INSTALL_SCRIPT = @INSTALL_SCRIPT@ |
92 | INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ |
93 | -INSTOBJEXT = @INSTOBJEXT@ |
94 | -INTLBISON = @INTLBISON@ |
95 | INTLLIBS = @INTLLIBS@ |
96 | -INTLOBJS = @INTLOBJS@ |
97 | -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ |
98 | INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ |
99 | LDFLAGS = @LDFLAGS@ |
100 | LIBICONV = @LIBICONV@ |
101 | LIBINTL = @LIBINTL@ |
102 | -LIBMULTITHREAD = @LIBMULTITHREAD@ |
103 | LIBOBJS = @LIBOBJS@ |
104 | -LIBPTH = @LIBPTH@ |
105 | LIBS = @LIBS@ |
106 | -LIBTHREAD = @LIBTHREAD@ |
107 | LIBTOOL = @LIBTOOL@ |
108 | LIBUSB_CFLAGS = @LIBUSB_CFLAGS@ |
109 | LIBUSB_LIBS = @LIBUSB_LIBS@ |
110 | LN_S = @LN_S@ |
111 | LTLIBICONV = @LTLIBICONV@ |
112 | LTLIBINTL = @LTLIBINTL@ |
113 | -LTLIBMULTITHREAD = @LTLIBMULTITHREAD@ |
114 | LTLIBOBJS = @LTLIBOBJS@ |
115 | -LTLIBPTH = @LTLIBPTH@ |
116 | -LTLIBTHREAD = @LTLIBTHREAD@ |
117 | LT_LIBVERSION = @LT_LIBVERSION@ |
118 | MAINT = @MAINT@ |
119 | MAKEINFO = @MAKEINFO@ |
120 | @@ -165,6 +144,7 @@ |
121 | MSGFMT = @MSGFMT@ |
122 | MSGFMT_015 = @MSGFMT_015@ |
123 | MSGMERGE = @MSGMERGE@ |
124 | +NMEDIT = @NMEDIT@ |
125 | OBJDUMP = @OBJDUMP@ |
126 | OBJEXT = @OBJEXT@ |
127 | PACKAGE = @PACKAGE@ |
128 | @@ -176,19 +156,18 @@ |
129 | PATH_SEPARATOR = @PATH_SEPARATOR@ |
130 | PKG_CONFIG = @PKG_CONFIG@ |
131 | POSUB = @POSUB@ |
132 | -PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ |
133 | RANLIB = @RANLIB@ |
134 | RC = @RC@ |
135 | +SED = @SED@ |
136 | SET_MAKE = @SET_MAKE@ |
137 | SHELL = @SHELL@ |
138 | STRIP = @STRIP@ |
139 | TFDOCGEN = @TFDOCGEN@ |
140 | -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ |
141 | USE_NLS = @USE_NLS@ |
142 | VERSION = @VERSION@ |
143 | -WOE32DLL = @WOE32DLL@ |
144 | XGETTEXT = @XGETTEXT@ |
145 | XGETTEXT_015 = @XGETTEXT_015@ |
146 | +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ |
147 | abs_builddir = @abs_builddir@ |
148 | abs_srcdir = @abs_srcdir@ |
149 | abs_top_builddir = @abs_top_builddir@ |
150 | @@ -406,8 +385,8 @@ |
151 | unique=`for i in $$list; do \ |
152 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
153 | done | \ |
154 | - $(AWK) ' { files[$$0] = 1; } \ |
155 | - END { for (i in files) print i; }'`; \ |
156 | + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ |
157 | + END { if (nonempty) { for (i in files) print i; }; }'`; \ |
158 | mkid -fID $$unique |
159 | tags: TAGS |
160 | |
161 | @@ -432,8 +411,8 @@ |
162 | unique=`for i in $$list; do \ |
163 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
164 | done | \ |
165 | - $(AWK) ' { files[$$0] = 1; } \ |
166 | - END { for (i in files) print i; }'`; \ |
167 | + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
168 | + END { if (nonempty) { for (i in files) print i; }; }'`; \ |
169 | if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ |
170 | test -n "$$unique" || unique=$$empty_fix; \ |
171 | $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ |
172 | @@ -443,13 +422,12 @@ |
173 | CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ |
174 | $(TAGS_FILES) $(LISP) |
175 | tags=; \ |
176 | - here=`pwd`; \ |
177 | list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ |
178 | unique=`for i in $$list; do \ |
179 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
180 | done | \ |
181 | - $(AWK) ' { files[$$0] = 1; } \ |
182 | - END { for (i in files) print i; }'`; \ |
183 | + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
184 | + END { if (nonempty) { for (i in files) print i; }; }'`; \ |
185 | test -z "$(CTAGS_ARGS)$$tags$$unique" \ |
186 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ |
187 | $$tags $$unique |
188 | @@ -519,6 +497,10 @@ |
189 | tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 |
190 | $(am__remove_distdir) |
191 | |
192 | +dist-lzma: distdir |
193 | + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma |
194 | + $(am__remove_distdir) |
195 | + |
196 | dist-tarZ: distdir |
197 | tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z |
198 | $(am__remove_distdir) |
199 | @@ -546,6 +528,8 @@ |
200 | GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ |
201 | *.tar.bz2*) \ |
202 | bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ |
203 | + *.tar.lzma*) \ |
204 | + unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ |
205 | *.tar.Z*) \ |
206 | uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ |
207 | *.shar.gz*) \ |
208 | @@ -561,7 +545,6 @@ |
209 | && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ |
210 | && cd $(distdir)/_build \ |
211 | && ../configure --srcdir=.. --prefix="$$dc_install_base" \ |
212 | - --with-included-gettext \ |
213 | $(DISTCHECK_CONFIGURE_FLAGS) \ |
214 | && $(MAKE) $(AM_MAKEFLAGS) \ |
215 | && $(MAKE) $(AM_MAKEFLAGS) dvi \ |
216 | @@ -701,8 +684,8 @@ |
217 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ |
218 | all all-am am--refresh check check-am clean clean-generic \ |
219 | clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ |
220 | - dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \ |
221 | - distclean-generic distclean-hdr distclean-libtool \ |
222 | + dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \ |
223 | + distclean distclean-generic distclean-hdr distclean-libtool \ |
224 | distclean-tags distcleancheck distdir distuninstallcheck dvi \ |
225 | dvi-am html html-am info info-am install install-am \ |
226 | install-data install-data-am install-dvi install-dvi-am \ |
227 | |
228 | === modified file 'README' |
229 | --- README 2009-05-17 13:34:18 +0000 |
230 | +++ README 2010-02-23 21:48:16 +0000 |
231 | @@ -67,7 +67,7 @@ |
232 | Copyright |
233 | -------------------------------------------------------------------------- |
234 | |
235 | -ticables library is Copyright (C) 1999-2007 by the TiLP team: |
236 | +ticables library is Copyright (C) 1999-2009 by the TiLP team: |
237 | <tilp-users@lists.sf.net> |
238 | |
239 | Copying is allowed under the terms of GNU General Public |
240 | |
241 | === modified file 'aclocal.m4' |
242 | --- aclocal.m4 2009-05-17 13:34:18 +0000 |
243 | +++ aclocal.m4 2010-02-23 21:48:16 +0000 |
244 | @@ -1,7 +1,7 @@ |
245 | -# generated automatically by aclocal 1.10 -*- Autoconf -*- |
246 | +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- |
247 | |
248 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
249 | -# 2005, 2006 Free Software Foundation, Inc. |
250 | +# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
251 | # This file is free software; the Free Software Foundation |
252 | # gives unlimited permission to copy and/or distribute it, |
253 | # with or without modifications, as long as this notice is preserved. |
254 | @@ -11,35 +11,16 @@ |
255 | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
256 | # PARTICULAR PURPOSE. |
257 | |
258 | -m4_if(m4_PACKAGE_VERSION, [2.61],, |
259 | -[m4_fatal([this file was generated for autoconf 2.61. |
260 | -You have another version of autoconf. If you want to use that, |
261 | -you should regenerate the build system entirely.], [63])]) |
262 | - |
263 | -# codeset.m4 serial 2 (gettext-0.16) |
264 | -dnl Copyright (C) 2000-2002, 2006 Free Software Foundation, Inc. |
265 | -dnl This file is free software; the Free Software Foundation |
266 | -dnl gives unlimited permission to copy and/or distribute it, |
267 | -dnl with or without modifications, as long as this notice is preserved. |
268 | - |
269 | -dnl From Bruno Haible. |
270 | - |
271 | -AC_DEFUN([AM_LANGINFO_CODESET], |
272 | -[ |
273 | - AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset, |
274 | - [AC_TRY_LINK([#include <langinfo.h>], |
275 | - [char* cs = nl_langinfo(CODESET); return !cs;], |
276 | - am_cv_langinfo_codeset=yes, |
277 | - am_cv_langinfo_codeset=no) |
278 | - ]) |
279 | - if test $am_cv_langinfo_codeset = yes; then |
280 | - AC_DEFINE(HAVE_LANGINFO_CODESET, 1, |
281 | - [Define if you have <langinfo.h> and nl_langinfo(CODESET).]) |
282 | - fi |
283 | -]) |
284 | - |
285 | -# gettext.m4 serial 59 (gettext-0.16.1) |
286 | -dnl Copyright (C) 1995-2006 Free Software Foundation, Inc. |
287 | +m4_ifndef([AC_AUTOCONF_VERSION], |
288 | + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
289 | +m4_if(AC_AUTOCONF_VERSION, [2.61],, |
290 | +[m4_warning([this file was generated for autoconf 2.61. |
291 | +You have another version of autoconf. It may work, but is not guaranteed to. |
292 | +If you have problems, you may need to regenerate the build system entirely. |
293 | +To do so, use the procedure documented by the package, typically `autoreconf'.])]) |
294 | + |
295 | +# gettext.m4 serial 60 (gettext-0.17) |
296 | +dnl Copyright (C) 1995-2007 Free Software Foundation, Inc. |
297 | dnl This file is free software; the Free Software Foundation |
298 | dnl gives unlimited permission to copy and/or distribute it, |
299 | dnl with or without modifications, as long as this notice is preserved. |
300 | @@ -402,44 +383,6 @@ |
301 | ]) |
302 | |
303 | |
304 | -dnl Checks for special options needed on MacOS X. |
305 | -dnl Defines INTL_MACOSX_LIBS. |
306 | -AC_DEFUN([gt_INTL_MACOSX], |
307 | -[ |
308 | - dnl Check for API introduced in MacOS X 10.2. |
309 | - AC_CACHE_CHECK([for CFPreferencesCopyAppValue], |
310 | - gt_cv_func_CFPreferencesCopyAppValue, |
311 | - [gt_save_LIBS="$LIBS" |
312 | - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" |
313 | - AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>], |
314 | - [CFPreferencesCopyAppValue(NULL, NULL)], |
315 | - [gt_cv_func_CFPreferencesCopyAppValue=yes], |
316 | - [gt_cv_func_CFPreferencesCopyAppValue=no]) |
317 | - LIBS="$gt_save_LIBS"]) |
318 | - if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then |
319 | - AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1, |
320 | - [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) |
321 | - fi |
322 | - dnl Check for API introduced in MacOS X 10.3. |
323 | - AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent, |
324 | - [gt_save_LIBS="$LIBS" |
325 | - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" |
326 | - AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();], |
327 | - [gt_cv_func_CFLocaleCopyCurrent=yes], |
328 | - [gt_cv_func_CFLocaleCopyCurrent=no]) |
329 | - LIBS="$gt_save_LIBS"]) |
330 | - if test $gt_cv_func_CFLocaleCopyCurrent = yes; then |
331 | - AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1, |
332 | - [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) |
333 | - fi |
334 | - INTL_MACOSX_LIBS= |
335 | - if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then |
336 | - INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" |
337 | - fi |
338 | - AC_SUBST([INTL_MACOSX_LIBS]) |
339 | -]) |
340 | - |
341 | - |
342 | dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized. |
343 | m4_define([gt_NEEDS_INIT], |
344 | [ |
345 | @@ -458,70 +401,8 @@ |
346 | dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version]) |
347 | AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) |
348 | |
349 | -# glibc2.m4 serial 1 |
350 | -dnl Copyright (C) 2000-2002, 2004 Free Software Foundation, Inc. |
351 | -dnl This file is free software; the Free Software Foundation |
352 | -dnl gives unlimited permission to copy and/or distribute it, |
353 | -dnl with or without modifications, as long as this notice is preserved. |
354 | - |
355 | -# Test for the GNU C Library, version 2.0 or newer. |
356 | -# From Bruno Haible. |
357 | - |
358 | -AC_DEFUN([gt_GLIBC2], |
359 | - [ |
360 | - AC_CACHE_CHECK(whether we are using the GNU C Library 2 or newer, |
361 | - ac_cv_gnu_library_2, |
362 | - [AC_EGREP_CPP([Lucky GNU user], |
363 | - [ |
364 | -#include <features.h> |
365 | -#ifdef __GNU_LIBRARY__ |
366 | - #if (__GLIBC__ >= 2) |
367 | - Lucky GNU user |
368 | - #endif |
369 | -#endif |
370 | - ], |
371 | - ac_cv_gnu_library_2=yes, |
372 | - ac_cv_gnu_library_2=no) |
373 | - ] |
374 | - ) |
375 | - AC_SUBST(GLIBC2) |
376 | - GLIBC2="$ac_cv_gnu_library_2" |
377 | - ] |
378 | -) |
379 | - |
380 | -# glibc21.m4 serial 3 |
381 | -dnl Copyright (C) 2000-2002, 2004 Free Software Foundation, Inc. |
382 | -dnl This file is free software; the Free Software Foundation |
383 | -dnl gives unlimited permission to copy and/or distribute it, |
384 | -dnl with or without modifications, as long as this notice is preserved. |
385 | - |
386 | -# Test for the GNU C Library, version 2.1 or newer. |
387 | -# From Bruno Haible. |
388 | - |
389 | -AC_DEFUN([gl_GLIBC21], |
390 | - [ |
391 | - AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer, |
392 | - ac_cv_gnu_library_2_1, |
393 | - [AC_EGREP_CPP([Lucky GNU user], |
394 | - [ |
395 | -#include <features.h> |
396 | -#ifdef __GNU_LIBRARY__ |
397 | - #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) |
398 | - Lucky GNU user |
399 | - #endif |
400 | -#endif |
401 | - ], |
402 | - ac_cv_gnu_library_2_1=yes, |
403 | - ac_cv_gnu_library_2_1=no) |
404 | - ] |
405 | - ) |
406 | - AC_SUBST(GLIBC21) |
407 | - GLIBC21="$ac_cv_gnu_library_2_1" |
408 | - ] |
409 | -) |
410 | - |
411 | -# iconv.m4 serial AM4 (gettext-0.11.3) |
412 | -dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. |
413 | +# iconv.m4 serial AM6 (gettext-0.17) |
414 | +dnl Copyright (C) 2000-2002, 2007 Free Software Foundation, Inc. |
415 | dnl This file is free software; the Free Software Foundation |
416 | dnl gives unlimited permission to copy and/or distribute it, |
417 | dnl with or without modifications, as long as this notice is preserved. |
418 | @@ -543,6 +424,7 @@ |
419 | [ |
420 | dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and |
421 | dnl those with the standalone portable GNU libiconv installed). |
422 | + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles |
423 | |
424 | dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV |
425 | dnl accordingly. |
426 | @@ -555,7 +437,7 @@ |
427 | am_save_CPPFLAGS="$CPPFLAGS" |
428 | AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) |
429 | |
430 | - AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [ |
431 | + AC_CACHE_CHECK([for iconv], am_cv_func_iconv, [ |
432 | am_cv_func_iconv="no, consider installing GNU libiconv" |
433 | am_cv_lib_iconv=no |
434 | AC_TRY_LINK([#include <stdlib.h> |
435 | @@ -578,7 +460,85 @@ |
436 | fi |
437 | ]) |
438 | if test "$am_cv_func_iconv" = yes; then |
439 | - AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.]) |
440 | + AC_CACHE_CHECK([for working iconv], am_cv_func_iconv_works, [ |
441 | + dnl This tests against bugs in AIX 5.1 and HP-UX 11.11. |
442 | + am_save_LIBS="$LIBS" |
443 | + if test $am_cv_lib_iconv = yes; then |
444 | + LIBS="$LIBS $LIBICONV" |
445 | + fi |
446 | + AC_TRY_RUN([ |
447 | +#include <iconv.h> |
448 | +#include <string.h> |
449 | +int main () |
450 | +{ |
451 | + /* Test against AIX 5.1 bug: Failures are not distinguishable from successful |
452 | + returns. */ |
453 | + { |
454 | + iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); |
455 | + if (cd_utf8_to_88591 != (iconv_t)(-1)) |
456 | + { |
457 | + static const char input[] = "\342\202\254"; /* EURO SIGN */ |
458 | + char buf[10]; |
459 | + const char *inptr = input; |
460 | + size_t inbytesleft = strlen (input); |
461 | + char *outptr = buf; |
462 | + size_t outbytesleft = sizeof (buf); |
463 | + size_t res = iconv (cd_utf8_to_88591, |
464 | + (char **) &inptr, &inbytesleft, |
465 | + &outptr, &outbytesleft); |
466 | + if (res == 0) |
467 | + return 1; |
468 | + } |
469 | + } |
470 | +#if 0 /* This bug could be worked around by the caller. */ |
471 | + /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */ |
472 | + { |
473 | + iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); |
474 | + if (cd_88591_to_utf8 != (iconv_t)(-1)) |
475 | + { |
476 | + static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; |
477 | + char buf[50]; |
478 | + const char *inptr = input; |
479 | + size_t inbytesleft = strlen (input); |
480 | + char *outptr = buf; |
481 | + size_t outbytesleft = sizeof (buf); |
482 | + size_t res = iconv (cd_88591_to_utf8, |
483 | + (char **) &inptr, &inbytesleft, |
484 | + &outptr, &outbytesleft); |
485 | + if ((int)res > 0) |
486 | + return 1; |
487 | + } |
488 | + } |
489 | +#endif |
490 | + /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is |
491 | + provided. */ |
492 | + if (/* Try standardized names. */ |
493 | + iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1) |
494 | + /* Try IRIX, OSF/1 names. */ |
495 | + && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1) |
496 | + /* Try AIX names. */ |
497 | + && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) |
498 | + /* Try HP-UX names. */ |
499 | + && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) |
500 | + return 1; |
501 | + return 0; |
502 | +}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no], |
503 | + [case "$host_os" in |
504 | + aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; |
505 | + *) am_cv_func_iconv_works="guessing yes" ;; |
506 | + esac]) |
507 | + LIBS="$am_save_LIBS" |
508 | + ]) |
509 | + case "$am_cv_func_iconv_works" in |
510 | + *no) am_func_iconv=no am_cv_lib_iconv=no ;; |
511 | + *) am_func_iconv=yes ;; |
512 | + esac |
513 | + else |
514 | + am_func_iconv=no am_cv_lib_iconv=no |
515 | + fi |
516 | + if test "$am_func_iconv" = yes; then |
517 | + AC_DEFINE(HAVE_ICONV, 1, |
518 | + [Define if you have the iconv() function and it works.]) |
519 | fi |
520 | if test "$am_cv_lib_iconv" = yes; then |
521 | AC_MSG_CHECKING([how to link with libiconv]) |
522 | @@ -622,464 +582,56 @@ |
523 | fi |
524 | ]) |
525 | |
526 | -# intdiv0.m4 serial 1 (gettext-0.11.3) |
527 | -dnl Copyright (C) 2002 Free Software Foundation, Inc. |
528 | -dnl This file is free software; the Free Software Foundation |
529 | -dnl gives unlimited permission to copy and/or distribute it, |
530 | -dnl with or without modifications, as long as this notice is preserved. |
531 | - |
532 | -dnl From Bruno Haible. |
533 | - |
534 | -AC_DEFUN([gt_INTDIV0], |
535 | -[ |
536 | - AC_REQUIRE([AC_PROG_CC])dnl |
537 | - AC_REQUIRE([AC_CANONICAL_HOST])dnl |
538 | - |
539 | - AC_CACHE_CHECK([whether integer division by zero raises SIGFPE], |
540 | - gt_cv_int_divbyzero_sigfpe, |
541 | - [ |
542 | - AC_TRY_RUN([ |
543 | -#include <stdlib.h> |
544 | -#include <signal.h> |
545 | - |
546 | -static void |
547 | -#ifdef __cplusplus |
548 | -sigfpe_handler (int sig) |
549 | -#else |
550 | -sigfpe_handler (sig) int sig; |
551 | -#endif |
552 | -{ |
553 | - /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */ |
554 | - exit (sig != SIGFPE); |
555 | -} |
556 | - |
557 | -int x = 1; |
558 | -int y = 0; |
559 | -int z; |
560 | -int nan; |
561 | - |
562 | -int main () |
563 | -{ |
564 | - signal (SIGFPE, sigfpe_handler); |
565 | -/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */ |
566 | -#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP) |
567 | - signal (SIGTRAP, sigfpe_handler); |
568 | -#endif |
569 | -/* Linux/SPARC yields signal SIGILL. */ |
570 | -#if defined (__sparc__) && defined (__linux__) |
571 | - signal (SIGILL, sigfpe_handler); |
572 | -#endif |
573 | - |
574 | - z = x / y; |
575 | - nan = y / y; |
576 | - exit (1); |
577 | -} |
578 | -], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no, |
579 | - [ |
580 | - # Guess based on the CPU. |
581 | - case "$host_cpu" in |
582 | - alpha* | i[34567]86 | m68k | s390*) |
583 | - gt_cv_int_divbyzero_sigfpe="guessing yes";; |
584 | - *) |
585 | - gt_cv_int_divbyzero_sigfpe="guessing no";; |
586 | - esac |
587 | - ]) |
588 | - ]) |
589 | - case "$gt_cv_int_divbyzero_sigfpe" in |
590 | - *yes) value=1;; |
591 | - *) value=0;; |
592 | - esac |
593 | - AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value, |
594 | - [Define if integer division by zero raises signal SIGFPE.]) |
595 | -]) |
596 | - |
597 | -# intl.m4 serial 3 (gettext-0.16) |
598 | -dnl Copyright (C) 1995-2006 Free Software Foundation, Inc. |
599 | -dnl This file is free software; the Free Software Foundation |
600 | -dnl gives unlimited permission to copy and/or distribute it, |
601 | -dnl with or without modifications, as long as this notice is preserved. |
602 | -dnl |
603 | -dnl This file can can be used in projects which are not available under |
604 | -dnl the GNU General Public License or the GNU Library General Public |
605 | -dnl License but which still want to provide support for the GNU gettext |
606 | -dnl functionality. |
607 | -dnl Please note that the actual code of the GNU gettext library is covered |
608 | -dnl by the GNU Library General Public License, and the rest of the GNU |
609 | -dnl gettext package package is covered by the GNU General Public License. |
610 | -dnl They are *not* in the public domain. |
611 | - |
612 | -dnl Authors: |
613 | -dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. |
614 | -dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006. |
615 | - |
616 | -AC_PREREQ(2.52) |
617 | - |
618 | -dnl Checks for all prerequisites of the intl subdirectory, |
619 | -dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS, |
620 | -dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL. |
621 | -AC_DEFUN([AM_INTL_SUBDIR], |
622 | -[ |
623 | - AC_REQUIRE([AC_PROG_INSTALL])dnl |
624 | - AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake |
625 | - AC_REQUIRE([AC_PROG_CC])dnl |
626 | - AC_REQUIRE([AC_CANONICAL_HOST])dnl |
627 | - AC_REQUIRE([gt_GLIBC2])dnl |
628 | - AC_REQUIRE([AC_PROG_RANLIB])dnl |
629 | - AC_REQUIRE([gl_VISIBILITY])dnl |
630 | - AC_REQUIRE([gt_INTL_SUBDIR_CORE])dnl |
631 | - AC_REQUIRE([AC_TYPE_LONG_LONG_INT])dnl |
632 | - AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl |
633 | - AC_REQUIRE([gt_TYPE_WCHAR_T])dnl |
634 | - AC_REQUIRE([gt_TYPE_WINT_T])dnl |
635 | - AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) |
636 | - AC_REQUIRE([gt_TYPE_INTMAX_T]) |
637 | - AC_REQUIRE([gt_PRINTF_POSIX]) |
638 | - AC_REQUIRE([gl_GLIBC21])dnl |
639 | - AC_REQUIRE([gl_XSIZE])dnl |
640 | - AC_REQUIRE([gt_INTL_MACOSX])dnl |
641 | - |
642 | - AC_CHECK_TYPE([ptrdiff_t], , |
643 | - [AC_DEFINE([ptrdiff_t], [long], |
644 | - [Define as the type of the result of subtracting two pointers, if the system doesn't define it.]) |
645 | - ]) |
646 | - AC_CHECK_HEADERS([stddef.h stdlib.h string.h]) |
647 | - AC_CHECK_FUNCS([asprintf fwprintf putenv setenv setlocale snprintf wcslen]) |
648 | - |
649 | - dnl Use the _snprintf function only if it is declared (because on NetBSD it |
650 | - dnl is defined as a weak alias of snprintf; we prefer to use the latter). |
651 | - gt_CHECK_DECL(_snprintf, [#include <stdio.h>]) |
652 | - gt_CHECK_DECL(_snwprintf, [#include <stdio.h>]) |
653 | - |
654 | - dnl Use the *_unlocked functions only if they are declared. |
655 | - dnl (because some of them were defined without being declared in Solaris |
656 | - dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built |
657 | - dnl on Solaris 2.5.1 to run on Solaris 2.6). |
658 | - dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13. |
659 | - gt_CHECK_DECL(getc_unlocked, [#include <stdio.h>]) |
660 | - |
661 | - case $gt_cv_func_printf_posix in |
662 | - *yes) HAVE_POSIX_PRINTF=1 ;; |
663 | - *) HAVE_POSIX_PRINTF=0 ;; |
664 | - esac |
665 | - AC_SUBST([HAVE_POSIX_PRINTF]) |
666 | - if test "$ac_cv_func_asprintf" = yes; then |
667 | - HAVE_ASPRINTF=1 |
668 | - else |
669 | - HAVE_ASPRINTF=0 |
670 | - fi |
671 | - AC_SUBST([HAVE_ASPRINTF]) |
672 | - if test "$ac_cv_func_snprintf" = yes; then |
673 | - HAVE_SNPRINTF=1 |
674 | - else |
675 | - HAVE_SNPRINTF=0 |
676 | - fi |
677 | - AC_SUBST([HAVE_SNPRINTF]) |
678 | - if test "$ac_cv_func_wprintf" = yes; then |
679 | - HAVE_WPRINTF=1 |
680 | - else |
681 | - HAVE_WPRINTF=0 |
682 | - fi |
683 | - AC_SUBST([HAVE_WPRINTF]) |
684 | - |
685 | - AM_LANGINFO_CODESET |
686 | - gt_LC_MESSAGES |
687 | - |
688 | - dnl Compilation on mingw and Cygwin needs special Makefile rules, because |
689 | - dnl 1. when we install a shared library, we must arrange to export |
690 | - dnl auxiliary pointer variables for every exported variable, |
691 | - dnl 2. when we install a shared library and a static library simultaneously, |
692 | - dnl the include file specifies __declspec(dllimport) and therefore we |
693 | - dnl must arrange to define the auxiliary pointer variables for the |
694 | - dnl exported variables _also_ in the static library. |
695 | - if test "$enable_shared" = yes; then |
696 | - case "$host_os" in |
697 | - cygwin*) is_woe32dll=yes ;; |
698 | - *) is_woe32dll=no ;; |
699 | - esac |
700 | - else |
701 | - is_woe32dll=no |
702 | - fi |
703 | - WOE32DLL=$is_woe32dll |
704 | - AC_SUBST([WOE32DLL]) |
705 | - |
706 | - dnl Rename some macros and functions used for locking. |
707 | - AH_BOTTOM([ |
708 | -#define __libc_lock_t gl_lock_t |
709 | -#define __libc_lock_define gl_lock_define |
710 | -#define __libc_lock_define_initialized gl_lock_define_initialized |
711 | -#define __libc_lock_init gl_lock_init |
712 | -#define __libc_lock_lock gl_lock_lock |
713 | -#define __libc_lock_unlock gl_lock_unlock |
714 | -#define __libc_lock_recursive_t gl_recursive_lock_t |
715 | -#define __libc_lock_define_recursive gl_recursive_lock_define |
716 | -#define __libc_lock_define_initialized_recursive gl_recursive_lock_define_initialized |
717 | -#define __libc_lock_init_recursive gl_recursive_lock_init |
718 | -#define __libc_lock_lock_recursive gl_recursive_lock_lock |
719 | -#define __libc_lock_unlock_recursive gl_recursive_lock_unlock |
720 | -#define glthread_in_use libintl_thread_in_use |
721 | -#define glthread_lock_init libintl_lock_init |
722 | -#define glthread_lock_lock libintl_lock_lock |
723 | -#define glthread_lock_unlock libintl_lock_unlock |
724 | -#define glthread_lock_destroy libintl_lock_destroy |
725 | -#define glthread_rwlock_init libintl_rwlock_init |
726 | -#define glthread_rwlock_rdlock libintl_rwlock_rdlock |
727 | -#define glthread_rwlock_wrlock libintl_rwlock_wrlock |
728 | -#define glthread_rwlock_unlock libintl_rwlock_unlock |
729 | -#define glthread_rwlock_destroy libintl_rwlock_destroy |
730 | -#define glthread_recursive_lock_init libintl_recursive_lock_init |
731 | -#define glthread_recursive_lock_lock libintl_recursive_lock_lock |
732 | -#define glthread_recursive_lock_unlock libintl_recursive_lock_unlock |
733 | -#define glthread_recursive_lock_destroy libintl_recursive_lock_destroy |
734 | -#define glthread_once libintl_once |
735 | -#define glthread_once_call libintl_once_call |
736 | -#define glthread_once_singlethreaded libintl_once_singlethreaded |
737 | -]) |
738 | -]) |
739 | - |
740 | - |
741 | -dnl Checks for the core files of the intl subdirectory: |
742 | -dnl dcigettext.c |
743 | -dnl eval-plural.h |
744 | -dnl explodename.c |
745 | -dnl finddomain.c |
746 | -dnl gettextP.h |
747 | -dnl gmo.h |
748 | -dnl hash-string.h hash-string.c |
749 | -dnl l10nflist.c |
750 | -dnl libgnuintl.h.in (except the *printf stuff) |
751 | -dnl loadinfo.h |
752 | -dnl loadmsgcat.c |
753 | -dnl localealias.c |
754 | -dnl log.c |
755 | -dnl plural-exp.h plural-exp.c |
756 | -dnl plural.y |
757 | -dnl Used by libglocale. |
758 | -AC_DEFUN([gt_INTL_SUBDIR_CORE], |
759 | -[ |
760 | - AC_REQUIRE([AC_C_INLINE])dnl |
761 | - AC_REQUIRE([AC_TYPE_SIZE_T])dnl |
762 | - AC_REQUIRE([gl_AC_HEADER_STDINT_H]) |
763 | - AC_REQUIRE([AC_FUNC_ALLOCA])dnl |
764 | - AC_REQUIRE([AC_FUNC_MMAP])dnl |
765 | - AC_REQUIRE([gt_INTDIV0])dnl |
766 | - AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl |
767 | - AC_REQUIRE([gt_INTTYPES_PRI])dnl |
768 | - AC_REQUIRE([gl_LOCK])dnl |
769 | - |
770 | - AC_TRY_LINK( |
771 | - [int foo (int a) { a = __builtin_expect (a, 10); return a == 10 ? 0 : 1; }], |
772 | - [], |
773 | - [AC_DEFINE([HAVE_BUILTIN_EXPECT], 1, |
774 | - [Define to 1 if the compiler understands __builtin_expect.])]) |
775 | - |
776 | - AC_CHECK_HEADERS([argz.h inttypes.h limits.h unistd.h sys/param.h]) |
777 | - AC_CHECK_FUNCS([getcwd getegid geteuid getgid getuid mempcpy munmap \ |
778 | - stpcpy strcasecmp strdup strtoul tsearch argz_count argz_stringify \ |
779 | - argz_next __fsetlocking]) |
780 | - |
781 | - dnl Use the *_unlocked functions only if they are declared. |
782 | - dnl (because some of them were defined without being declared in Solaris |
783 | - dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built |
784 | - dnl on Solaris 2.5.1 to run on Solaris 2.6). |
785 | - dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13. |
786 | - gt_CHECK_DECL(feof_unlocked, [#include <stdio.h>]) |
787 | - gt_CHECK_DECL(fgets_unlocked, [#include <stdio.h>]) |
788 | - |
789 | - AM_ICONV |
790 | - |
791 | - dnl glibc >= 2.4 has a NL_LOCALE_NAME macro when _GNU_SOURCE is defined, |
792 | - dnl and a _NL_LOCALE_NAME macro always. |
793 | - AC_CACHE_CHECK([for NL_LOCALE_NAME macro], gt_cv_nl_locale_name, |
794 | - [AC_TRY_LINK([#include <langinfo.h> |
795 | -#include <locale.h>], |
796 | - [char* cs = nl_langinfo(_NL_LOCALE_NAME(LC_MESSAGES));], |
797 | - gt_cv_nl_locale_name=yes, |
798 | - gt_cv_nl_locale_name=no) |
799 | - ]) |
800 | - if test $gt_cv_nl_locale_name = yes; then |
801 | - AC_DEFINE(HAVE_NL_LOCALE_NAME, 1, |
802 | - [Define if you have <langinfo.h> and it defines the NL_LOCALE_NAME macro if _GNU_SOURCE is defined.]) |
803 | - fi |
804 | - |
805 | - dnl intl/plural.c is generated from intl/plural.y. It requires bison, |
806 | - dnl because plural.y uses bison specific features. It requires at least |
807 | - dnl bison-1.26 because earlier versions generate a plural.c that doesn't |
808 | - dnl compile. |
809 | - dnl bison is only needed for the maintainer (who touches plural.y). But in |
810 | - dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put |
811 | - dnl the rule in general Makefile. Now, some people carelessly touch the |
812 | - dnl files or have a broken "make" program, hence the plural.c rule will |
813 | - dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not |
814 | - dnl present or too old. |
815 | - AC_CHECK_PROGS([INTLBISON], [bison]) |
816 | - if test -z "$INTLBISON"; then |
817 | - ac_verc_fail=yes |
818 | - else |
819 | - dnl Found it, now check the version. |
820 | - AC_MSG_CHECKING([version of bison]) |
821 | -changequote(<<,>>)dnl |
822 | - ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` |
823 | - case $ac_prog_version in |
824 | - '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; |
825 | - 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) |
826 | -changequote([,])dnl |
827 | - ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; |
828 | - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; |
829 | - esac |
830 | - AC_MSG_RESULT([$ac_prog_version]) |
831 | - fi |
832 | - if test $ac_verc_fail = yes; then |
833 | - INTLBISON=: |
834 | - fi |
835 | -]) |
836 | - |
837 | - |
838 | -dnl gt_CHECK_DECL(FUNC, INCLUDES) |
839 | -dnl Check whether a function is declared. |
840 | -AC_DEFUN([gt_CHECK_DECL], |
841 | -[ |
842 | - AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1, |
843 | - [AC_TRY_COMPILE([$2], [ |
844 | -#ifndef $1 |
845 | - char *p = (char *) $1; |
846 | -#endif |
847 | -], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)]) |
848 | - if test $ac_cv_have_decl_$1 = yes; then |
849 | - gt_value=1 |
850 | - else |
851 | - gt_value=0 |
852 | - fi |
853 | - AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value], |
854 | - [Define to 1 if you have the declaration of `$1', and to 0 if you don't.]) |
855 | -]) |
856 | - |
857 | -# intmax.m4 serial 3 (gettext-0.16) |
858 | -dnl Copyright (C) 2002-2005 Free Software Foundation, Inc. |
859 | -dnl This file is free software; the Free Software Foundation |
860 | -dnl gives unlimited permission to copy and/or distribute it, |
861 | -dnl with or without modifications, as long as this notice is preserved. |
862 | - |
863 | -dnl From Bruno Haible. |
864 | -dnl Test whether the system has the 'intmax_t' type, but don't attempt to |
865 | -dnl find a replacement if it is lacking. |
866 | - |
867 | -AC_DEFUN([gt_TYPE_INTMAX_T], |
868 | -[ |
869 | - AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) |
870 | - AC_REQUIRE([gl_AC_HEADER_STDINT_H]) |
871 | - AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t, |
872 | - [AC_TRY_COMPILE([ |
873 | -#include <stddef.h> |
874 | -#include <stdlib.h> |
875 | -#if HAVE_STDINT_H_WITH_UINTMAX |
876 | -#include <stdint.h> |
877 | -#endif |
878 | -#if HAVE_INTTYPES_H_WITH_UINTMAX |
879 | -#include <inttypes.h> |
880 | -#endif |
881 | -], [intmax_t x = -1; |
882 | - return !x;], |
883 | - gt_cv_c_intmax_t=yes, |
884 | - gt_cv_c_intmax_t=no)]) |
885 | - if test $gt_cv_c_intmax_t = yes; then |
886 | - AC_DEFINE(HAVE_INTMAX_T, 1, |
887 | - [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.]) |
888 | - fi |
889 | -]) |
890 | - |
891 | -# inttypes-pri.m4 serial 4 (gettext-0.16) |
892 | -dnl Copyright (C) 1997-2002, 2006 Free Software Foundation, Inc. |
893 | -dnl This file is free software; the Free Software Foundation |
894 | -dnl gives unlimited permission to copy and/or distribute it, |
895 | -dnl with or without modifications, as long as this notice is preserved. |
896 | - |
897 | -dnl From Bruno Haible. |
898 | - |
899 | -AC_PREREQ(2.52) |
900 | - |
901 | -# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI* |
902 | -# macros to non-string values. This is the case on AIX 4.3.3. |
903 | - |
904 | -AC_DEFUN([gt_INTTYPES_PRI], |
905 | -[ |
906 | - AC_CHECK_HEADERS([inttypes.h]) |
907 | - if test $ac_cv_header_inttypes_h = yes; then |
908 | - AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken], |
909 | - gt_cv_inttypes_pri_broken, |
910 | - [ |
911 | - AC_TRY_COMPILE([#include <inttypes.h> |
912 | -#ifdef PRId32 |
913 | -char *p = PRId32; |
914 | -#endif |
915 | -], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes) |
916 | - ]) |
917 | - fi |
918 | - if test "$gt_cv_inttypes_pri_broken" = yes; then |
919 | - AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1, |
920 | - [Define if <inttypes.h> exists and defines unusable PRI* macros.]) |
921 | - PRI_MACROS_BROKEN=1 |
922 | - else |
923 | - PRI_MACROS_BROKEN=0 |
924 | - fi |
925 | - AC_SUBST([PRI_MACROS_BROKEN]) |
926 | -]) |
927 | - |
928 | -# inttypes_h.m4 serial 7 |
929 | -dnl Copyright (C) 1997-2004, 2006 Free Software Foundation, Inc. |
930 | -dnl This file is free software; the Free Software Foundation |
931 | -dnl gives unlimited permission to copy and/or distribute it, |
932 | -dnl with or without modifications, as long as this notice is preserved. |
933 | - |
934 | -dnl From Paul Eggert. |
935 | - |
936 | -# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists, |
937 | -# doesn't clash with <sys/types.h>, and declares uintmax_t. |
938 | - |
939 | -AC_DEFUN([gl_AC_HEADER_INTTYPES_H], |
940 | -[ |
941 | - AC_CACHE_CHECK([for inttypes.h], gl_cv_header_inttypes_h, |
942 | - [AC_TRY_COMPILE( |
943 | - [#include <sys/types.h> |
944 | -#include <inttypes.h>], |
945 | - [uintmax_t i = (uintmax_t) -1; return !i;], |
946 | - gl_cv_header_inttypes_h=yes, |
947 | - gl_cv_header_inttypes_h=no)]) |
948 | - if test $gl_cv_header_inttypes_h = yes; then |
949 | - AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1, |
950 | - [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, |
951 | - and declares uintmax_t. ]) |
952 | - fi |
953 | -]) |
954 | - |
955 | -# lcmessage.m4 serial 4 (gettext-0.14.2) |
956 | -dnl Copyright (C) 1995-2002, 2004-2005 Free Software Foundation, Inc. |
957 | -dnl This file is free software; the Free Software Foundation |
958 | -dnl gives unlimited permission to copy and/or distribute it, |
959 | -dnl with or without modifications, as long as this notice is preserved. |
960 | -dnl |
961 | -dnl This file can can be used in projects which are not available under |
962 | -dnl the GNU General Public License or the GNU Library General Public |
963 | -dnl License but which still want to provide support for the GNU gettext |
964 | -dnl functionality. |
965 | -dnl Please note that the actual code of the GNU gettext library is covered |
966 | -dnl by the GNU Library General Public License, and the rest of the GNU |
967 | -dnl gettext package package is covered by the GNU General Public License. |
968 | -dnl They are *not* in the public domain. |
969 | - |
970 | -dnl Authors: |
971 | -dnl Ulrich Drepper <drepper@cygnus.com>, 1995. |
972 | - |
973 | -# Check whether LC_MESSAGES is available in <locale.h>. |
974 | - |
975 | -AC_DEFUN([gt_LC_MESSAGES], |
976 | -[ |
977 | - AC_CACHE_CHECK([for LC_MESSAGES], gt_cv_val_LC_MESSAGES, |
978 | - [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES], |
979 | - gt_cv_val_LC_MESSAGES=yes, gt_cv_val_LC_MESSAGES=no)]) |
980 | - if test $gt_cv_val_LC_MESSAGES = yes; then |
981 | - AC_DEFINE(HAVE_LC_MESSAGES, 1, |
982 | - [Define if your <locale.h> file defines LC_MESSAGES.]) |
983 | - fi |
984 | +# intlmacosx.m4 serial 1 (gettext-0.17) |
985 | +dnl Copyright (C) 2004-2007 Free Software Foundation, Inc. |
986 | +dnl This file is free software; the Free Software Foundation |
987 | +dnl gives unlimited permission to copy and/or distribute it, |
988 | +dnl with or without modifications, as long as this notice is preserved. |
989 | +dnl |
990 | +dnl This file can can be used in projects which are not available under |
991 | +dnl the GNU General Public License or the GNU Library General Public |
992 | +dnl License but which still want to provide support for the GNU gettext |
993 | +dnl functionality. |
994 | +dnl Please note that the actual code of the GNU gettext library is covered |
995 | +dnl by the GNU Library General Public License, and the rest of the GNU |
996 | +dnl gettext package package is covered by the GNU General Public License. |
997 | +dnl They are *not* in the public domain. |
998 | + |
999 | +dnl Checks for special options needed on MacOS X. |
1000 | +dnl Defines INTL_MACOSX_LIBS. |
1001 | +AC_DEFUN([gt_INTL_MACOSX], |
1002 | +[ |
1003 | + dnl Check for API introduced in MacOS X 10.2. |
1004 | + AC_CACHE_CHECK([for CFPreferencesCopyAppValue], |
1005 | + gt_cv_func_CFPreferencesCopyAppValue, |
1006 | + [gt_save_LIBS="$LIBS" |
1007 | + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" |
1008 | + AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>], |
1009 | + [CFPreferencesCopyAppValue(NULL, NULL)], |
1010 | + [gt_cv_func_CFPreferencesCopyAppValue=yes], |
1011 | + [gt_cv_func_CFPreferencesCopyAppValue=no]) |
1012 | + LIBS="$gt_save_LIBS"]) |
1013 | + if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then |
1014 | + AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1, |
1015 | + [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) |
1016 | + fi |
1017 | + dnl Check for API introduced in MacOS X 10.3. |
1018 | + AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent, |
1019 | + [gt_save_LIBS="$LIBS" |
1020 | + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" |
1021 | + AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();], |
1022 | + [gt_cv_func_CFLocaleCopyCurrent=yes], |
1023 | + [gt_cv_func_CFLocaleCopyCurrent=no]) |
1024 | + LIBS="$gt_save_LIBS"]) |
1025 | + if test $gt_cv_func_CFLocaleCopyCurrent = yes; then |
1026 | + AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1, |
1027 | + [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) |
1028 | + fi |
1029 | + INTL_MACOSX_LIBS= |
1030 | + if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then |
1031 | + INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" |
1032 | + fi |
1033 | + AC_SUBST([INTL_MACOSX_LIBS]) |
1034 | ]) |
1035 | |
1036 | # lib-ld.m4 serial 3 (gettext-0.13) |
1037 | @@ -1193,20 +745,22 @@ |
1038 | AC_LIB_PROG_LD_GNU |
1039 | ]) |
1040 | |
1041 | -# lib-link.m4 serial 9 (gettext-0.16) |
1042 | -dnl Copyright (C) 2001-2006 Free Software Foundation, Inc. |
1043 | +# lib-link.m4 serial 13 (gettext-0.17) |
1044 | +dnl Copyright (C) 2001-2007 Free Software Foundation, Inc. |
1045 | dnl This file is free software; the Free Software Foundation |
1046 | dnl gives unlimited permission to copy and/or distribute it, |
1047 | dnl with or without modifications, as long as this notice is preserved. |
1048 | |
1049 | dnl From Bruno Haible. |
1050 | |
1051 | -AC_PREREQ(2.50) |
1052 | +AC_PREREQ(2.54) |
1053 | |
1054 | dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and |
1055 | dnl the libraries corresponding to explicit and implicit dependencies. |
1056 | dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and |
1057 | dnl augments the CPPFLAGS variable. |
1058 | +dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname |
1059 | +dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem. |
1060 | AC_DEFUN([AC_LIB_LINKFLAGS], |
1061 | [ |
1062 | AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) |
1063 | @@ -1219,13 +773,16 @@ |
1064 | ac_cv_lib[]Name[]_libs="$LIB[]NAME" |
1065 | ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" |
1066 | ac_cv_lib[]Name[]_cppflags="$INC[]NAME" |
1067 | + ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX" |
1068 | ]) |
1069 | LIB[]NAME="$ac_cv_lib[]Name[]_libs" |
1070 | LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" |
1071 | INC[]NAME="$ac_cv_lib[]Name[]_cppflags" |
1072 | + LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix" |
1073 | AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) |
1074 | AC_SUBST([LIB]NAME) |
1075 | AC_SUBST([LTLIB]NAME) |
1076 | + AC_SUBST([LIB]NAME[_PREFIX]) |
1077 | dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the |
1078 | dnl results of this search when this library appears as a dependency. |
1079 | HAVE_LIB[]NAME=yes |
1080 | @@ -1241,6 +798,8 @@ |
1081 | dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and |
1082 | dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs |
1083 | dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. |
1084 | +dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname |
1085 | +dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem. |
1086 | AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], |
1087 | [ |
1088 | AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) |
1089 | @@ -1277,17 +836,23 @@ |
1090 | CPPFLAGS="$ac_save_CPPFLAGS" |
1091 | LIB[]NAME= |
1092 | LTLIB[]NAME= |
1093 | + LIB[]NAME[]_PREFIX= |
1094 | fi |
1095 | AC_SUBST([HAVE_LIB]NAME) |
1096 | AC_SUBST([LIB]NAME) |
1097 | AC_SUBST([LTLIB]NAME) |
1098 | + AC_SUBST([LIB]NAME[_PREFIX]) |
1099 | undefine([Name]) |
1100 | undefine([NAME]) |
1101 | ]) |
1102 | |
1103 | dnl Determine the platform dependent parameters needed to use rpath: |
1104 | -dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator, |
1105 | -dnl hardcode_direct, hardcode_minus_L. |
1106 | +dnl acl_libext, |
1107 | +dnl acl_shlibext, |
1108 | +dnl acl_hardcode_libdir_flag_spec, |
1109 | +dnl acl_hardcode_libdir_separator, |
1110 | +dnl acl_hardcode_direct, |
1111 | +dnl acl_hardcode_minus_L. |
1112 | AC_DEFUN([AC_LIB_RPATH], |
1113 | [ |
1114 | dnl Tell automake >= 1.10 to complain if config.rpath is missing. |
1115 | @@ -1304,12 +869,14 @@ |
1116 | acl_cv_rpath=done |
1117 | ]) |
1118 | wl="$acl_cv_wl" |
1119 | - libext="$acl_cv_libext" |
1120 | - shlibext="$acl_cv_shlibext" |
1121 | - hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" |
1122 | - hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" |
1123 | - hardcode_direct="$acl_cv_hardcode_direct" |
1124 | - hardcode_minus_L="$acl_cv_hardcode_minus_L" |
1125 | + acl_libext="$acl_cv_libext" |
1126 | + acl_shlibext="$acl_cv_shlibext" |
1127 | + acl_libname_spec="$acl_cv_libname_spec" |
1128 | + acl_library_names_spec="$acl_cv_library_names_spec" |
1129 | + acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" |
1130 | + acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" |
1131 | + acl_hardcode_direct="$acl_cv_hardcode_direct" |
1132 | + acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" |
1133 | dnl Determine whether the user wants rpath handling at all. |
1134 | AC_ARG_ENABLE(rpath, |
1135 | [ --disable-rpath do not hardcode runtime library paths], |
1136 | @@ -1319,20 +886,24 @@ |
1137 | dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and |
1138 | dnl the libraries corresponding to explicit and implicit dependencies. |
1139 | dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. |
1140 | +dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found |
1141 | +dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem. |
1142 | AC_DEFUN([AC_LIB_LINKFLAGS_BODY], |
1143 | [ |
1144 | AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) |
1145 | define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], |
1146 | [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) |
1147 | + dnl Autoconf >= 2.61 supports dots in --with options. |
1148 | + define([N_A_M_E],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit([$1],[.],[_])],[$1])]) |
1149 | dnl By default, look in $includedir and $libdir. |
1150 | use_additional=yes |
1151 | AC_LIB_WITH_FINAL_PREFIX([ |
1152 | eval additional_includedir=\"$includedir\" |
1153 | eval additional_libdir=\"$libdir\" |
1154 | ]) |
1155 | - AC_LIB_ARG_WITH([lib$1-prefix], |
1156 | -[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib |
1157 | - --without-lib$1-prefix don't search for lib$1 in includedir and libdir], |
1158 | + AC_LIB_ARG_WITH([lib]N_A_M_E[-prefix], |
1159 | +[ --with-lib]N_A_M_E[-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib |
1160 | + --without-lib]N_A_M_E[-prefix don't search for lib$1 in includedir and libdir], |
1161 | [ |
1162 | if test "X$withval" = "Xno"; then |
1163 | use_additional=no |
1164 | @@ -1353,6 +924,7 @@ |
1165 | LIB[]NAME= |
1166 | LTLIB[]NAME= |
1167 | INC[]NAME= |
1168 | + LIB[]NAME[]_PREFIX= |
1169 | rpathdirs= |
1170 | ltrpathdirs= |
1171 | names_already_handled= |
1172 | @@ -1392,29 +964,55 @@ |
1173 | found_la= |
1174 | found_so= |
1175 | found_a= |
1176 | + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name |
1177 | + if test -n "$acl_shlibext"; then |
1178 | + shrext=".$acl_shlibext" # typically: shrext=.so |
1179 | + else |
1180 | + shrext= |
1181 | + fi |
1182 | if test $use_additional = yes; then |
1183 | - if test -n "$shlibext" \ |
1184 | - && { test -f "$additional_libdir/lib$name.$shlibext" \ |
1185 | - || { test "$shlibext" = dll \ |
1186 | - && test -f "$additional_libdir/lib$name.dll.a"; }; }; then |
1187 | - found_dir="$additional_libdir" |
1188 | - if test -f "$additional_libdir/lib$name.$shlibext"; then |
1189 | - found_so="$additional_libdir/lib$name.$shlibext" |
1190 | + dir="$additional_libdir" |
1191 | + dnl The same code as in the loop below: |
1192 | + dnl First look for a shared library. |
1193 | + if test -n "$acl_shlibext"; then |
1194 | + if test -f "$dir/$libname$shrext"; then |
1195 | + found_dir="$dir" |
1196 | + found_so="$dir/$libname$shrext" |
1197 | else |
1198 | - found_so="$additional_libdir/lib$name.dll.a" |
1199 | - fi |
1200 | - if test -f "$additional_libdir/lib$name.la"; then |
1201 | - found_la="$additional_libdir/lib$name.la" |
1202 | - fi |
1203 | - else |
1204 | - if test -f "$additional_libdir/lib$name.$libext"; then |
1205 | - found_dir="$additional_libdir" |
1206 | - found_a="$additional_libdir/lib$name.$libext" |
1207 | - if test -f "$additional_libdir/lib$name.la"; then |
1208 | - found_la="$additional_libdir/lib$name.la" |
1209 | + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then |
1210 | + ver=`(cd "$dir" && \ |
1211 | + for f in "$libname$shrext".*; do echo "$f"; done \ |
1212 | + | sed -e "s,^$libname$shrext\\\\.,," \ |
1213 | + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ |
1214 | + | sed 1q ) 2>/dev/null` |
1215 | + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then |
1216 | + found_dir="$dir" |
1217 | + found_so="$dir/$libname$shrext.$ver" |
1218 | + fi |
1219 | + else |
1220 | + eval library_names=\"$acl_library_names_spec\" |
1221 | + for f in $library_names; do |
1222 | + if test -f "$dir/$f"; then |
1223 | + found_dir="$dir" |
1224 | + found_so="$dir/$f" |
1225 | + break |
1226 | + fi |
1227 | + done |
1228 | fi |
1229 | fi |
1230 | fi |
1231 | + dnl Then look for a static library. |
1232 | + if test "X$found_dir" = "X"; then |
1233 | + if test -f "$dir/$libname.$acl_libext"; then |
1234 | + found_dir="$dir" |
1235 | + found_a="$dir/$libname.$acl_libext" |
1236 | + fi |
1237 | + fi |
1238 | + if test "X$found_dir" != "X"; then |
1239 | + if test -f "$dir/$libname.la"; then |
1240 | + found_la="$dir/$libname.la" |
1241 | + fi |
1242 | + fi |
1243 | fi |
1244 | if test "X$found_dir" = "X"; then |
1245 | for x in $LDFLAGS $LTLIB[]NAME; do |
1246 | @@ -1422,28 +1020,46 @@ |
1247 | case "$x" in |
1248 | -L*) |
1249 | dir=`echo "X$x" | sed -e 's/^X-L//'` |
1250 | - if test -n "$shlibext" \ |
1251 | - && { test -f "$dir/lib$name.$shlibext" \ |
1252 | - || { test "$shlibext" = dll \ |
1253 | - && test -f "$dir/lib$name.dll.a"; }; }; then |
1254 | - found_dir="$dir" |
1255 | - if test -f "$dir/lib$name.$shlibext"; then |
1256 | - found_so="$dir/lib$name.$shlibext" |
1257 | + dnl First look for a shared library. |
1258 | + if test -n "$acl_shlibext"; then |
1259 | + if test -f "$dir/$libname$shrext"; then |
1260 | + found_dir="$dir" |
1261 | + found_so="$dir/$libname$shrext" |
1262 | else |
1263 | - found_so="$dir/lib$name.dll.a" |
1264 | - fi |
1265 | - if test -f "$dir/lib$name.la"; then |
1266 | - found_la="$dir/lib$name.la" |
1267 | - fi |
1268 | - else |
1269 | - if test -f "$dir/lib$name.$libext"; then |
1270 | - found_dir="$dir" |
1271 | - found_a="$dir/lib$name.$libext" |
1272 | - if test -f "$dir/lib$name.la"; then |
1273 | - found_la="$dir/lib$name.la" |
1274 | + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then |
1275 | + ver=`(cd "$dir" && \ |
1276 | + for f in "$libname$shrext".*; do echo "$f"; done \ |
1277 | + | sed -e "s,^$libname$shrext\\\\.,," \ |
1278 | + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ |
1279 | + | sed 1q ) 2>/dev/null` |
1280 | + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then |
1281 | + found_dir="$dir" |
1282 | + found_so="$dir/$libname$shrext.$ver" |
1283 | + fi |
1284 | + else |
1285 | + eval library_names=\"$acl_library_names_spec\" |
1286 | + for f in $library_names; do |
1287 | + if test -f "$dir/$f"; then |
1288 | + found_dir="$dir" |
1289 | + found_so="$dir/$f" |
1290 | + break |
1291 | + fi |
1292 | + done |
1293 | fi |
1294 | fi |
1295 | fi |
1296 | + dnl Then look for a static library. |
1297 | + if test "X$found_dir" = "X"; then |
1298 | + if test -f "$dir/$libname.$acl_libext"; then |
1299 | + found_dir="$dir" |
1300 | + found_a="$dir/$libname.$acl_libext" |
1301 | + fi |
1302 | + fi |
1303 | + if test "X$found_dir" != "X"; then |
1304 | + if test -f "$dir/$libname.la"; then |
1305 | + found_la="$dir/$libname.la" |
1306 | + fi |
1307 | + fi |
1308 | ;; |
1309 | esac |
1310 | if test "X$found_dir" != "X"; then |
1311 | @@ -1477,12 +1093,12 @@ |
1312 | ltrpathdirs="$ltrpathdirs $found_dir" |
1313 | fi |
1314 | dnl The hardcoding into $LIBNAME is system dependent. |
1315 | - if test "$hardcode_direct" = yes; then |
1316 | + if test "$acl_hardcode_direct" = yes; then |
1317 | dnl Using DIR/libNAME.so during linking hardcodes DIR into the |
1318 | dnl resulting binary. |
1319 | LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" |
1320 | else |
1321 | - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then |
1322 | + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then |
1323 | dnl Use an explicit option to hardcode DIR into the resulting |
1324 | dnl binary. |
1325 | LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" |
1326 | @@ -1513,13 +1129,13 @@ |
1327 | if test -z "$haveit"; then |
1328 | LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" |
1329 | fi |
1330 | - if test "$hardcode_minus_L" != no; then |
1331 | + if test "$acl_hardcode_minus_L" != no; then |
1332 | dnl FIXME: Not sure whether we should use |
1333 | dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" |
1334 | dnl here. |
1335 | LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" |
1336 | else |
1337 | - dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH |
1338 | + dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH |
1339 | dnl here, because this doesn't fit in flags passed to the |
1340 | dnl compiler. So give up. No hardcoding. This affects only |
1341 | dnl very old systems. |
1342 | @@ -1546,6 +1162,7 @@ |
1343 | case "$found_dir" in |
1344 | */$acl_libdirstem | */$acl_libdirstem/) |
1345 | basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` |
1346 | + LIB[]NAME[]_PREFIX="$basedir" |
1347 | additional_includedir="$basedir/include" |
1348 | ;; |
1349 | esac |
1350 | @@ -1707,18 +1324,18 @@ |
1351 | done |
1352 | done |
1353 | if test "X$rpathdirs" != "X"; then |
1354 | - if test -n "$hardcode_libdir_separator"; then |
1355 | + if test -n "$acl_hardcode_libdir_separator"; then |
1356 | dnl Weird platform: only the last -rpath option counts, the user must |
1357 | dnl pass all path elements in one option. We can arrange that for a |
1358 | dnl single library, but not when more than one $LIBNAMEs are used. |
1359 | alldirs= |
1360 | for found_dir in $rpathdirs; do |
1361 | - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" |
1362 | + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" |
1363 | done |
1364 | - dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl. |
1365 | + dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl. |
1366 | acl_save_libdir="$libdir" |
1367 | libdir="$alldirs" |
1368 | - eval flag=\"$hardcode_libdir_flag_spec\" |
1369 | + eval flag=\"$acl_hardcode_libdir_flag_spec\" |
1370 | libdir="$acl_save_libdir" |
1371 | LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" |
1372 | else |
1373 | @@ -1726,7 +1343,7 @@ |
1374 | for found_dir in $rpathdirs; do |
1375 | acl_save_libdir="$libdir" |
1376 | libdir="$found_dir" |
1377 | - eval flag=\"$hardcode_libdir_flag_spec\" |
1378 | + eval flag=\"$acl_hardcode_libdir_flag_spec\" |
1379 | libdir="$acl_save_libdir" |
1380 | LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" |
1381 | done |
1382 | @@ -1775,7 +1392,7 @@ |
1383 | AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) |
1384 | $1= |
1385 | if test "$enable_rpath" != no; then |
1386 | - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then |
1387 | + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then |
1388 | dnl Use an explicit option to hardcode directories into the resulting |
1389 | dnl binary. |
1390 | rpathdirs= |
1391 | @@ -1809,16 +1426,16 @@ |
1392 | done |
1393 | else |
1394 | dnl The linker is used for linking directly. |
1395 | - if test -n "$hardcode_libdir_separator"; then |
1396 | + if test -n "$acl_hardcode_libdir_separator"; then |
1397 | dnl Weird platform: only the last -rpath option counts, the user |
1398 | dnl must pass all path elements in one option. |
1399 | alldirs= |
1400 | for dir in $rpathdirs; do |
1401 | - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$dir" |
1402 | + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir" |
1403 | done |
1404 | acl_save_libdir="$libdir" |
1405 | libdir="$alldirs" |
1406 | - eval flag=\"$hardcode_libdir_flag_spec\" |
1407 | + eval flag=\"$acl_hardcode_libdir_flag_spec\" |
1408 | libdir="$acl_save_libdir" |
1409 | $1="$flag" |
1410 | else |
1411 | @@ -1826,7 +1443,7 @@ |
1412 | for dir in $rpathdirs; do |
1413 | acl_save_libdir="$libdir" |
1414 | libdir="$dir" |
1415 | - eval flag=\"$hardcode_libdir_flag_spec\" |
1416 | + eval flag=\"$acl_hardcode_libdir_flag_spec\" |
1417 | libdir="$acl_save_libdir" |
1418 | $1="${$1}${$1:+ }$flag" |
1419 | done |
1420 | @@ -2026,7 +1643,7 @@ |
1421 | |
1422 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- |
1423 | |
1424 | -# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL |
1425 | +# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL |
1426 | |
1427 | |
1428 | # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) |
1429 | @@ -2114,7 +1731,6 @@ |
1430 | AC_REQUIRE([AC_OBJEXT])dnl |
1431 | AC_REQUIRE([AC_EXEEXT])dnl |
1432 | dnl |
1433 | - |
1434 | AC_LIBTOOL_SYS_MAX_CMD_LEN |
1435 | AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE |
1436 | AC_LIBTOOL_OBJDIR |
1437 | @@ -2189,7 +1805,7 @@ |
1438 | test -z "$ac_objext" && ac_objext=o |
1439 | |
1440 | # Determine commands to create old-style static archives. |
1441 | -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' |
1442 | +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' |
1443 | old_postinstall_cmds='chmod 644 $oldlib' |
1444 | old_postuninstall_cmds= |
1445 | |
1446 | @@ -2216,6 +1832,8 @@ |
1447 | ;; |
1448 | esac |
1449 | |
1450 | +_LT_REQUIRED_DARWIN_CHECKS |
1451 | + |
1452 | AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) |
1453 | AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], |
1454 | enable_win32_dll=yes, enable_win32_dll=no) |
1455 | @@ -2276,8 +1894,9 @@ |
1456 | # Check for compiler boilerplate output or warnings with |
1457 | # the simple compiler test code. |
1458 | AC_DEFUN([_LT_COMPILER_BOILERPLATE], |
1459 | -[ac_outfile=conftest.$ac_objext |
1460 | -printf "$lt_simple_compile_test_code" >conftest.$ac_ext |
1461 | +[AC_REQUIRE([LT_AC_PROG_SED])dnl |
1462 | +ac_outfile=conftest.$ac_objext |
1463 | +echo "$lt_simple_compile_test_code" >conftest.$ac_ext |
1464 | eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err |
1465 | _lt_compiler_boilerplate=`cat conftest.err` |
1466 | $rm conftest* |
1467 | @@ -2289,13 +1908,85 @@ |
1468 | # Check for linker boilerplate output or warnings with |
1469 | # the simple link test code. |
1470 | AC_DEFUN([_LT_LINKER_BOILERPLATE], |
1471 | -[ac_outfile=conftest.$ac_objext |
1472 | -printf "$lt_simple_link_test_code" >conftest.$ac_ext |
1473 | +[AC_REQUIRE([LT_AC_PROG_SED])dnl |
1474 | +ac_outfile=conftest.$ac_objext |
1475 | +echo "$lt_simple_link_test_code" >conftest.$ac_ext |
1476 | eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err |
1477 | _lt_linker_boilerplate=`cat conftest.err` |
1478 | -$rm conftest* |
1479 | +$rm -r conftest* |
1480 | ])# _LT_LINKER_BOILERPLATE |
1481 | |
1482 | +# _LT_REQUIRED_DARWIN_CHECKS |
1483 | +# -------------------------- |
1484 | +# Check for some things on darwin |
1485 | +AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[ |
1486 | + case $host_os in |
1487 | + rhapsody* | darwin*) |
1488 | + AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) |
1489 | + AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) |
1490 | + |
1491 | + AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], |
1492 | + [lt_cv_apple_cc_single_mod=no |
1493 | + if test -z "${LT_MULTI_MODULE}"; then |
1494 | + # By default we will add the -single_module flag. You can override |
1495 | + # by either setting the environment variable LT_MULTI_MODULE |
1496 | + # non-empty at configure time, or by adding -multi_module to the |
1497 | + # link flags. |
1498 | + echo "int foo(void){return 1;}" > conftest.c |
1499 | + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ |
1500 | + -dynamiclib ${wl}-single_module conftest.c |
1501 | + if test -f libconftest.dylib; then |
1502 | + lt_cv_apple_cc_single_mod=yes |
1503 | + rm -rf libconftest.dylib* |
1504 | + fi |
1505 | + rm conftest.c |
1506 | + fi]) |
1507 | + AC_CACHE_CHECK([for -exported_symbols_list linker flag], |
1508 | + [lt_cv_ld_exported_symbols_list], |
1509 | + [lt_cv_ld_exported_symbols_list=no |
1510 | + save_LDFLAGS=$LDFLAGS |
1511 | + echo "_main" > conftest.sym |
1512 | + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" |
1513 | + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], |
1514 | + [lt_cv_ld_exported_symbols_list=yes], |
1515 | + [lt_cv_ld_exported_symbols_list=no]) |
1516 | + LDFLAGS="$save_LDFLAGS" |
1517 | + ]) |
1518 | + case $host_os in |
1519 | + rhapsody* | darwin1.[[0123]]) |
1520 | + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; |
1521 | + darwin1.*) |
1522 | + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; |
1523 | + darwin*) |
1524 | + # if running on 10.5 or later, the deployment target defaults |
1525 | + # to the OS version, if on x86, and 10.4, the deployment |
1526 | + # target defaults to 10.4. Don't you love it? |
1527 | + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in |
1528 | + 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) |
1529 | + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; |
1530 | + 10.[[012]]*) |
1531 | + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; |
1532 | + 10.*) |
1533 | + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; |
1534 | + esac |
1535 | + ;; |
1536 | + esac |
1537 | + if test "$lt_cv_apple_cc_single_mod" = "yes"; then |
1538 | + _lt_dar_single_mod='$single_module' |
1539 | + fi |
1540 | + if test "$lt_cv_ld_exported_symbols_list" = "yes"; then |
1541 | + _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' |
1542 | + else |
1543 | + _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" |
1544 | + fi |
1545 | + if test "$DSYMUTIL" != ":"; then |
1546 | + _lt_dsymutil="~$DSYMUTIL \$lib || :" |
1547 | + else |
1548 | + _lt_dsymutil= |
1549 | + fi |
1550 | + ;; |
1551 | + esac |
1552 | +]) |
1553 | |
1554 | # _LT_AC_SYS_LIBPATH_AIX |
1555 | # ---------------------- |
1556 | @@ -2306,12 +1997,20 @@ |
1557 | # If we don't find anything, use the default library path according |
1558 | # to the aix ld manual. |
1559 | AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], |
1560 | -[AC_LINK_IFELSE(AC_LANG_PROGRAM,[ |
1561 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } |
1562 | -}'` |
1563 | +[AC_REQUIRE([LT_AC_PROG_SED])dnl |
1564 | +AC_LINK_IFELSE(AC_LANG_PROGRAM,[ |
1565 | +lt_aix_libpath_sed=' |
1566 | + /Import File Strings/,/^$/ { |
1567 | + /^0/ { |
1568 | + s/^0 *\(.*\)$/\1/ |
1569 | + p |
1570 | + } |
1571 | + }' |
1572 | +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
1573 | # Check for a 64-bit object if we didn't find anything. |
1574 | -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } |
1575 | -}'`; fi],[]) |
1576 | +if test -z "$aix_libpath"; then |
1577 | + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
1578 | +fi],[]) |
1579 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
1580 | ])# _LT_AC_SYS_LIBPATH_AIX |
1581 | |
1582 | @@ -2542,13 +2241,17 @@ |
1583 | rm -rf conftest* |
1584 | ;; |
1585 | |
1586 | -x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) |
1587 | +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ |
1588 | +s390*-*linux*|sparc*-*linux*) |
1589 | # Find out which ABI we are using. |
1590 | echo 'int i;' > conftest.$ac_ext |
1591 | if AC_TRY_EVAL(ac_compile); then |
1592 | case `/usr/bin/file conftest.o` in |
1593 | *32-bit*) |
1594 | case $host in |
1595 | + x86_64-*kfreebsd*-gnu) |
1596 | + LD="${LD-ld} -m elf_i386_fbsd" |
1597 | + ;; |
1598 | x86_64-*linux*) |
1599 | LD="${LD-ld} -m elf_i386" |
1600 | ;; |
1601 | @@ -2565,6 +2268,9 @@ |
1602 | ;; |
1603 | *64-bit*) |
1604 | case $host in |
1605 | + x86_64-*kfreebsd*-gnu) |
1606 | + LD="${LD-ld} -m elf_x86_64_fbsd" |
1607 | + ;; |
1608 | x86_64-*linux*) |
1609 | LD="${LD-ld} -m elf_x86_64" |
1610 | ;; |
1611 | @@ -2605,7 +2311,11 @@ |
1612 | *64-bit*) |
1613 | case $lt_cv_prog_gnu_ld in |
1614 | yes*) LD="${LD-ld} -m elf64_sparc" ;; |
1615 | - *) LD="${LD-ld} -64" ;; |
1616 | + *) |
1617 | + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then |
1618 | + LD="${LD-ld} -64" |
1619 | + fi |
1620 | + ;; |
1621 | esac |
1622 | ;; |
1623 | esac |
1624 | @@ -2636,7 +2346,7 @@ |
1625 | AC_CACHE_CHECK([$1], [$2], |
1626 | [$2=no |
1627 | ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) |
1628 | - printf "$lt_simple_compile_test_code" > conftest.$ac_ext |
1629 | + echo "$lt_simple_compile_test_code" > conftest.$ac_ext |
1630 | lt_compiler_flag="$3" |
1631 | # Insert the option either (1) after the last *FLAGS variable, or |
1632 | # (2) before a word containing "conftest.", or (3) at the end. |
1633 | @@ -2677,11 +2387,12 @@ |
1634 | # ------------------------------------------------------------ |
1635 | # Check whether the given compiler option works |
1636 | AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], |
1637 | -[AC_CACHE_CHECK([$1], [$2], |
1638 | +[AC_REQUIRE([LT_AC_PROG_SED])dnl |
1639 | +AC_CACHE_CHECK([$1], [$2], |
1640 | [$2=no |
1641 | save_LDFLAGS="$LDFLAGS" |
1642 | LDFLAGS="$LDFLAGS $3" |
1643 | - printf "$lt_simple_link_test_code" > conftest.$ac_ext |
1644 | + echo "$lt_simple_link_test_code" > conftest.$ac_ext |
1645 | if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then |
1646 | # The linker can only warn and ignore the option if not recognized |
1647 | # So say no if there are warnings |
1648 | @@ -2697,7 +2408,7 @@ |
1649 | $2=yes |
1650 | fi |
1651 | fi |
1652 | - $rm conftest* |
1653 | + $rm -r conftest* |
1654 | LDFLAGS="$save_LDFLAGS" |
1655 | ]) |
1656 | |
1657 | @@ -2795,24 +2506,27 @@ |
1658 | fi |
1659 | ;; |
1660 | *) |
1661 | - # If test is not a shell built-in, we'll probably end up computing a |
1662 | - # maximum length that is only half of the actual maximum length, but |
1663 | - # we can't tell. |
1664 | - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} |
1665 | - while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ |
1666 | + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` |
1667 | + if test -n "$lt_cv_sys_max_cmd_len"; then |
1668 | + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` |
1669 | + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` |
1670 | + else |
1671 | + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} |
1672 | + while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ |
1673 | = "XX$teststring") >/dev/null 2>&1 && |
1674 | - new_result=`expr "X$teststring" : ".*" 2>&1` && |
1675 | - lt_cv_sys_max_cmd_len=$new_result && |
1676 | - test $i != 17 # 1/2 MB should be enough |
1677 | - do |
1678 | - i=`expr $i + 1` |
1679 | - teststring=$teststring$teststring |
1680 | - done |
1681 | - teststring= |
1682 | - # Add a significant safety factor because C++ compilers can tack on massive |
1683 | - # amounts of additional arguments before passing them to the linker. |
1684 | - # It appears as though 1/2 is a usable value. |
1685 | - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` |
1686 | + new_result=`expr "X$teststring" : ".*" 2>&1` && |
1687 | + lt_cv_sys_max_cmd_len=$new_result && |
1688 | + test $i != 17 # 1/2 MB should be enough |
1689 | + do |
1690 | + i=`expr $i + 1` |
1691 | + teststring=$teststring$teststring |
1692 | + done |
1693 | + teststring= |
1694 | + # Add a significant safety factor because C++ compilers can tack on massive |
1695 | + # amounts of additional arguments before passing them to the linker. |
1696 | + # It appears as though 1/2 is a usable value. |
1697 | + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` |
1698 | + fi |
1699 | ;; |
1700 | esac |
1701 | ]) |
1702 | @@ -2965,7 +2679,7 @@ |
1703 | AC_CHECK_FUNC([shl_load], |
1704 | [lt_cv_dlopen="shl_load"], |
1705 | [AC_CHECK_LIB([dld], [shl_load], |
1706 | - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], |
1707 | + [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], |
1708 | [AC_CHECK_FUNC([dlopen], |
1709 | [lt_cv_dlopen="dlopen"], |
1710 | [AC_CHECK_LIB([dl], [dlopen], |
1711 | @@ -2973,7 +2687,7 @@ |
1712 | [AC_CHECK_LIB([svld], [dlopen], |
1713 | [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], |
1714 | [AC_CHECK_LIB([dld], [dld_link], |
1715 | - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) |
1716 | + [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) |
1717 | ]) |
1718 | ]) |
1719 | ]) |
1720 | @@ -3039,7 +2753,8 @@ |
1721 | # --------------------------------- |
1722 | # Check to see if options -c and -o are simultaneously supported by compiler |
1723 | AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], |
1724 | -[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl |
1725 | +[AC_REQUIRE([LT_AC_PROG_SED])dnl |
1726 | +AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl |
1727 | AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], |
1728 | [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], |
1729 | [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no |
1730 | @@ -3047,7 +2762,7 @@ |
1731 | mkdir conftest |
1732 | cd conftest |
1733 | mkdir out |
1734 | - printf "$lt_simple_compile_test_code" > conftest.$ac_ext |
1735 | + echo "$lt_simple_compile_test_code" > conftest.$ac_ext |
1736 | |
1737 | lt_compiler_flag="-o out/conftest2.$ac_objext" |
1738 | # Insert the option either (1) after the last *FLAGS variable, or |
1739 | @@ -3187,6 +2902,7 @@ |
1740 | darwin*) |
1741 | if test -n "$STRIP" ; then |
1742 | striplib="$STRIP -x" |
1743 | + old_striplib="$STRIP -S" |
1744 | AC_MSG_RESULT([yes]) |
1745 | else |
1746 | AC_MSG_RESULT([no]) |
1747 | @@ -3204,7 +2920,8 @@ |
1748 | # ----------------------------- |
1749 | # PORTME Fill in your ld.so characteristics |
1750 | AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], |
1751 | -[AC_MSG_CHECKING([dynamic linker characteristics]) |
1752 | +[AC_REQUIRE([LT_AC_PROG_SED])dnl |
1753 | +AC_MSG_CHECKING([dynamic linker characteristics]) |
1754 | library_names_spec= |
1755 | libname_spec='lib$name' |
1756 | soname_spec= |
1757 | @@ -3218,20 +2935,58 @@ |
1758 | version_type=none |
1759 | dynamic_linker="$host_os ld.so" |
1760 | sys_lib_dlsearch_path_spec="/lib /usr/lib" |
1761 | +m4_if($1,[],[ |
1762 | if test "$GCC" = yes; then |
1763 | - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` |
1764 | - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then |
1765 | + case $host_os in |
1766 | + darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; |
1767 | + *) lt_awk_arg="/^libraries:/" ;; |
1768 | + esac |
1769 | + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` |
1770 | + if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then |
1771 | # if the path contains ";" then we assume it to be the separator |
1772 | # otherwise default to the standard path separator (i.e. ":") - it is |
1773 | # assumed that no part of a normal pathname contains ";" but that should |
1774 | # okay in the real world where ";" in dirpaths is itself problematic. |
1775 | - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
1776 | + lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` |
1777 | else |
1778 | - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
1779 | + lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
1780 | fi |
1781 | + # Ok, now we have the path, separated by spaces, we can step through it |
1782 | + # and add multilib dir if necessary. |
1783 | + lt_tmp_lt_search_path_spec= |
1784 | + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` |
1785 | + for lt_sys_path in $lt_search_path_spec; do |
1786 | + if test -d "$lt_sys_path/$lt_multi_os_dir"; then |
1787 | + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" |
1788 | + else |
1789 | + test -d "$lt_sys_path" && \ |
1790 | + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" |
1791 | + fi |
1792 | + done |
1793 | + lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' |
1794 | +BEGIN {RS=" "; FS="/|\n";} { |
1795 | + lt_foo=""; |
1796 | + lt_count=0; |
1797 | + for (lt_i = NF; lt_i > 0; lt_i--) { |
1798 | + if ($lt_i != "" && $lt_i != ".") { |
1799 | + if ($lt_i == "..") { |
1800 | + lt_count++; |
1801 | + } else { |
1802 | + if (lt_count == 0) { |
1803 | + lt_foo="/" $lt_i lt_foo; |
1804 | + } else { |
1805 | + lt_count--; |
1806 | + } |
1807 | + } |
1808 | + } |
1809 | + } |
1810 | + if (lt_foo != "") { lt_freq[[lt_foo]]++; } |
1811 | + if (lt_freq[[lt_foo]] == 1) { print lt_foo; } |
1812 | +}'` |
1813 | + sys_lib_search_path_spec=`echo $lt_search_path_spec` |
1814 | else |
1815 | sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" |
1816 | -fi |
1817 | +fi]) |
1818 | need_lib_prefix=unknown |
1819 | hardcode_into_libs=no |
1820 | |
1821 | @@ -3249,7 +3004,7 @@ |
1822 | soname_spec='${libname}${release}${shared_ext}$major' |
1823 | ;; |
1824 | |
1825 | -aix4* | aix5*) |
1826 | +aix[[4-9]]*) |
1827 | version_type=linux |
1828 | need_lib_prefix=no |
1829 | need_version=no |
1830 | @@ -3388,12 +3143,8 @@ |
1831 | shlibpath_overrides_runpath=yes |
1832 | shlibpath_var=DYLD_LIBRARY_PATH |
1833 | shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' |
1834 | - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. |
1835 | - if test "$GCC" = yes; then |
1836 | - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` |
1837 | - else |
1838 | - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' |
1839 | - fi |
1840 | + m4_if([$1], [],[ |
1841 | + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) |
1842 | sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' |
1843 | ;; |
1844 | |
1845 | @@ -3447,7 +3198,7 @@ |
1846 | shlibpath_overrides_runpath=no |
1847 | hardcode_into_libs=yes |
1848 | ;; |
1849 | - freebsd*) # from 4.6 on |
1850 | + *) # from 4.6 on, and DragonFly |
1851 | shlibpath_overrides_runpath=yes |
1852 | hardcode_into_libs=yes |
1853 | ;; |
1854 | @@ -3510,7 +3261,7 @@ |
1855 | postinstall_cmds='chmod 555 $lib' |
1856 | ;; |
1857 | |
1858 | -interix3*) |
1859 | +interix[[3-9]]*) |
1860 | version_type=linux |
1861 | need_lib_prefix=no |
1862 | need_version=no |
1863 | @@ -3581,7 +3332,7 @@ |
1864 | |
1865 | # Append ld.so.conf contents to the search path |
1866 | if test -f /etc/ld.so.conf; then |
1867 | - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` |
1868 | + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` |
1869 | sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" |
1870 | fi |
1871 | |
1872 | @@ -3687,6 +3438,10 @@ |
1873 | sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" |
1874 | ;; |
1875 | |
1876 | +rdos*) |
1877 | + dynamic_linker=no |
1878 | + ;; |
1879 | + |
1880 | solaris*) |
1881 | version_type=linux |
1882 | need_lib_prefix=no |
1883 | @@ -3782,6 +3537,13 @@ |
1884 | AC_MSG_RESULT([$dynamic_linker]) |
1885 | test "$dynamic_linker" = no && can_build_shared=no |
1886 | |
1887 | +AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec], |
1888 | +[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"]) |
1889 | +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" |
1890 | +AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec], |
1891 | +[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"]) |
1892 | +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" |
1893 | + |
1894 | variables_saved_for_relink="PATH $shlibpath_var $runpath_var" |
1895 | if test "$GCC" = yes; then |
1896 | variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" |
1897 | @@ -3792,7 +3554,8 @@ |
1898 | # _LT_AC_TAGCONFIG |
1899 | # ---------------- |
1900 | AC_DEFUN([_LT_AC_TAGCONFIG], |
1901 | -[AC_ARG_WITH([tags], |
1902 | +[AC_REQUIRE([LT_AC_PROG_SED])dnl |
1903 | +AC_ARG_WITH([tags], |
1904 | [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], |
1905 | [include additional configurations @<:@automatic@:>@])], |
1906 | [tagnames="$withval"]) |
1907 | @@ -4053,7 +3816,7 @@ |
1908 | |
1909 | # AC_PATH_TOOL_PREFIX |
1910 | # ------------------- |
1911 | -# find a file program which can recognise shared library |
1912 | +# find a file program which can recognize shared library |
1913 | AC_DEFUN([AC_PATH_TOOL_PREFIX], |
1914 | [AC_REQUIRE([AC_PROG_EGREP])dnl |
1915 | AC_MSG_CHECKING([for $1]) |
1916 | @@ -4116,7 +3879,7 @@ |
1917 | |
1918 | # AC_PATH_MAGIC |
1919 | # ------------- |
1920 | -# find a file program which can recognise a shared library |
1921 | +# find a file program which can recognize a shared library |
1922 | AC_DEFUN([AC_PATH_MAGIC], |
1923 | [AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) |
1924 | if test -z "$lt_cv_path_MAGIC_CMD"; then |
1925 | @@ -4263,7 +4026,7 @@ |
1926 | # how to check for library dependencies |
1927 | # -- PORTME fill in with the dynamic library characteristics |
1928 | AC_DEFUN([AC_DEPLIBS_CHECK_METHOD], |
1929 | -[AC_CACHE_CHECK([how to recognise dependent libraries], |
1930 | +[AC_CACHE_CHECK([how to recognize dependent libraries], |
1931 | lt_cv_deplibs_check_method, |
1932 | [lt_cv_file_magic_cmd='$MAGIC_CMD' |
1933 | lt_cv_file_magic_test_file= |
1934 | @@ -4280,7 +4043,7 @@ |
1935 | # whether `pass_all' will *always* work, you probably want this one. |
1936 | |
1937 | case $host_os in |
1938 | -aix4* | aix5*) |
1939 | +aix[[4-9]]*) |
1940 | lt_cv_deplibs_check_method=pass_all |
1941 | ;; |
1942 | |
1943 | @@ -4302,9 +4065,15 @@ |
1944 | |
1945 | mingw* | pw32*) |
1946 | # Base MSYS/MinGW do not provide the 'file' command needed by |
1947 | - # func_win32_libid shell function, so use a weaker test based on 'objdump'. |
1948 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
1949 | - lt_cv_file_magic_cmd='$OBJDUMP -f' |
1950 | + # func_win32_libid shell function, so use a weaker test based on 'objdump', |
1951 | + # unless we find 'file', for example because we are cross-compiling. |
1952 | + if ( file / ) >/dev/null 2>&1; then |
1953 | + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
1954 | + lt_cv_file_magic_cmd='func_win32_libid' |
1955 | + else |
1956 | + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
1957 | + lt_cv_file_magic_cmd='$OBJDUMP -f' |
1958 | + fi |
1959 | ;; |
1960 | |
1961 | darwin* | rhapsody*) |
1962 | @@ -4349,7 +4118,7 @@ |
1963 | esac |
1964 | ;; |
1965 | |
1966 | -interix3*) |
1967 | +interix[[3-9]]*) |
1968 | # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here |
1969 | lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' |
1970 | ;; |
1971 | @@ -4399,6 +4168,10 @@ |
1972 | lt_cv_deplibs_check_method=pass_all |
1973 | ;; |
1974 | |
1975 | +rdos*) |
1976 | + lt_cv_deplibs_check_method=pass_all |
1977 | + ;; |
1978 | + |
1979 | solaris*) |
1980 | lt_cv_deplibs_check_method=pass_all |
1981 | ;; |
1982 | @@ -4451,7 +4224,7 @@ |
1983 | lt_cv_path_NM="$NM" |
1984 | else |
1985 | lt_nm_to_check="${ac_tool_prefix}nm" |
1986 | - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then |
1987 | + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then |
1988 | lt_nm_to_check="$lt_nm_to_check nm" |
1989 | fi |
1990 | for lt_tmp_nm in $lt_nm_to_check; do |
1991 | @@ -4667,10 +4440,10 @@ |
1992 | _LT_AC_TAGVAR(objext, $1)=$objext |
1993 | |
1994 | # Code to be used in simple compile tests |
1995 | -lt_simple_compile_test_code="int some_variable = 0;\n" |
1996 | +lt_simple_compile_test_code="int some_variable = 0;" |
1997 | |
1998 | # Code to be used in simple link tests |
1999 | -lt_simple_link_test_code='int main(){return(0);}\n' |
2000 | +lt_simple_link_test_code='int main(){return(0);}' |
2001 | |
2002 | _LT_AC_SYS_COMPILER |
2003 | |
2004 | @@ -4706,7 +4479,7 @@ |
2005 | fi |
2006 | ;; |
2007 | |
2008 | -aix4* | aix5*) |
2009 | +aix[[4-9]]*) |
2010 | if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then |
2011 | test "$enable_shared" = yes && enable_static=no |
2012 | fi |
2013 | @@ -4763,6 +4536,7 @@ |
2014 | _LT_AC_TAGVAR(predeps, $1)= |
2015 | _LT_AC_TAGVAR(postdeps, $1)= |
2016 | _LT_AC_TAGVAR(compiler_lib_search_path, $1)= |
2017 | +_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= |
2018 | |
2019 | # Source file extension for C++ test sources. |
2020 | ac_ext=cpp |
2021 | @@ -4772,10 +4546,10 @@ |
2022 | _LT_AC_TAGVAR(objext, $1)=$objext |
2023 | |
2024 | # Code to be used in simple compile tests |
2025 | -lt_simple_compile_test_code="int some_variable = 0;\n" |
2026 | +lt_simple_compile_test_code="int some_variable = 0;" |
2027 | |
2028 | # Code to be used in simple link tests |
2029 | -lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n' |
2030 | +lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' |
2031 | |
2032 | # ltmain only uses $CC for tagged configurations so make sure $CC is set. |
2033 | _LT_AC_SYS_COMPILER |
2034 | @@ -4872,7 +4646,7 @@ |
2035 | # FIXME: insert proper C++ library support |
2036 | _LT_AC_TAGVAR(ld_shlibs, $1)=no |
2037 | ;; |
2038 | - aix4* | aix5*) |
2039 | + aix[[4-9]]*) |
2040 | if test "$host_cpu" = ia64; then |
2041 | # On IA64, the linker does run time linking by default, so we don't |
2042 | # have to do anything special. |
2043 | @@ -4885,7 +4659,7 @@ |
2044 | # Test if we are trying to use run time linking or normal |
2045 | # AIX style linking. If -brtl is somewhere in LDFLAGS, we |
2046 | # need to do runtime linking. |
2047 | - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) |
2048 | + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) |
2049 | for ld_flag in $LDFLAGS; do |
2050 | case $ld_flag in |
2051 | *-brtl*) |
2052 | @@ -4921,7 +4695,7 @@ |
2053 | strings "$collect2name" | grep resolve_lib_name >/dev/null |
2054 | then |
2055 | # We have reworked collect2 |
2056 | - _LT_AC_TAGVAR(hardcode_direct, $1)=yes |
2057 | + : |
2058 | else |
2059 | # We have old collect2 |
2060 | _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported |
2061 | @@ -5031,59 +4805,31 @@ |
2062 | fi |
2063 | ;; |
2064 | darwin* | rhapsody*) |
2065 | - case $host_os in |
2066 | - rhapsody* | darwin1.[[012]]) |
2067 | - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' |
2068 | - ;; |
2069 | - *) # Darwin 1.3 on |
2070 | - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then |
2071 | - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' |
2072 | - else |
2073 | - case ${MACOSX_DEPLOYMENT_TARGET} in |
2074 | - 10.[[012]]) |
2075 | - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' |
2076 | - ;; |
2077 | - 10.*) |
2078 | - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' |
2079 | - ;; |
2080 | - esac |
2081 | - fi |
2082 | - ;; |
2083 | - esac |
2084 | _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no |
2085 | _LT_AC_TAGVAR(hardcode_direct, $1)=no |
2086 | _LT_AC_TAGVAR(hardcode_automatic, $1)=yes |
2087 | _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
2088 | _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' |
2089 | _LT_AC_TAGVAR(link_all_deplibs, $1)=yes |
2090 | - |
2091 | - if test "$GXX" = yes ; then |
2092 | - lt_int_apple_cc_single_mod=no |
2093 | + _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" |
2094 | + if test "$GXX" = yes ; then |
2095 | output_verbose_link_cmd='echo' |
2096 | - if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then |
2097 | - lt_int_apple_cc_single_mod=yes |
2098 | + _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" |
2099 | + _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" |
2100 | + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" |
2101 | + _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" |
2102 | + if test "$lt_cv_apple_cc_single_mod" != "yes"; then |
2103 | + _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" |
2104 | + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" |
2105 | fi |
2106 | - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then |
2107 | - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' |
2108 | - else |
2109 | - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' |
2110 | - fi |
2111 | - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' |
2112 | - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds |
2113 | - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then |
2114 | - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
2115 | - else |
2116 | - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
2117 | - fi |
2118 | - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
2119 | else |
2120 | case $cc_basename in |
2121 | xlc*) |
2122 | output_verbose_link_cmd='echo' |
2123 | - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' |
2124 | + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' |
2125 | _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' |
2126 | # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds |
2127 | - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
2128 | + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
2129 | _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
2130 | ;; |
2131 | *) |
2132 | @@ -5166,9 +4912,7 @@ |
2133 | _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: |
2134 | |
2135 | case $host_cpu in |
2136 | - hppa*64*|ia64*) |
2137 | - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' |
2138 | - ;; |
2139 | + hppa*64*|ia64*) ;; |
2140 | *) |
2141 | _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' |
2142 | ;; |
2143 | @@ -5236,7 +4980,7 @@ |
2144 | ;; |
2145 | esac |
2146 | ;; |
2147 | - interix3*) |
2148 | + interix[[3-9]]*) |
2149 | _LT_AC_TAGVAR(hardcode_direct, $1)=no |
2150 | _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no |
2151 | _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' |
2152 | @@ -5328,7 +5072,7 @@ |
2153 | _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' |
2154 | _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' |
2155 | ;; |
2156 | - pgCC*) |
2157 | + pgCC* | pgcpp*) |
2158 | # Portland Group C++ compiler |
2159 | _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
2160 | _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' |
2161 | @@ -5356,6 +5100,29 @@ |
2162 | # dependencies. |
2163 | output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' |
2164 | ;; |
2165 | + *) |
2166 | + case `$CC -V 2>&1 | sed 5q` in |
2167 | + *Sun\ C*) |
2168 | + # Sun C++ 5.9 |
2169 | + _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' |
2170 | + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
2171 | + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' |
2172 | + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' |
2173 | + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' |
2174 | + |
2175 | + # Not sure whether something based on |
2176 | + # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 |
2177 | + # would be better. |
2178 | + output_verbose_link_cmd='echo' |
2179 | + |
2180 | + # Archives containing C++ object files must be created using |
2181 | + # "CC -xar", where "CC" is the Sun C++ compiler. This is |
2182 | + # necessary to make sure instantiated templates are included |
2183 | + # in the archive. |
2184 | + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' |
2185 | + ;; |
2186 | + esac |
2187 | + ;; |
2188 | esac |
2189 | ;; |
2190 | lynxos*) |
2191 | @@ -5394,16 +5161,20 @@ |
2192 | _LT_AC_TAGVAR(ld_shlibs, $1)=no |
2193 | ;; |
2194 | openbsd*) |
2195 | - _LT_AC_TAGVAR(hardcode_direct, $1)=yes |
2196 | - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no |
2197 | - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' |
2198 | - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' |
2199 | - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then |
2200 | - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' |
2201 | - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' |
2202 | - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' |
2203 | + if test -f /usr/libexec/ld.so; then |
2204 | + _LT_AC_TAGVAR(hardcode_direct, $1)=yes |
2205 | + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no |
2206 | + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' |
2207 | + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' |
2208 | + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then |
2209 | + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' |
2210 | + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' |
2211 | + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' |
2212 | + fi |
2213 | + output_verbose_link_cmd='echo' |
2214 | + else |
2215 | + _LT_AC_TAGVAR(ld_shlibs, $1)=no |
2216 | fi |
2217 | - output_verbose_link_cmd='echo' |
2218 | ;; |
2219 | osf3*) |
2220 | case $cc_basename in |
2221 | @@ -5565,15 +5336,10 @@ |
2222 | case $host_os in |
2223 | solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; |
2224 | *) |
2225 | - # The C++ compiler is used as linker so we must use $wl |
2226 | - # flag to pass the commands to the underlying system |
2227 | - # linker. We must also pass each convience library through |
2228 | - # to the system linker between allextract/defaultextract. |
2229 | - # The C++ compiler will combine linker options so we |
2230 | - # cannot just pass the convience library names through |
2231 | - # without $wl. |
2232 | + # The compiler driver will combine and reorder linker options, |
2233 | + # but understands `-z linker_flag'. |
2234 | # Supported since Solaris 2.6 (maybe 2.5.1?) |
2235 | - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' |
2236 | + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' |
2237 | ;; |
2238 | esac |
2239 | _LT_AC_TAGVAR(link_all_deplibs, $1)=yes |
2240 | @@ -5620,6 +5386,12 @@ |
2241 | fi |
2242 | |
2243 | _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' |
2244 | + case $host_os in |
2245 | + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; |
2246 | + *) |
2247 | + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' |
2248 | + ;; |
2249 | + esac |
2250 | fi |
2251 | ;; |
2252 | esac |
2253 | @@ -5735,7 +5507,8 @@ |
2254 | # compiler output when linking a shared library. |
2255 | # Parse the compiler output and extract the necessary |
2256 | # objects, libraries and library flags. |
2257 | -AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[ |
2258 | +AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP], |
2259 | +[AC_REQUIRE([LT_AC_PROG_SED])dnl |
2260 | dnl we can't use the lt_simple_compile_test_code here, |
2261 | dnl because it contains code intended for an executable, |
2262 | dnl not a library. It's possible we should let each |
2263 | @@ -5860,10 +5633,15 @@ |
2264 | |
2265 | $rm -f confest.$objext |
2266 | |
2267 | +_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= |
2268 | +if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then |
2269 | + _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` |
2270 | +fi |
2271 | + |
2272 | # PORTME: override above test on systems where it is broken |
2273 | ifelse([$1],[CXX], |
2274 | [case $host_os in |
2275 | -interix3*) |
2276 | +interix[[3-9]]*) |
2277 | # Interix 3.5 installs completely hosed .la files for C++, so rather than |
2278 | # hack all around it, let's just trust "g++" to DTRT. |
2279 | _LT_AC_TAGVAR(predep_objects,$1)= |
2280 | @@ -5871,19 +5649,51 @@ |
2281 | _LT_AC_TAGVAR(postdeps,$1)= |
2282 | ;; |
2283 | |
2284 | +linux*) |
2285 | + case `$CC -V 2>&1 | sed 5q` in |
2286 | + *Sun\ C*) |
2287 | + # Sun C++ 5.9 |
2288 | + # |
2289 | + # The more standards-conforming stlport4 library is |
2290 | + # incompatible with the Cstd library. Avoid specifying |
2291 | + # it if it's in CXXFLAGS. Ignore libCrun as |
2292 | + # -library=stlport4 depends on it. |
2293 | + case " $CXX $CXXFLAGS " in |
2294 | + *" -library=stlport4 "*) |
2295 | + solaris_use_stlport4=yes |
2296 | + ;; |
2297 | + esac |
2298 | + if test "$solaris_use_stlport4" != yes; then |
2299 | + _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' |
2300 | + fi |
2301 | + ;; |
2302 | + esac |
2303 | + ;; |
2304 | + |
2305 | solaris*) |
2306 | case $cc_basename in |
2307 | CC*) |
2308 | + # The more standards-conforming stlport4 library is |
2309 | + # incompatible with the Cstd library. Avoid specifying |
2310 | + # it if it's in CXXFLAGS. Ignore libCrun as |
2311 | + # -library=stlport4 depends on it. |
2312 | + case " $CXX $CXXFLAGS " in |
2313 | + *" -library=stlport4 "*) |
2314 | + solaris_use_stlport4=yes |
2315 | + ;; |
2316 | + esac |
2317 | + |
2318 | # Adding this requires a known-good setup of shared libraries for |
2319 | # Sun compiler versions before 5.6, else PIC objects from an old |
2320 | # archive will be linked into the output, leading to subtle bugs. |
2321 | - _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun' |
2322 | + if test "$solaris_use_stlport4" != yes; then |
2323 | + _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' |
2324 | + fi |
2325 | ;; |
2326 | esac |
2327 | ;; |
2328 | esac |
2329 | ]) |
2330 | - |
2331 | case " $_LT_AC_TAGVAR(postdeps, $1) " in |
2332 | *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; |
2333 | esac |
2334 | @@ -5926,10 +5736,17 @@ |
2335 | _LT_AC_TAGVAR(objext, $1)=$objext |
2336 | |
2337 | # Code to be used in simple compile tests |
2338 | -lt_simple_compile_test_code=" subroutine t\n return\n end\n" |
2339 | +lt_simple_compile_test_code="\ |
2340 | + subroutine t |
2341 | + return |
2342 | + end |
2343 | +" |
2344 | |
2345 | # Code to be used in simple link tests |
2346 | -lt_simple_link_test_code=" program t\n end\n" |
2347 | +lt_simple_link_test_code="\ |
2348 | + program t |
2349 | + end |
2350 | +" |
2351 | |
2352 | # ltmain only uses $CC for tagged configurations so make sure $CC is set. |
2353 | _LT_AC_SYS_COMPILER |
2354 | @@ -5961,7 +5778,7 @@ |
2355 | postinstall_cmds='$RANLIB $lib' |
2356 | fi |
2357 | ;; |
2358 | -aix4* | aix5*) |
2359 | +aix[[4-9]]*) |
2360 | if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then |
2361 | test "$enable_shared" = yes && enable_static=no |
2362 | fi |
2363 | @@ -6008,10 +5825,10 @@ |
2364 | _LT_AC_TAGVAR(objext, $1)=$objext |
2365 | |
2366 | # Code to be used in simple compile tests |
2367 | -lt_simple_compile_test_code="class foo {}\n" |
2368 | +lt_simple_compile_test_code="class foo {}" |
2369 | |
2370 | # Code to be used in simple link tests |
2371 | -lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n' |
2372 | +lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' |
2373 | |
2374 | # ltmain only uses $CC for tagged configurations so make sure $CC is set. |
2375 | _LT_AC_SYS_COMPILER |
2376 | @@ -6064,7 +5881,7 @@ |
2377 | _LT_AC_TAGVAR(objext, $1)=$objext |
2378 | |
2379 | # Code to be used in simple compile tests |
2380 | -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n' |
2381 | +lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' |
2382 | |
2383 | # Code to be used in simple link tests |
2384 | lt_simple_link_test_code="$lt_simple_compile_test_code" |
2385 | @@ -6138,6 +5955,7 @@ |
2386 | _LT_AC_TAGVAR(predeps, $1) \ |
2387 | _LT_AC_TAGVAR(postdeps, $1) \ |
2388 | _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ |
2389 | + _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \ |
2390 | _LT_AC_TAGVAR(archive_cmds, $1) \ |
2391 | _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ |
2392 | _LT_AC_TAGVAR(postinstall_cmds, $1) \ |
2393 | @@ -6153,6 +5971,7 @@ |
2394 | _LT_AC_TAGVAR(module_cmds, $1) \ |
2395 | _LT_AC_TAGVAR(module_expsym_cmds, $1) \ |
2396 | _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \ |
2397 | + _LT_AC_TAGVAR(fix_srcfile_path, $1) \ |
2398 | _LT_AC_TAGVAR(exclude_expsyms, $1) \ |
2399 | _LT_AC_TAGVAR(include_expsyms, $1); do |
2400 | |
2401 | @@ -6199,7 +6018,7 @@ |
2402 | # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) |
2403 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
2404 | # |
2405 | -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 |
2406 | +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 |
2407 | # Free Software Foundation, Inc. |
2408 | # |
2409 | # This file is part of GNU Libtool: |
2410 | @@ -6436,6 +6255,10 @@ |
2411 | # shared library. |
2412 | postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) |
2413 | |
2414 | +# The directories searched by this compiler when creating a shared |
2415 | +# library |
2416 | +compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1) |
2417 | + |
2418 | # The library search path used internally by the compiler when linking |
2419 | # a shared library. |
2420 | compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) |
2421 | @@ -6524,7 +6347,7 @@ |
2422 | sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec |
2423 | |
2424 | # Fix the shell variable \$srcfile for the compiler. |
2425 | -fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)" |
2426 | +fix_srcfile_path=$lt_fix_srcfile_path |
2427 | |
2428 | # Set to yes if exported symbols are required. |
2429 | always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) |
2430 | @@ -6607,6 +6430,7 @@ |
2431 | # --------------------------------- |
2432 | AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], |
2433 | [AC_REQUIRE([AC_CANONICAL_HOST]) |
2434 | +AC_REQUIRE([LT_AC_PROG_SED]) |
2435 | AC_REQUIRE([AC_PROG_NM]) |
2436 | AC_REQUIRE([AC_OBJEXT]) |
2437 | # Check for command to grab the raw symbol name followed by C symbol from nm. |
2438 | @@ -6784,7 +6608,7 @@ |
2439 | echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD |
2440 | cat conftest.$ac_ext >&5 |
2441 | fi |
2442 | - rm -f conftest* conftst* |
2443 | + rm -rf conftest* conftst* |
2444 | |
2445 | # Do not use the global_symbol_pipe unless it works. |
2446 | if test "$pipe_works" = yes; then |
2447 | @@ -6833,13 +6657,16 @@ |
2448 | # like `-m68040'. |
2449 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' |
2450 | ;; |
2451 | - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) |
2452 | + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) |
2453 | # PIC is the default for these OSes. |
2454 | ;; |
2455 | - mingw* | os2* | pw32*) |
2456 | + mingw* | cygwin* | os2* | pw32*) |
2457 | # This hack is so that the source file can tell whether it is being |
2458 | # built for inclusion in a dll (and should export symbols for example). |
2459 | - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' |
2460 | + # Although the cygwin gcc ignores -fPIC, still need this for old-style |
2461 | + # (--disable-auto-import) libraries |
2462 | + m4_if([$1], [GCJ], [], |
2463 | + [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) |
2464 | ;; |
2465 | darwin* | rhapsody*) |
2466 | # PIC is the default on this platform |
2467 | @@ -6850,7 +6677,7 @@ |
2468 | # DJGPP does not support shared libraries at all |
2469 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= |
2470 | ;; |
2471 | - interix3*) |
2472 | + interix[[3-9]]*) |
2473 | # Interix 3.x gcc -fpic/-fPIC options generate broken code. |
2474 | # Instead, we relocate shared libraries at runtime. |
2475 | ;; |
2476 | @@ -6876,7 +6703,7 @@ |
2477 | esac |
2478 | else |
2479 | case $host_os in |
2480 | - aix4* | aix5*) |
2481 | + aix[[4-9]]*) |
2482 | # All AIX code is PIC. |
2483 | if test "$host_cpu" = ia64; then |
2484 | # AIX 5 now supports IA64 processor |
2485 | @@ -6972,7 +6799,7 @@ |
2486 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
2487 | _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' |
2488 | ;; |
2489 | - pgCC*) |
2490 | + pgCC* | pgcpp*) |
2491 | # Portland Group C++ compiler. |
2492 | _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
2493 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' |
2494 | @@ -6986,6 +6813,14 @@ |
2495 | _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' |
2496 | ;; |
2497 | *) |
2498 | + case `$CC -V 2>&1 | sed 5q` in |
2499 | + *Sun\ C*) |
2500 | + # Sun C++ 5.9 |
2501 | + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
2502 | + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
2503 | + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' |
2504 | + ;; |
2505 | + esac |
2506 | ;; |
2507 | esac |
2508 | ;; |
2509 | @@ -7106,14 +6941,17 @@ |
2510 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' |
2511 | ;; |
2512 | |
2513 | - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) |
2514 | + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) |
2515 | # PIC is the default for these OSes. |
2516 | ;; |
2517 | |
2518 | - mingw* | pw32* | os2*) |
2519 | + mingw* | cygwin* | pw32* | os2*) |
2520 | # This hack is so that the source file can tell whether it is being |
2521 | # built for inclusion in a dll (and should export symbols for example). |
2522 | - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' |
2523 | + # Although the cygwin gcc ignores -fPIC, still need this for old-style |
2524 | + # (--disable-auto-import) libraries |
2525 | + m4_if([$1], [GCJ], [], |
2526 | + [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) |
2527 | ;; |
2528 | |
2529 | darwin* | rhapsody*) |
2530 | @@ -7122,7 +6960,7 @@ |
2531 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' |
2532 | ;; |
2533 | |
2534 | - interix3*) |
2535 | + interix[[3-9]]*) |
2536 | # Interix 3.x gcc -fpic/-fPIC options generate broken code. |
2537 | # Instead, we relocate shared libraries at runtime. |
2538 | ;; |
2539 | @@ -7180,10 +7018,11 @@ |
2540 | esac |
2541 | ;; |
2542 | |
2543 | - mingw* | pw32* | os2*) |
2544 | + mingw* | cygwin* | pw32* | os2*) |
2545 | # This hack is so that the source file can tell whether it is being |
2546 | # built for inclusion in a dll (and should export symbols for example). |
2547 | - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' |
2548 | + m4_if([$1], [GCJ], [], |
2549 | + [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) |
2550 | ;; |
2551 | |
2552 | hpux9* | hpux10* | hpux11*) |
2553 | @@ -7232,6 +7071,22 @@ |
2554 | # All Alpha code is PIC. |
2555 | _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' |
2556 | ;; |
2557 | + *) |
2558 | + case `$CC -V 2>&1 | sed 5q` in |
2559 | + *Sun\ C*) |
2560 | + # Sun C 5.9 |
2561 | + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
2562 | + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
2563 | + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
2564 | + ;; |
2565 | + *Sun\ F*) |
2566 | + # Sun Fortran 8.3 passes all unrecognized flags to the linker |
2567 | + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
2568 | + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
2569 | + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='' |
2570 | + ;; |
2571 | + esac |
2572 | + ;; |
2573 | esac |
2574 | ;; |
2575 | |
2576 | @@ -7241,6 +7096,10 @@ |
2577 | _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' |
2578 | ;; |
2579 | |
2580 | + rdos*) |
2581 | + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' |
2582 | + ;; |
2583 | + |
2584 | solaris*) |
2585 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
2586 | _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
2587 | @@ -7300,7 +7159,7 @@ |
2588 | # |
2589 | if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then |
2590 | AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], |
2591 | - _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), |
2592 | + _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1), |
2593 | [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], |
2594 | [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in |
2595 | "" | " "*) ;; |
2596 | @@ -7324,7 +7183,7 @@ |
2597 | # |
2598 | wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" |
2599 | AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], |
2600 | - _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), |
2601 | + _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1), |
2602 | $lt_tmp_static_flag, |
2603 | [], |
2604 | [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) |
2605 | @@ -7335,11 +7194,12 @@ |
2606 | # ------------------------------------ |
2607 | # See if the linker supports building shared libraries. |
2608 | AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], |
2609 | -[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) |
2610 | +[AC_REQUIRE([LT_AC_PROG_SED])dnl |
2611 | +AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) |
2612 | ifelse([$1],[CXX],[ |
2613 | _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
2614 | case $host_os in |
2615 | - aix4* | aix5*) |
2616 | + aix[[4-9]]*) |
2617 | # If we're using GNU nm, then we don't want the "-C" option. |
2618 | # -C means demangle to AIX nm, but means don't demangle with GNU nm |
2619 | if $NM -V 2>&1 | grep 'GNU' > /dev/null; then |
2620 | @@ -7352,7 +7212,7 @@ |
2621 | _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" |
2622 | ;; |
2623 | cygwin* | mingw*) |
2624 | - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' |
2625 | + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' |
2626 | ;; |
2627 | linux* | k*bsd*-gnu) |
2628 | _LT_AC_TAGVAR(link_all_deplibs, $1)=no |
2629 | @@ -7361,6 +7221,7 @@ |
2630 | _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
2631 | ;; |
2632 | esac |
2633 | + _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] |
2634 | ],[ |
2635 | runpath_var= |
2636 | _LT_AC_TAGVAR(allow_undefined_flag, $1)= |
2637 | @@ -7391,12 +7252,14 @@ |
2638 | # it will be wrapped by ` (' and `)$', so one must not match beginning or |
2639 | # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', |
2640 | # as well as any symbol that contains `d'. |
2641 | - _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_" |
2642 | + _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] |
2643 | # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out |
2644 | # platforms (ab)use it in PIC code, but their linkers get confused if |
2645 | # the symbol is explicitly referenced. Since portable code cannot |
2646 | # rely on this symbol name, it's probably fine to never include it in |
2647 | # preloaded symbol tables. |
2648 | + # Exclude shared library initialization/finalization symbols. |
2649 | +dnl Note also adjust exclude_expsyms for C++ above. |
2650 | extract_expsyms_cmds= |
2651 | # Just being paranoid about ensuring that cc_basename is set. |
2652 | _LT_CC_BASENAME([$compiler]) |
2653 | @@ -7446,7 +7309,7 @@ |
2654 | |
2655 | # See if GNU ld supports shared libraries. |
2656 | case $host_os in |
2657 | - aix3* | aix4* | aix5*) |
2658 | + aix[[3-9]]*) |
2659 | # On AIX/PPC, the GNU linker is very broken |
2660 | if test "$host_cpu" != ia64; then |
2661 | _LT_AC_TAGVAR(ld_shlibs, $1)=no |
2662 | @@ -7494,7 +7357,7 @@ |
2663 | _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported |
2664 | _LT_AC_TAGVAR(always_export_symbols, $1)=no |
2665 | _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
2666 | - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' |
2667 | + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' |
2668 | |
2669 | if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then |
2670 | _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
2671 | @@ -7512,7 +7375,7 @@ |
2672 | fi |
2673 | ;; |
2674 | |
2675 | - interix3*) |
2676 | + interix[[3-9]]*) |
2677 | _LT_AC_TAGVAR(hardcode_direct, $1)=no |
2678 | _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no |
2679 | _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' |
2680 | @@ -7527,7 +7390,7 @@ |
2681 | _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' |
2682 | ;; |
2683 | |
2684 | - linux* | k*bsd*-gnu) |
2685 | + gnu* | linux* | k*bsd*-gnu) |
2686 | if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then |
2687 | tmp_addflag= |
2688 | case $cc_basename,$host_cpu in |
2689 | @@ -7545,13 +7408,22 @@ |
2690 | ifc* | ifort*) # Intel Fortran compiler |
2691 | tmp_addflag=' -nofor_main' ;; |
2692 | esac |
2693 | - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
2694 | + case `$CC -V 2>&1 | sed 5q` in |
2695 | + *Sun\ C*) # Sun C 5.9 |
2696 | + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' |
2697 | + tmp_sharedflag='-G' ;; |
2698 | + *Sun\ F*) # Sun Fortran 8.3 |
2699 | + tmp_sharedflag='-G' ;; |
2700 | + *) |
2701 | + tmp_sharedflag='-shared' ;; |
2702 | + esac |
2703 | + _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
2704 | |
2705 | if test $supports_anon_versioning = yes; then |
2706 | _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ |
2707 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
2708 | $echo "local: *; };" >> $output_objdir/$libname.ver~ |
2709 | - $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' |
2710 | + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' |
2711 | fi |
2712 | _LT_AC_TAGVAR(link_all_deplibs, $1)=no |
2713 | else |
2714 | @@ -7592,7 +7464,7 @@ |
2715 | |
2716 | sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) |
2717 | case `$LD -v 2>&1` in |
2718 | - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) |
2719 | + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) |
2720 | _LT_AC_TAGVAR(ld_shlibs, $1)=no |
2721 | cat <<_LT_EOF 1>&2 |
2722 | |
2723 | @@ -7657,7 +7529,7 @@ |
2724 | fi |
2725 | ;; |
2726 | |
2727 | - aix4* | aix5*) |
2728 | + aix[[4-9]]*) |
2729 | if test "$host_cpu" = ia64; then |
2730 | # On IA64, the linker does run time linking by default, so we don't |
2731 | # have to do anything special. |
2732 | @@ -7677,7 +7549,7 @@ |
2733 | # Test if we are trying to use run time linking or normal |
2734 | # AIX style linking. If -brtl is somewhere in LDFLAGS, we |
2735 | # need to do runtime linking. |
2736 | - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) |
2737 | + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) |
2738 | for ld_flag in $LDFLAGS; do |
2739 | if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then |
2740 | aix_use_runtimelinking=yes |
2741 | @@ -7711,7 +7583,7 @@ |
2742 | strings "$collect2name" | grep resolve_lib_name >/dev/null |
2743 | then |
2744 | # We have reworked collect2 |
2745 | - _LT_AC_TAGVAR(hardcode_direct, $1)=yes |
2746 | + : |
2747 | else |
2748 | # We have old collect2 |
2749 | _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported |
2750 | @@ -7804,7 +7676,7 @@ |
2751 | # The linker will automatically build a .lib file if we build a DLL. |
2752 | _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' |
2753 | # FIXME: Should let the user specify the lib program. |
2754 | - _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs' |
2755 | + _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' |
2756 | _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' |
2757 | _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
2758 | ;; |
2759 | @@ -7837,19 +7709,18 @@ |
2760 | _LT_AC_TAGVAR(link_all_deplibs, $1)=yes |
2761 | if test "$GCC" = yes ; then |
2762 | output_verbose_link_cmd='echo' |
2763 | - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' |
2764 | - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' |
2765 | - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds |
2766 | - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
2767 | - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
2768 | + _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" |
2769 | + _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" |
2770 | + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" |
2771 | + _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" |
2772 | else |
2773 | case $cc_basename in |
2774 | xlc*) |
2775 | output_verbose_link_cmd='echo' |
2776 | - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' |
2777 | + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' |
2778 | _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' |
2779 | # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds |
2780 | - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
2781 | + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
2782 | _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
2783 | ;; |
2784 | *) |
2785 | @@ -8011,24 +7882,28 @@ |
2786 | ;; |
2787 | |
2788 | openbsd*) |
2789 | - _LT_AC_TAGVAR(hardcode_direct, $1)=yes |
2790 | - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no |
2791 | - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then |
2792 | - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
2793 | - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' |
2794 | - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' |
2795 | - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' |
2796 | + if test -f /usr/libexec/ld.so; then |
2797 | + _LT_AC_TAGVAR(hardcode_direct, $1)=yes |
2798 | + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no |
2799 | + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then |
2800 | + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
2801 | + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' |
2802 | + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' |
2803 | + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' |
2804 | + else |
2805 | + case $host_os in |
2806 | + openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) |
2807 | + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
2808 | + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' |
2809 | + ;; |
2810 | + *) |
2811 | + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
2812 | + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' |
2813 | + ;; |
2814 | + esac |
2815 | + fi |
2816 | else |
2817 | - case $host_os in |
2818 | - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) |
2819 | - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
2820 | - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' |
2821 | - ;; |
2822 | - *) |
2823 | - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
2824 | - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' |
2825 | - ;; |
2826 | - esac |
2827 | + _LT_AC_TAGVAR(ld_shlibs, $1)=no |
2828 | fi |
2829 | ;; |
2830 | |
2831 | @@ -8087,17 +7962,16 @@ |
2832 | case $host_os in |
2833 | solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; |
2834 | *) |
2835 | - # The compiler driver will combine linker options so we |
2836 | - # cannot just pass the convience library names through |
2837 | - # without $wl, iff we do not link with $LD. |
2838 | - # Luckily, gcc supports the same syntax we need for Sun Studio. |
2839 | + # The compiler driver will combine and reorder linker options, |
2840 | + # but understands `-z linker_flag'. GCC discards it without `$wl', |
2841 | + # but is careful enough not to reorder. |
2842 | # Supported since Solaris 2.6 (maybe 2.5.1?) |
2843 | - case $wlarc in |
2844 | - '') |
2845 | - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; |
2846 | - *) |
2847 | - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; |
2848 | - esac ;; |
2849 | + if test "$GCC" = yes; then |
2850 | + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' |
2851 | + else |
2852 | + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' |
2853 | + fi |
2854 | + ;; |
2855 | esac |
2856 | _LT_AC_TAGVAR(link_all_deplibs, $1)=yes |
2857 | ;; |
2858 | @@ -8154,7 +8028,7 @@ |
2859 | fi |
2860 | ;; |
2861 | |
2862 | - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*) |
2863 | + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) |
2864 | _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' |
2865 | _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no |
2866 | _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no |
2867 | @@ -8229,7 +8103,7 @@ |
2868 | # to ld, don't add -lc before -lgcc. |
2869 | AC_MSG_CHECKING([whether -lc should be explicitly linked in]) |
2870 | $rm conftest* |
2871 | - printf "$lt_simple_compile_test_code" > conftest.$ac_ext |
2872 | + echo "$lt_simple_compile_test_code" > conftest.$ac_ext |
2873 | |
2874 | if AC_TRY_EVAL(ac_compile) 2>conftest.err; then |
2875 | soname=conftest |
2876 | @@ -8332,6 +8206,30 @@ |
2877 | [AC_CHECK_TOOL(RC, windres, no) |
2878 | ]) |
2879 | |
2880 | + |
2881 | +# Cheap backport of AS_EXECUTABLE_P and required macros |
2882 | +# from Autoconf 2.59; we should not use $as_executable_p directly. |
2883 | + |
2884 | +# _AS_TEST_PREPARE |
2885 | +# ---------------- |
2886 | +m4_ifndef([_AS_TEST_PREPARE], |
2887 | +[m4_defun([_AS_TEST_PREPARE], |
2888 | +[if test -x / >/dev/null 2>&1; then |
2889 | + as_executable_p='test -x' |
2890 | +else |
2891 | + as_executable_p='test -f' |
2892 | +fi |
2893 | +])])# _AS_TEST_PREPARE |
2894 | + |
2895 | +# AS_EXECUTABLE_P |
2896 | +# --------------- |
2897 | +# Check whether a file is executable. |
2898 | +m4_ifndef([AS_EXECUTABLE_P], |
2899 | +[m4_defun([AS_EXECUTABLE_P], |
2900 | +[AS_REQUIRE([_AS_TEST_PREPARE])dnl |
2901 | +$as_executable_p $1[]dnl |
2902 | +])])# AS_EXECUTABLE_P |
2903 | + |
2904 | # NOTE: This macro has been submitted for inclusion into # |
2905 | # GNU Autoconf as AC_PROG_SED. When it is available in # |
2906 | # a released version of Autoconf we should remove this # |
2907 | @@ -8352,12 +8250,13 @@ |
2908 | test -z "$as_dir" && as_dir=. |
2909 | for lt_ac_prog in sed gsed; do |
2910 | for ac_exec_ext in '' $ac_executable_extensions; do |
2911 | - if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then |
2912 | + if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then |
2913 | lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" |
2914 | fi |
2915 | done |
2916 | done |
2917 | done |
2918 | +IFS=$as_save_IFS |
2919 | lt_ac_max=0 |
2920 | lt_ac_count=0 |
2921 | # Add /usr/xpg4/bin/sed as it is typically found on Solaris |
2922 | @@ -8390,402 +8289,10 @@ |
2923 | done |
2924 | ]) |
2925 | SED=$lt_cv_path_SED |
2926 | +AC_SUBST([SED]) |
2927 | AC_MSG_RESULT([$SED]) |
2928 | ]) |
2929 | |
2930 | -# lock.m4 serial 6 (gettext-0.16) |
2931 | -dnl Copyright (C) 2005-2006 Free Software Foundation, Inc. |
2932 | -dnl This file is free software; the Free Software Foundation |
2933 | -dnl gives unlimited permission to copy and/or distribute it, |
2934 | -dnl with or without modifications, as long as this notice is preserved. |
2935 | - |
2936 | -dnl From Bruno Haible. |
2937 | - |
2938 | -dnl Tests for a multithreading library to be used. |
2939 | -dnl Defines at most one of the macros USE_POSIX_THREADS, USE_SOLARIS_THREADS, |
2940 | -dnl USE_PTH_THREADS, USE_WIN32_THREADS |
2941 | -dnl Sets the variables LIBTHREAD and LTLIBTHREAD to the linker options for use |
2942 | -dnl in a Makefile (LIBTHREAD for use without libtool, LTLIBTHREAD for use with |
2943 | -dnl libtool). |
2944 | -dnl Sets the variables LIBMULTITHREAD and LTLIBMULTITHREAD similarly, for |
2945 | -dnl programs that really need multithread functionality. The difference |
2946 | -dnl between LIBTHREAD and LIBMULTITHREAD is that on platforms supporting weak |
2947 | -dnl symbols, typically LIBTHREAD="" whereas LIBMULTITHREAD="-lpthread". |
2948 | -dnl Adds to CPPFLAGS the flag -D_REENTRANT or -D_THREAD_SAFE if needed for |
2949 | -dnl multithread-safe programs. |
2950 | - |
2951 | -AC_DEFUN([gl_LOCK_EARLY], |
2952 | -[ |
2953 | - AC_REQUIRE([gl_LOCK_EARLY_BODY]) |
2954 | -]) |
2955 | - |
2956 | -dnl The guts of gl_LOCK_EARLY. Needs to be expanded only once. |
2957 | - |
2958 | -AC_DEFUN([gl_LOCK_EARLY_BODY], |
2959 | -[ |
2960 | - dnl Ordering constraints: This macro modifies CPPFLAGS in a way that |
2961 | - dnl influences the result of the autoconf tests that test for *_unlocked |
2962 | - dnl declarations, on AIX 5 at least. Therefore it must come early. |
2963 | - AC_BEFORE([$0], [gl_FUNC_GLIBC_UNLOCKED_IO])dnl |
2964 | - AC_BEFORE([$0], [gl_ARGP])dnl |
2965 | - |
2966 | - AC_REQUIRE([AC_CANONICAL_HOST]) |
2967 | - AC_REQUIRE([AC_GNU_SOURCE]) dnl needed for pthread_rwlock_t on glibc systems |
2968 | - dnl Check for multithreading. |
2969 | - AC_ARG_ENABLE(threads, |
2970 | -AC_HELP_STRING([--enable-threads={posix|solaris|pth|win32}], [specify multithreading API]) |
2971 | -AC_HELP_STRING([--disable-threads], [build without multithread safety]), |
2972 | - [gl_use_threads=$enableval], |
2973 | - [case "$host_os" in |
2974 | - dnl Disable multithreading by default on OSF/1, because it interferes |
2975 | - dnl with fork()/exec(): When msgexec is linked with -lpthread, its child |
2976 | - dnl process gets an endless segmentation fault inside execvp(). |
2977 | - osf*) gl_use_threads=no ;; |
2978 | - *) gl_use_threads=yes ;; |
2979 | - esac |
2980 | - ]) |
2981 | - if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then |
2982 | - # For using <pthread.h>: |
2983 | - case "$host_os" in |
2984 | - osf*) |
2985 | - # On OSF/1, the compiler needs the flag -D_REENTRANT so that it |
2986 | - # groks <pthread.h>. cc also understands the flag -pthread, but |
2987 | - # we don't use it because 1. gcc-2.95 doesn't understand -pthread, |
2988 | - # 2. putting a flag into CPPFLAGS that has an effect on the linker |
2989 | - # causes the AC_TRY_LINK test below to succeed unexpectedly, |
2990 | - # leading to wrong values of LIBTHREAD and LTLIBTHREAD. |
2991 | - CPPFLAGS="$CPPFLAGS -D_REENTRANT" |
2992 | - ;; |
2993 | - esac |
2994 | - # Some systems optimize for single-threaded programs by default, and |
2995 | - # need special flags to disable these optimizations. For example, the |
2996 | - # definition of 'errno' in <errno.h>. |
2997 | - case "$host_os" in |
2998 | - aix* | freebsd*) CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" ;; |
2999 | - solaris*) CPPFLAGS="$CPPFLAGS -D_REENTRANT" ;; |
3000 | - esac |
3001 | - fi |
3002 | -]) |
3003 | - |
3004 | -dnl The guts of gl_LOCK. Needs to be expanded only once. |
3005 | - |
3006 | -AC_DEFUN([gl_LOCK_BODY], |
3007 | -[ |
3008 | - AC_REQUIRE([gl_LOCK_EARLY_BODY]) |
3009 | - gl_threads_api=none |
3010 | - LIBTHREAD= |
3011 | - LTLIBTHREAD= |
3012 | - LIBMULTITHREAD= |
3013 | - LTLIBMULTITHREAD= |
3014 | - if test "$gl_use_threads" != no; then |
3015 | - dnl Check whether the compiler and linker support weak declarations. |
3016 | - AC_MSG_CHECKING([whether imported symbols can be declared weak]) |
3017 | - gl_have_weak=no |
3018 | - AC_TRY_LINK([extern void xyzzy (); |
3019 | -#pragma weak xyzzy], [xyzzy();], [gl_have_weak=yes]) |
3020 | - AC_MSG_RESULT([$gl_have_weak]) |
3021 | - if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then |
3022 | - # On OSF/1, the compiler needs the flag -pthread or -D_REENTRANT so that |
3023 | - # it groks <pthread.h>. It's added above, in gl_LOCK_EARLY_BODY. |
3024 | - AC_CHECK_HEADER(pthread.h, gl_have_pthread_h=yes, gl_have_pthread_h=no) |
3025 | - if test "$gl_have_pthread_h" = yes; then |
3026 | - # Other possible tests: |
3027 | - # -lpthreads (FSU threads, PCthreads) |
3028 | - # -lgthreads |
3029 | - gl_have_pthread= |
3030 | - # Test whether both pthread_mutex_lock and pthread_mutexattr_init exist |
3031 | - # in libc. IRIX 6.5 has the first one in both libc and libpthread, but |
3032 | - # the second one only in libpthread, and lock.c needs it. |
3033 | - AC_TRY_LINK([#include <pthread.h>], |
3034 | - [pthread_mutex_lock((pthread_mutex_t*)0); |
3035 | - pthread_mutexattr_init((pthread_mutexattr_t*)0);], |
3036 | - [gl_have_pthread=yes]) |
3037 | - # Test for libpthread by looking for pthread_kill. (Not pthread_self, |
3038 | - # since it is defined as a macro on OSF/1.) |
3039 | - if test -n "$gl_have_pthread"; then |
3040 | - # The program links fine without libpthread. But it may actually |
3041 | - # need to link with libpthread in order to create multiple threads. |
3042 | - AC_CHECK_LIB(pthread, pthread_kill, |
3043 | - [LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread |
3044 | - # On Solaris and HP-UX, most pthread functions exist also in libc. |
3045 | - # Therefore pthread_in_use() needs to actually try to create a |
3046 | - # thread: pthread_create from libc will fail, whereas |
3047 | - # pthread_create will actually create a thread. |
3048 | - case "$host_os" in |
3049 | - solaris* | hpux*) |
3050 | - AC_DEFINE([PTHREAD_IN_USE_DETECTION_HARD], 1, |
3051 | - [Define if the pthread_in_use() detection is hard.]) |
3052 | - esac |
3053 | - ]) |
3054 | - else |
3055 | - # Some library is needed. Try libpthread and libc_r. |
3056 | - AC_CHECK_LIB(pthread, pthread_kill, |
3057 | - [gl_have_pthread=yes |
3058 | - LIBTHREAD=-lpthread LTLIBTHREAD=-lpthread |
3059 | - LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread]) |
3060 | - if test -z "$gl_have_pthread"; then |
3061 | - # For FreeBSD 4. |
3062 | - AC_CHECK_LIB(c_r, pthread_kill, |
3063 | - [gl_have_pthread=yes |
3064 | - LIBTHREAD=-lc_r LTLIBTHREAD=-lc_r |
3065 | - LIBMULTITHREAD=-lc_r LTLIBMULTITHREAD=-lc_r]) |
3066 | - fi |
3067 | - fi |
3068 | - if test -n "$gl_have_pthread"; then |
3069 | - gl_threads_api=posix |
3070 | - AC_DEFINE([USE_POSIX_THREADS], 1, |
3071 | - [Define if the POSIX multithreading library can be used.]) |
3072 | - if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then |
3073 | - if test $gl_have_weak = yes; then |
3074 | - AC_DEFINE([USE_POSIX_THREADS_WEAK], 1, |
3075 | - [Define if references to the POSIX multithreading library should be made weak.]) |
3076 | - LIBTHREAD= |
3077 | - LTLIBTHREAD= |
3078 | - fi |
3079 | - fi |
3080 | - # OSF/1 4.0 and MacOS X 10.1 lack the pthread_rwlock_t type and the |
3081 | - # pthread_rwlock_* functions. |
3082 | - AC_CHECK_TYPE([pthread_rwlock_t], |
3083 | - [AC_DEFINE([HAVE_PTHREAD_RWLOCK], 1, |
3084 | - [Define if the POSIX multithreading library has read/write locks.])], |
3085 | - [], |
3086 | - [#include <pthread.h>]) |
3087 | - # glibc defines PTHREAD_MUTEX_RECURSIVE as enum, not as a macro. |
3088 | - AC_TRY_COMPILE([#include <pthread.h>], |
3089 | - [#if __FreeBSD__ == 4 |
3090 | -error "No, in FreeBSD 4.0 recursive mutexes actually don't work." |
3091 | -#else |
3092 | -int x = (int)PTHREAD_MUTEX_RECURSIVE; |
3093 | -return !x; |
3094 | -#endif], |
3095 | - [AC_DEFINE([HAVE_PTHREAD_MUTEX_RECURSIVE], 1, |
3096 | - [Define if the <pthread.h> defines PTHREAD_MUTEX_RECURSIVE.])]) |
3097 | - fi |
3098 | - fi |
3099 | - fi |
3100 | - if test -z "$gl_have_pthread"; then |
3101 | - if test "$gl_use_threads" = yes || test "$gl_use_threads" = solaris; then |
3102 | - gl_have_solaristhread= |
3103 | - gl_save_LIBS="$LIBS" |
3104 | - LIBS="$LIBS -lthread" |
3105 | - AC_TRY_LINK([#include <thread.h> |
3106 | -#include <synch.h>], |
3107 | - [thr_self();], |
3108 | - [gl_have_solaristhread=yes]) |
3109 | - LIBS="$gl_save_LIBS" |
3110 | - if test -n "$gl_have_solaristhread"; then |
3111 | - gl_threads_api=solaris |
3112 | - LIBTHREAD=-lthread |
3113 | - LTLIBTHREAD=-lthread |
3114 | - LIBMULTITHREAD="$LIBTHREAD" |
3115 | - LTLIBMULTITHREAD="$LTLIBTHREAD" |
3116 | - AC_DEFINE([USE_SOLARIS_THREADS], 1, |
3117 | - [Define if the old Solaris multithreading library can be used.]) |
3118 | - if test $gl_have_weak = yes; then |
3119 | - AC_DEFINE([USE_SOLARIS_THREADS_WEAK], 1, |
3120 | - [Define if references to the old Solaris multithreading library should be made weak.]) |
3121 | - LIBTHREAD= |
3122 | - LTLIBTHREAD= |
3123 | - fi |
3124 | - fi |
3125 | - fi |
3126 | - fi |
3127 | - if test "$gl_use_threads" = pth; then |
3128 | - gl_save_CPPFLAGS="$CPPFLAGS" |
3129 | - AC_LIB_LINKFLAGS(pth) |
3130 | - gl_have_pth= |
3131 | - gl_save_LIBS="$LIBS" |
3132 | - LIBS="$LIBS -lpth" |
3133 | - AC_TRY_LINK([#include <pth.h>], [pth_self();], gl_have_pth=yes) |
3134 | - LIBS="$gl_save_LIBS" |
3135 | - if test -n "$gl_have_pth"; then |
3136 | - gl_threads_api=pth |
3137 | - LIBTHREAD="$LIBPTH" |
3138 | - LTLIBTHREAD="$LTLIBPTH" |
3139 | - LIBMULTITHREAD="$LIBTHREAD" |
3140 | - LTLIBMULTITHREAD="$LTLIBTHREAD" |
3141 | - AC_DEFINE([USE_PTH_THREADS], 1, |
3142 | - [Define if the GNU Pth multithreading library can be used.]) |
3143 | - if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then |
3144 | - if test $gl_have_weak = yes; then |
3145 | - AC_DEFINE([USE_PTH_THREADS_WEAK], 1, |
3146 | - [Define if references to the GNU Pth multithreading library should be made weak.]) |
3147 | - LIBTHREAD= |
3148 | - LTLIBTHREAD= |
3149 | - fi |
3150 | - fi |
3151 | - else |
3152 | - CPPFLAGS="$gl_save_CPPFLAGS" |
3153 | - fi |
3154 | - fi |
3155 | - if test -z "$gl_have_pthread"; then |
3156 | - if test "$gl_use_threads" = yes || test "$gl_use_threads" = win32; then |
3157 | - if { case "$host_os" in |
3158 | - mingw*) true;; |
3159 | - *) false;; |
3160 | - esac |
3161 | - }; then |
3162 | - gl_threads_api=win32 |
3163 | - AC_DEFINE([USE_WIN32_THREADS], 1, |
3164 | - [Define if the Win32 multithreading API can be used.]) |
3165 | - fi |
3166 | - fi |
3167 | - fi |
3168 | - fi |
3169 | - AC_MSG_CHECKING([for multithread API to use]) |
3170 | - AC_MSG_RESULT([$gl_threads_api]) |
3171 | - AC_SUBST(LIBTHREAD) |
3172 | - AC_SUBST(LTLIBTHREAD) |
3173 | - AC_SUBST(LIBMULTITHREAD) |
3174 | - AC_SUBST(LTLIBMULTITHREAD) |
3175 | -]) |
3176 | - |
3177 | -AC_DEFUN([gl_LOCK], |
3178 | -[ |
3179 | - AC_REQUIRE([gl_LOCK_EARLY]) |
3180 | - AC_REQUIRE([gl_LOCK_BODY]) |
3181 | - gl_PREREQ_LOCK |
3182 | -]) |
3183 | - |
3184 | -# Prerequisites of lib/lock.c. |
3185 | -AC_DEFUN([gl_PREREQ_LOCK], [ |
3186 | - AC_REQUIRE([AC_C_INLINE]) |
3187 | -]) |
3188 | - |
3189 | -dnl Survey of platforms: |
3190 | -dnl |
3191 | -dnl Platform Available Compiler Supports test-lock |
3192 | -dnl flavours option weak result |
3193 | -dnl --------------- --------- --------- -------- --------- |
3194 | -dnl Linux 2.4/glibc posix -lpthread Y OK |
3195 | -dnl |
3196 | -dnl GNU Hurd/glibc posix |
3197 | -dnl |
3198 | -dnl FreeBSD 5.3 posix -lc_r Y |
3199 | -dnl posix -lkse ? Y |
3200 | -dnl posix -lpthread ? Y |
3201 | -dnl posix -lthr Y |
3202 | -dnl |
3203 | -dnl FreeBSD 5.2 posix -lc_r Y |
3204 | -dnl posix -lkse Y |
3205 | -dnl posix -lthr Y |
3206 | -dnl |
3207 | -dnl FreeBSD 4.0,4.10 posix -lc_r Y OK |
3208 | -dnl |
3209 | -dnl NetBSD 1.6 -- |
3210 | -dnl |
3211 | -dnl OpenBSD 3.4 posix -lpthread Y OK |
3212 | -dnl |
3213 | -dnl MacOS X 10.[123] posix -lpthread Y OK |
3214 | -dnl |
3215 | -dnl Solaris 7,8,9 posix -lpthread Y Sol 7,8: 0.0; Sol 9: OK |
3216 | -dnl solaris -lthread Y Sol 7,8: 0.0; Sol 9: OK |
3217 | -dnl |
3218 | -dnl HP-UX 11 posix -lpthread N (cc) OK |
3219 | -dnl Y (gcc) |
3220 | -dnl |
3221 | -dnl IRIX 6.5 posix -lpthread Y 0.5 |
3222 | -dnl |
3223 | -dnl AIX 4.3,5.1 posix -lpthread N AIX 4: 0.5; AIX 5: OK |
3224 | -dnl |
3225 | -dnl OSF/1 4.0,5.1 posix -pthread (cc) N OK |
3226 | -dnl -lpthread (gcc) Y |
3227 | -dnl |
3228 | -dnl Cygwin posix -lpthread Y OK |
3229 | -dnl |
3230 | -dnl Any of the above pth -lpth 0.0 |
3231 | -dnl |
3232 | -dnl Mingw win32 N OK |
3233 | -dnl |
3234 | -dnl BeOS 5 -- |
3235 | -dnl |
3236 | -dnl The test-lock result shows what happens if in test-lock.c EXPLICIT_YIELD is |
3237 | -dnl turned off: |
3238 | -dnl OK if all three tests terminate OK, |
3239 | -dnl 0.5 if the first test terminates OK but the second one loops endlessly, |
3240 | -dnl 0.0 if the first test already loops endlessly. |
3241 | - |
3242 | -# longdouble.m4 serial 2 (gettext-0.15) |
3243 | -dnl Copyright (C) 2002-2003, 2006 Free Software Foundation, Inc. |
3244 | -dnl This file is free software; the Free Software Foundation |
3245 | -dnl gives unlimited permission to copy and/or distribute it, |
3246 | -dnl with or without modifications, as long as this notice is preserved. |
3247 | - |
3248 | -dnl From Bruno Haible. |
3249 | -dnl Test whether the compiler supports the 'long double' type. |
3250 | -dnl Prerequisite: AC_PROG_CC |
3251 | - |
3252 | -dnl This file is only needed in autoconf <= 2.59. Newer versions of autoconf |
3253 | -dnl have a macro AC_TYPE_LONG_DOUBLE with identical semantics. |
3254 | - |
3255 | -AC_DEFUN([gt_TYPE_LONGDOUBLE], |
3256 | -[ |
3257 | - AC_CACHE_CHECK([for long double], gt_cv_c_long_double, |
3258 | - [if test "$GCC" = yes; then |
3259 | - gt_cv_c_long_double=yes |
3260 | - else |
3261 | - AC_TRY_COMPILE([ |
3262 | - /* The Stardent Vistra knows sizeof(long double), but does not support it. */ |
3263 | - long double foo = 0.0; |
3264 | - /* On Ultrix 4.3 cc, long double is 4 and double is 8. */ |
3265 | - int array [2*(sizeof(long double) >= sizeof(double)) - 1]; |
3266 | - ], , |
3267 | - gt_cv_c_long_double=yes, gt_cv_c_long_double=no) |
3268 | - fi]) |
3269 | - if test $gt_cv_c_long_double = yes; then |
3270 | - AC_DEFINE(HAVE_LONG_DOUBLE, 1, [Define if you have the 'long double' type.]) |
3271 | - fi |
3272 | -]) |
3273 | - |
3274 | -# longlong.m4 serial 8 |
3275 | -dnl Copyright (C) 1999-2006 Free Software Foundation, Inc. |
3276 | -dnl This file is free software; the Free Software Foundation |
3277 | -dnl gives unlimited permission to copy and/or distribute it, |
3278 | -dnl with or without modifications, as long as this notice is preserved. |
3279 | - |
3280 | -dnl From Paul Eggert. |
3281 | - |
3282 | -# Define HAVE_LONG_LONG_INT if 'long long int' works. |
3283 | -# This fixes a bug in Autoconf 2.60, but can be removed once we |
3284 | -# assume 2.61 everywhere. |
3285 | - |
3286 | -# Note: If the type 'long long int' exists but is only 32 bits large |
3287 | -# (as on some very old compilers), AC_TYPE_LONG_LONG_INT will not be |
3288 | -# defined. In this case you can treat 'long long int' like 'long int'. |
3289 | - |
3290 | -AC_DEFUN([AC_TYPE_LONG_LONG_INT], |
3291 | -[ |
3292 | - AC_CACHE_CHECK([for long long int], [ac_cv_type_long_long_int], |
3293 | - [AC_LINK_IFELSE( |
3294 | - [AC_LANG_PROGRAM( |
3295 | - [[long long int ll = 9223372036854775807ll; |
3296 | - long long int nll = -9223372036854775807LL; |
3297 | - typedef int a[((-9223372036854775807LL < 0 |
3298 | - && 0 < 9223372036854775807ll) |
3299 | - ? 1 : -1)]; |
3300 | - int i = 63;]], |
3301 | - [[long long int llmax = 9223372036854775807ll; |
3302 | - return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i) |
3303 | - | (llmax / ll) | (llmax % ll));]])], |
3304 | - [ac_cv_type_long_long_int=yes], |
3305 | - [ac_cv_type_long_long_int=no])]) |
3306 | - if test $ac_cv_type_long_long_int = yes; then |
3307 | - AC_DEFINE([HAVE_LONG_LONG_INT], 1, |
3308 | - [Define to 1 if the system has the type `long long int'.]) |
3309 | - fi |
3310 | -]) |
3311 | - |
3312 | -# This macro is obsolescent and should go away soon. |
3313 | -AC_DEFUN([gl_AC_TYPE_LONG_LONG], |
3314 | -[ |
3315 | - AC_REQUIRE([AC_TYPE_LONG_LONG_INT]) |
3316 | - ac_cv_type_long_long=$ac_cv_type_long_long_int |
3317 | - if test $ac_cv_type_long_long = yes; then |
3318 | - AC_DEFINE(HAVE_LONG_LONG, 1, |
3319 | - [Define if you have the 'long long' type.]) |
3320 | - fi |
3321 | -]) |
3322 | - |
3323 | # nls.m4 serial 3 (gettext-0.15) |
3324 | dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. |
3325 | dnl This file is free software; the Free Software Foundation |
3326 | @@ -8966,7 +8473,7 @@ |
3327 | |
3328 | _PKG_TEXT |
3329 | |
3330 | -To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])], |
3331 | +To get pkg-config, see <http://pkg-config.freedesktop.org/>.])], |
3332 | [$4]) |
3333 | else |
3334 | $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS |
3335 | @@ -8976,8 +8483,8 @@ |
3336 | fi[]dnl |
3337 | ])# PKG_CHECK_MODULES |
3338 | |
3339 | -# po.m4 serial 13 (gettext-0.15) |
3340 | -dnl Copyright (C) 1995-2006 Free Software Foundation, Inc. |
3341 | +# po.m4 serial 15 (gettext-0.17) |
3342 | +dnl Copyright (C) 1995-2007 Free Software Foundation, Inc. |
3343 | dnl This file is free software; the Free Software Foundation |
3344 | dnl gives unlimited permission to copy and/or distribute it, |
3345 | dnl with or without modifications, as long as this notice is preserved. |
3346 | @@ -9005,6 +8512,10 @@ |
3347 | AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake |
3348 | AC_REQUIRE([AM_NLS])dnl |
3349 | |
3350 | + dnl Release version of the gettext macros. This is used to ensure that |
3351 | + dnl the gettext macros and po/Makefile.in.in are in sync. |
3352 | + AC_SUBST([GETTEXT_MACRO_VERSION], [0.17]) |
3353 | + |
3354 | dnl Perform the following tests also if --disable-nls has been given, |
3355 | dnl because they are needed for "make dist" to work. |
3356 | |
3357 | @@ -9062,6 +8573,10 @@ |
3358 | test -n "$localedir" || localedir='${datadir}/locale' |
3359 | AC_SUBST([localedir]) |
3360 | |
3361 | + dnl Support for AM_XGETTEXT_OPTION. |
3362 | + test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS= |
3363 | + AC_SUBST([XGETTEXT_EXTRA_OPTIONS]) |
3364 | + |
3365 | AC_CONFIG_COMMANDS([po-directories], [[ |
3366 | for ac_file in $CONFIG_FILES; do |
3367 | # Support "outfile[:infile[:infile...]]" |
3368 | @@ -9405,49 +8920,17 @@ |
3369 | mv "$ac_file.tmp" "$ac_file" |
3370 | ]) |
3371 | |
3372 | -# printf-posix.m4 serial 2 (gettext-0.13.1) |
3373 | -dnl Copyright (C) 2003 Free Software Foundation, Inc. |
3374 | -dnl This file is free software; the Free Software Foundation |
3375 | -dnl gives unlimited permission to copy and/or distribute it, |
3376 | -dnl with or without modifications, as long as this notice is preserved. |
3377 | - |
3378 | -dnl From Bruno Haible. |
3379 | -dnl Test whether the printf() function supports POSIX/XSI format strings with |
3380 | -dnl positions. |
3381 | - |
3382 | -AC_DEFUN([gt_PRINTF_POSIX], |
3383 | -[ |
3384 | - AC_REQUIRE([AC_PROG_CC]) |
3385 | - AC_CACHE_CHECK([whether printf() supports POSIX/XSI format strings], |
3386 | - gt_cv_func_printf_posix, |
3387 | - [ |
3388 | - AC_TRY_RUN([ |
3389 | -#include <stdio.h> |
3390 | -#include <string.h> |
3391 | -/* The string "%2$d %1$d", with dollar characters protected from the shell's |
3392 | - dollar expansion (possibly an autoconf bug). */ |
3393 | -static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' }; |
3394 | -static char buf[100]; |
3395 | -int main () |
3396 | -{ |
3397 | - sprintf (buf, format, 33, 55); |
3398 | - return (strcmp (buf, "55 33") != 0); |
3399 | -}], gt_cv_func_printf_posix=yes, gt_cv_func_printf_posix=no, |
3400 | - [ |
3401 | - AC_EGREP_CPP(notposix, [ |
3402 | -#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__ |
3403 | - notposix |
3404 | -#endif |
3405 | - ], gt_cv_func_printf_posix="guessing no", |
3406 | - gt_cv_func_printf_posix="guessing yes") |
3407 | - ]) |
3408 | - ]) |
3409 | - case $gt_cv_func_printf_posix in |
3410 | - *yes) |
3411 | - AC_DEFINE(HAVE_POSIX_PRINTF, 1, |
3412 | - [Define if your printf() function supports format strings with positions.]) |
3413 | - ;; |
3414 | - esac |
3415 | +dnl Initializes the accumulator used by AM_XGETTEXT_OPTION. |
3416 | +AC_DEFUN([AM_XGETTEXT_OPTION_INIT], |
3417 | +[ |
3418 | + XGETTEXT_EXTRA_OPTIONS= |
3419 | +]) |
3420 | + |
3421 | +dnl Registers an option to be passed to xgettext in the po subdirectory. |
3422 | +AC_DEFUN([AM_XGETTEXT_OPTION], |
3423 | +[ |
3424 | + AC_REQUIRE([AM_XGETTEXT_OPTION_INIT]) |
3425 | + XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1" |
3426 | ]) |
3427 | |
3428 | # progtest.m4 serial 4 (gettext-0.14.2) |
3429 | @@ -9543,286 +9026,7 @@ |
3430 | AC_SUBST($1)dnl |
3431 | ]) |
3432 | |
3433 | -# size_max.m4 serial 5 |
3434 | -dnl Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc. |
3435 | -dnl This file is free software; the Free Software Foundation |
3436 | -dnl gives unlimited permission to copy and/or distribute it, |
3437 | -dnl with or without modifications, as long as this notice is preserved. |
3438 | - |
3439 | -dnl From Bruno Haible. |
3440 | - |
3441 | -AC_DEFUN([gl_SIZE_MAX], |
3442 | -[ |
3443 | - AC_CHECK_HEADERS(stdint.h) |
3444 | - dnl First test whether the system already has SIZE_MAX. |
3445 | - AC_MSG_CHECKING([for SIZE_MAX]) |
3446 | - AC_CACHE_VAL([gl_cv_size_max], [ |
3447 | - gl_cv_size_max= |
3448 | - AC_EGREP_CPP([Found it], [ |
3449 | -#include <limits.h> |
3450 | -#if HAVE_STDINT_H |
3451 | -#include <stdint.h> |
3452 | -#endif |
3453 | -#ifdef SIZE_MAX |
3454 | -Found it |
3455 | -#endif |
3456 | -], gl_cv_size_max=yes) |
3457 | - if test -z "$gl_cv_size_max"; then |
3458 | - dnl Define it ourselves. Here we assume that the type 'size_t' is not wider |
3459 | - dnl than the type 'unsigned long'. Try hard to find a definition that can |
3460 | - dnl be used in a preprocessor #if, i.e. doesn't contain a cast. |
3461 | - _AC_COMPUTE_INT([sizeof (size_t) * CHAR_BIT - 1], size_t_bits_minus_1, |
3462 | - [#include <stddef.h> |
3463 | -#include <limits.h>], size_t_bits_minus_1=) |
3464 | - _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint, |
3465 | - [#include <stddef.h>], fits_in_uint=) |
3466 | - if test -n "$size_t_bits_minus_1" && test -n "$fits_in_uint"; then |
3467 | - if test $fits_in_uint = 1; then |
3468 | - dnl Even though SIZE_MAX fits in an unsigned int, it must be of type |
3469 | - dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'. |
3470 | - AC_TRY_COMPILE([#include <stddef.h> |
3471 | - extern size_t foo; |
3472 | - extern unsigned long foo; |
3473 | - ], [], fits_in_uint=0) |
3474 | - fi |
3475 | - dnl We cannot use 'expr' to simplify this expression, because 'expr' |
3476 | - dnl works only with 'long' integers in the host environment, while we |
3477 | - dnl might be cross-compiling from a 32-bit platform to a 64-bit platform. |
3478 | - if test $fits_in_uint = 1; then |
3479 | - gl_cv_size_max="(((1U << $size_t_bits_minus_1) - 1) * 2 + 1)" |
3480 | - else |
3481 | - gl_cv_size_max="(((1UL << $size_t_bits_minus_1) - 1) * 2 + 1)" |
3482 | - fi |
3483 | - else |
3484 | - dnl Shouldn't happen, but who knows... |
3485 | - gl_cv_size_max='((size_t)~(size_t)0)' |
3486 | - fi |
3487 | - fi |
3488 | - ]) |
3489 | - AC_MSG_RESULT([$gl_cv_size_max]) |
3490 | - if test "$gl_cv_size_max" != yes; then |
3491 | - AC_DEFINE_UNQUOTED([SIZE_MAX], [$gl_cv_size_max], |
3492 | - [Define as the maximum value of type 'size_t', if the system doesn't define it.]) |
3493 | - fi |
3494 | -]) |
3495 | - |
3496 | -# stdint_h.m4 serial 6 |
3497 | -dnl Copyright (C) 1997-2004, 2006 Free Software Foundation, Inc. |
3498 | -dnl This file is free software; the Free Software Foundation |
3499 | -dnl gives unlimited permission to copy and/or distribute it, |
3500 | -dnl with or without modifications, as long as this notice is preserved. |
3501 | - |
3502 | -dnl From Paul Eggert. |
3503 | - |
3504 | -# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists, |
3505 | -# doesn't clash with <sys/types.h>, and declares uintmax_t. |
3506 | - |
3507 | -AC_DEFUN([gl_AC_HEADER_STDINT_H], |
3508 | -[ |
3509 | - AC_CACHE_CHECK([for stdint.h], gl_cv_header_stdint_h, |
3510 | - [AC_TRY_COMPILE( |
3511 | - [#include <sys/types.h> |
3512 | -#include <stdint.h>], |
3513 | - [uintmax_t i = (uintmax_t) -1; return !i;], |
3514 | - gl_cv_header_stdint_h=yes, |
3515 | - gl_cv_header_stdint_h=no)]) |
3516 | - if test $gl_cv_header_stdint_h = yes; then |
3517 | - AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1, |
3518 | - [Define if <stdint.h> exists, doesn't clash with <sys/types.h>, |
3519 | - and declares uintmax_t. ]) |
3520 | - fi |
3521 | -]) |
3522 | - |
3523 | -# uintmax_t.m4 serial 9 |
3524 | -dnl Copyright (C) 1997-2004 Free Software Foundation, Inc. |
3525 | -dnl This file is free software; the Free Software Foundation |
3526 | -dnl gives unlimited permission to copy and/or distribute it, |
3527 | -dnl with or without modifications, as long as this notice is preserved. |
3528 | - |
3529 | -dnl From Paul Eggert. |
3530 | - |
3531 | -AC_PREREQ(2.13) |
3532 | - |
3533 | -# Define uintmax_t to 'unsigned long' or 'unsigned long long' |
3534 | -# if it is not already defined in <stdint.h> or <inttypes.h>. |
3535 | - |
3536 | -AC_DEFUN([gl_AC_TYPE_UINTMAX_T], |
3537 | -[ |
3538 | - AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) |
3539 | - AC_REQUIRE([gl_AC_HEADER_STDINT_H]) |
3540 | - if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then |
3541 | - AC_REQUIRE([gl_AC_TYPE_UNSIGNED_LONG_LONG]) |
3542 | - test $ac_cv_type_unsigned_long_long = yes \ |
3543 | - && ac_type='unsigned long long' \ |
3544 | - || ac_type='unsigned long' |
3545 | - AC_DEFINE_UNQUOTED(uintmax_t, $ac_type, |
3546 | - [Define to unsigned long or unsigned long long |
3547 | - if <stdint.h> and <inttypes.h> don't define.]) |
3548 | - else |
3549 | - AC_DEFINE(HAVE_UINTMAX_T, 1, |
3550 | - [Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>.]) |
3551 | - fi |
3552 | -]) |
3553 | - |
3554 | -# ulonglong.m4 serial 6 |
3555 | -dnl Copyright (C) 1999-2006 Free Software Foundation, Inc. |
3556 | -dnl This file is free software; the Free Software Foundation |
3557 | -dnl gives unlimited permission to copy and/or distribute it, |
3558 | -dnl with or without modifications, as long as this notice is preserved. |
3559 | - |
3560 | -dnl From Paul Eggert. |
3561 | - |
3562 | -# Define HAVE_UNSIGNED_LONG_LONG_INT if 'unsigned long long int' works. |
3563 | -# This fixes a bug in Autoconf 2.60, but can be removed once we |
3564 | -# assume 2.61 everywhere. |
3565 | - |
3566 | -# Note: If the type 'unsigned long long int' exists but is only 32 bits |
3567 | -# large (as on some very old compilers), AC_TYPE_UNSIGNED_LONG_LONG_INT |
3568 | -# will not be defined. In this case you can treat 'unsigned long long int' |
3569 | -# like 'unsigned long int'. |
3570 | - |
3571 | -AC_DEFUN([AC_TYPE_UNSIGNED_LONG_LONG_INT], |
3572 | -[ |
3573 | - AC_CACHE_CHECK([for unsigned long long int], |
3574 | - [ac_cv_type_unsigned_long_long_int], |
3575 | - [AC_LINK_IFELSE( |
3576 | - [AC_LANG_PROGRAM( |
3577 | - [[unsigned long long int ull = 18446744073709551615ULL; |
3578 | - typedef int a[(18446744073709551615ULL <= (unsigned long long int) -1 |
3579 | - ? 1 : -1)]; |
3580 | - int i = 63;]], |
3581 | - [[unsigned long long int ullmax = 18446744073709551615ull; |
3582 | - return (ull << 63 | ull >> 63 | ull << i | ull >> i |
3583 | - | ullmax / ull | ullmax % ull);]])], |
3584 | - [ac_cv_type_unsigned_long_long_int=yes], |
3585 | - [ac_cv_type_unsigned_long_long_int=no])]) |
3586 | - if test $ac_cv_type_unsigned_long_long_int = yes; then |
3587 | - AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], 1, |
3588 | - [Define to 1 if the system has the type `unsigned long long int'.]) |
3589 | - fi |
3590 | -]) |
3591 | - |
3592 | -# This macro is obsolescent and should go away soon. |
3593 | -AC_DEFUN([gl_AC_TYPE_UNSIGNED_LONG_LONG], |
3594 | -[ |
3595 | - AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT]) |
3596 | - ac_cv_type_unsigned_long_long=$ac_cv_type_unsigned_long_long_int |
3597 | - if test $ac_cv_type_unsigned_long_long = yes; then |
3598 | - AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1, |
3599 | - [Define if you have the 'unsigned long long' type.]) |
3600 | - fi |
3601 | -]) |
3602 | - |
3603 | -# visibility.m4 serial 1 (gettext-0.15) |
3604 | -dnl Copyright (C) 2005 Free Software Foundation, Inc. |
3605 | -dnl This file is free software; the Free Software Foundation |
3606 | -dnl gives unlimited permission to copy and/or distribute it, |
3607 | -dnl with or without modifications, as long as this notice is preserved. |
3608 | - |
3609 | -dnl From Bruno Haible. |
3610 | - |
3611 | -dnl Tests whether the compiler supports the command-line option |
3612 | -dnl -fvisibility=hidden and the function and variable attributes |
3613 | -dnl __attribute__((__visibility__("hidden"))) and |
3614 | -dnl __attribute__((__visibility__("default"))). |
3615 | -dnl Does *not* test for __visibility__("protected") - which has tricky |
3616 | -dnl semantics (see the 'vismain' test in glibc) and does not exist e.g. on |
3617 | -dnl MacOS X. |
3618 | -dnl Does *not* test for __visibility__("internal") - which has processor |
3619 | -dnl dependent semantics. |
3620 | -dnl Does *not* test for #pragma GCC visibility push(hidden) - which is |
3621 | -dnl "really only recommended for legacy code". |
3622 | -dnl Set the variable CFLAG_VISIBILITY. |
3623 | -dnl Defines and sets the variable HAVE_VISIBILITY. |
3624 | - |
3625 | -AC_DEFUN([gl_VISIBILITY], |
3626 | -[ |
3627 | - AC_REQUIRE([AC_PROG_CC]) |
3628 | - CFLAG_VISIBILITY= |
3629 | - HAVE_VISIBILITY=0 |
3630 | - if test -n "$GCC"; then |
3631 | - AC_MSG_CHECKING([for simple visibility declarations]) |
3632 | - AC_CACHE_VAL(gl_cv_cc_visibility, [ |
3633 | - gl_save_CFLAGS="$CFLAGS" |
3634 | - CFLAGS="$CFLAGS -fvisibility=hidden" |
3635 | - AC_TRY_COMPILE( |
3636 | - [extern __attribute__((__visibility__("hidden"))) int hiddenvar; |
3637 | - extern __attribute__((__visibility__("default"))) int exportedvar; |
3638 | - extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void); |
3639 | - extern __attribute__((__visibility__("default"))) int exportedfunc (void);], |
3640 | - [], |
3641 | - gl_cv_cc_visibility=yes, |
3642 | - gl_cv_cc_visibility=no) |
3643 | - CFLAGS="$gl_save_CFLAGS"]) |
3644 | - AC_MSG_RESULT([$gl_cv_cc_visibility]) |
3645 | - if test $gl_cv_cc_visibility = yes; then |
3646 | - CFLAG_VISIBILITY="-fvisibility=hidden" |
3647 | - HAVE_VISIBILITY=1 |
3648 | - fi |
3649 | - fi |
3650 | - AC_SUBST([CFLAG_VISIBILITY]) |
3651 | - AC_SUBST([HAVE_VISIBILITY]) |
3652 | - AC_DEFINE_UNQUOTED([HAVE_VISIBILITY], [$HAVE_VISIBILITY], |
3653 | - [Define to 1 or 0, depending whether the compiler supports simple visibility declarations.]) |
3654 | -]) |
3655 | - |
3656 | -# wchar_t.m4 serial 1 (gettext-0.12) |
3657 | -dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. |
3658 | -dnl This file is free software; the Free Software Foundation |
3659 | -dnl gives unlimited permission to copy and/or distribute it, |
3660 | -dnl with or without modifications, as long as this notice is preserved. |
3661 | - |
3662 | -dnl From Bruno Haible. |
3663 | -dnl Test whether <stddef.h> has the 'wchar_t' type. |
3664 | -dnl Prerequisite: AC_PROG_CC |
3665 | - |
3666 | -AC_DEFUN([gt_TYPE_WCHAR_T], |
3667 | -[ |
3668 | - AC_CACHE_CHECK([for wchar_t], gt_cv_c_wchar_t, |
3669 | - [AC_TRY_COMPILE([#include <stddef.h> |
3670 | - wchar_t foo = (wchar_t)'\0';], , |
3671 | - gt_cv_c_wchar_t=yes, gt_cv_c_wchar_t=no)]) |
3672 | - if test $gt_cv_c_wchar_t = yes; then |
3673 | - AC_DEFINE(HAVE_WCHAR_T, 1, [Define if you have the 'wchar_t' type.]) |
3674 | - fi |
3675 | -]) |
3676 | - |
3677 | -# wint_t.m4 serial 1 (gettext-0.12) |
3678 | -dnl Copyright (C) 2003 Free Software Foundation, Inc. |
3679 | -dnl This file is free software; the Free Software Foundation |
3680 | -dnl gives unlimited permission to copy and/or distribute it, |
3681 | -dnl with or without modifications, as long as this notice is preserved. |
3682 | - |
3683 | -dnl From Bruno Haible. |
3684 | -dnl Test whether <wchar.h> has the 'wint_t' type. |
3685 | -dnl Prerequisite: AC_PROG_CC |
3686 | - |
3687 | -AC_DEFUN([gt_TYPE_WINT_T], |
3688 | -[ |
3689 | - AC_CACHE_CHECK([for wint_t], gt_cv_c_wint_t, |
3690 | - [AC_TRY_COMPILE([#include <wchar.h> |
3691 | - wint_t foo = (wchar_t)'\0';], , |
3692 | - gt_cv_c_wint_t=yes, gt_cv_c_wint_t=no)]) |
3693 | - if test $gt_cv_c_wint_t = yes; then |
3694 | - AC_DEFINE(HAVE_WINT_T, 1, [Define if you have the 'wint_t' type.]) |
3695 | - fi |
3696 | -]) |
3697 | - |
3698 | -# xsize.m4 serial 3 |
3699 | -dnl Copyright (C) 2003-2004 Free Software Foundation, Inc. |
3700 | -dnl This file is free software; the Free Software Foundation |
3701 | -dnl gives unlimited permission to copy and/or distribute it, |
3702 | -dnl with or without modifications, as long as this notice is preserved. |
3703 | - |
3704 | -AC_DEFUN([gl_XSIZE], |
3705 | -[ |
3706 | - dnl Prerequisites of lib/xsize.h. |
3707 | - AC_REQUIRE([gl_SIZE_MAX]) |
3708 | - AC_REQUIRE([AC_C_INLINE]) |
3709 | - AC_CHECK_HEADERS(stdint.h) |
3710 | -]) |
3711 | - |
3712 | -# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. |
3713 | +# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. |
3714 | # |
3715 | # This file is free software; the Free Software Foundation |
3716 | # gives unlimited permission to copy and/or distribute it, |
3717 | @@ -9837,7 +9041,7 @@ |
3718 | [am__api_version='1.10' |
3719 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
3720 | dnl require some minimum version. Point them to the right macro. |
3721 | -m4_if([$1], [1.10], [], |
3722 | +m4_if([$1], [1.10.1], [], |
3723 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
3724 | ]) |
3725 | |
3726 | @@ -9853,8 +9057,10 @@ |
3727 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
3728 | # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. |
3729 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
3730 | -[AM_AUTOMAKE_VERSION([1.10])dnl |
3731 | -_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) |
3732 | +[AM_AUTOMAKE_VERSION([1.10.1])dnl |
3733 | +m4_ifndef([AC_AUTOCONF_VERSION], |
3734 | + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
3735 | +_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) |
3736 | |
3737 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- |
3738 | |
3739 | @@ -10126,7 +9332,7 @@ |
3740 | # each Makefile.in and add a new line on top of each file to say so. |
3741 | # Grep'ing the whole file is not good either: AIX grep has a line |
3742 | # limit of 2048, but all sed's we know have understand at least 4000. |
3743 | - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then |
3744 | + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then |
3745 | dirpart=`AS_DIRNAME("$mf")` |
3746 | else |
3747 | continue |
3748 | @@ -10174,13 +9380,13 @@ |
3749 | # Do all the work for Automake. -*- Autoconf -*- |
3750 | |
3751 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
3752 | -# 2005, 2006 Free Software Foundation, Inc. |
3753 | +# 2005, 2006, 2008 Free Software Foundation, Inc. |
3754 | # |
3755 | # This file is free software; the Free Software Foundation |
3756 | # gives unlimited permission to copy and/or distribute it, |
3757 | # with or without modifications, as long as this notice is preserved. |
3758 | |
3759 | -# serial 12 |
3760 | +# serial 13 |
3761 | |
3762 | # This macro actually does too much. Some checks are only needed if |
3763 | # your package does certain things. But this isn't really a big deal. |
3764 | @@ -10285,16 +9491,17 @@ |
3765 | # our stamp files there. |
3766 | AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], |
3767 | [# Compute $1's index in $config_headers. |
3768 | +_am_arg=$1 |
3769 | _am_stamp_count=1 |
3770 | for _am_header in $config_headers :; do |
3771 | case $_am_header in |
3772 | - $1 | $1:* ) |
3773 | + $_am_arg | $_am_arg:* ) |
3774 | break ;; |
3775 | * ) |
3776 | _am_stamp_count=`expr $_am_stamp_count + 1` ;; |
3777 | esac |
3778 | done |
3779 | -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) |
3780 | +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) |
3781 | |
3782 | # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. |
3783 | # |
3784 | @@ -10595,7 +9802,7 @@ |
3785 | |
3786 | # _AM_SUBST_NOTMAKE(VARIABLE) |
3787 | # --------------------------- |
3788 | -# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. |
3789 | +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. |
3790 | # This macro is traced by Automake. |
3791 | AC_DEFUN([_AM_SUBST_NOTMAKE]) |
3792 | |
3793 | |
3794 | === removed directory 'build/fedora' |
3795 | === removed file 'build/fedora/libticables2.spec' |
3796 | --- build/fedora/libticables2.spec 2009-05-17 13:34:18 +0000 |
3797 | +++ build/fedora/libticables2.spec 1970-01-01 00:00:00 +0000 |
3798 | @@ -1,207 +0,0 @@ |
3799 | -Name: libticables2 |
3800 | -Epoch: 1 |
3801 | -Version: 1.2.0 |
3802 | -Release: 2 |
3803 | -Vendor: LPG (http://lpg.ticalc.org) |
3804 | -Packager: Kevin Kofler <Kevin@tigcc.ticalc.org> |
3805 | -Source: %{name}-%{version}.tar.bz2 |
3806 | -Group: System Environment/Libraries |
3807 | -License: GPLv2+ |
3808 | -BuildRequires: libusb-devel, glib2-devel >= 2.4.0, tfdocgen |
3809 | -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) |
3810 | -Summary: Library for handling TI link cables |
3811 | -%description |
3812 | -Library for handling TI link cables |
3813 | - |
3814 | -%package devel |
3815 | -Summary: Development files for %{name} |
3816 | -Group: Development/Libraries |
3817 | -Requires: %{name} = %{epoch}:%{version}-%{release} |
3818 | -Requires: pkgconfig |
3819 | -Requires: glib2-devel >= 2.4.0 |
3820 | -%description devel |
3821 | -This package contains the files necessary to develop applications using the |
3822 | -%{name} library. |
3823 | - |
3824 | -%package apidocs |
3825 | -Summary: API documentation for %{name} |
3826 | -Group: Development/Documentation |
3827 | -Requires: %{name} = %{epoch}:%{version}-%{release} |
3828 | -%description apidocs |
3829 | -This package contains the API documentation for the %{name} library in |
3830 | -HTML format. |
3831 | - |
3832 | -%prep |
3833 | -%setup |
3834 | - |
3835 | -%build |
3836 | -CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} --libdir=%{_libdir} --disable-nls |
3837 | -make |
3838 | - |
3839 | -%install |
3840 | -if [ -d $RPM_BUILD_ROOT ]; then rm -rf $RPM_BUILD_ROOT; fi |
3841 | -mkdir -p $RPM_BUILD_ROOT |
3842 | -make install DESTDIR=$RPM_BUILD_ROOT |
3843 | -rm -f $RPM_BUILD_ROOT%{_libdir}/libticables2.la |
3844 | -mkdir -p $RPM_BUILD_ROOT/etc/udev/rules.d |
3845 | -cat >$RPM_BUILD_ROOT/etc/udev/rules.d/60-libticables.rules <<EOF1 |
3846 | -# This file was installed by the libticables2 Fedora package. |
3847 | - |
3848 | -# SilverLink |
3849 | -ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="0451", ATTR{idProduct}=="e001", SYMLINK+="ticable-%%k" |
3850 | -# TI-84+ DirectLink |
3851 | -ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="0451", ATTR{idProduct}=="e003", SYMLINK+="ticable-%%k" |
3852 | -# TI-89 Titanium DirectLink |
3853 | -ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="0451", ATTR{idProduct}=="e004", SYMLINK+="ticable-%%k" |
3854 | -# TI-84+ SE DirectLink |
3855 | -ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="0451", ATTR{idProduct}=="e008", SYMLINK+="ticable-%%k" |
3856 | -# TI-Nspire DirectLink |
3857 | -ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="0451", ATTR{idProduct}=="e012", SYMLINK+="ticable-%%k" |
3858 | -EOF1 |
3859 | -mkdir -p $RPM_BUILD_ROOT/etc/security/console.perms.d |
3860 | -cat >$RPM_BUILD_ROOT/etc/security/console.perms.d/60-libticables.perms <<EOF2 |
3861 | -# This file was installed by the libticables2 Fedora package. |
3862 | - |
3863 | -# device classes -- these are shell-style globs |
3864 | -<ticable>=/dev/ticable* /dev/usb/ticable* |
3865 | -<serport>=/dev/ttyS* |
3866 | -<parport>=/dev/parport* |
3867 | - |
3868 | -# permission definitions |
3869 | -<console> 0600 <ticable> 0600 root |
3870 | -<console> 0660 <serport> 0660 root.uucp |
3871 | -<console> 0660 <parport> 0660 root.lp |
3872 | -EOF2 |
3873 | - |
3874 | -%post -p /sbin/ldconfig |
3875 | - |
3876 | -%postun -p /sbin/ldconfig |
3877 | - |
3878 | -%clean |
3879 | -rm -rf $RPM_BUILD_ROOT |
3880 | - |
3881 | -%files |
3882 | -%defattr(-, root, root) |
3883 | -%{_libdir}/libticables2.so.* |
3884 | -%{_sysconfdir}/udev/rules.d/60-libticables.rules |
3885 | -%{_sysconfdir}/security/console.perms.d/60-libticables.perms |
3886 | -%dir %{_datadir}/doc/%{name} |
3887 | -%{_datadir}/doc/%{name}/AUTHORS |
3888 | -%{_datadir}/doc/%{name}/COPYING |
3889 | -%{_datadir}/doc/%{name}/ChangeLog |
3890 | -%{_datadir}/doc/%{name}/README |
3891 | - |
3892 | -%files devel |
3893 | -%defattr(-, root, root) |
3894 | -%{_includedir}/tilp2 |
3895 | -%{_libdir}/libticables2.so |
3896 | -%{_libdir}/pkgconfig/ticables2.pc |
3897 | - |
3898 | -%files apidocs |
3899 | -%defattr(-, root, root) |
3900 | -%{_datadir}/doc/%{name}/html |
3901 | - |
3902 | -%changelog |
3903 | -* Mon Jan 14 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 1:1.2.0-2 |
3904 | -Add the USB ID for the TI-Nspire in 60-libticables.rules. |
3905 | - |
3906 | -* Sun Jan 13 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 1:1.2.0-1 |
3907 | -Update to 1.2.0. |
3908 | -Drop obsolete backported patch. |
3909 | -Specify GPL version in License tag. |
3910 | - |
3911 | -* Sun Oct 14 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 1:1.1.0-2 |
3912 | -Backport improved device node accessibility check from SVN. |
3913 | - |
3914 | -* Sat Oct 13 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 1:1.1.0-1 |
3915 | -Update to 1.1.0. |
3916 | - |
3917 | -* Sat Sep 8 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 1:1.0.9-1 |
3918 | -Update to 1.0.9. |
3919 | -Change usb_device back to usb (required with current kernel and udev). |
3920 | - |
3921 | -* Fri Jul 27 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 1:1.0.6-3 |
3922 | -Revert usb_device->usb change (update kernel has CONFIG_USB_DEVICE_CLASS on) |
3923 | - |
3924 | -* Tue Jul 24 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 1:1.0.6-2 |
3925 | -Update udev rules for new kernel and udev. |
3926 | - |
3927 | -* Thu May 31 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 1:1.0.6-1 |
3928 | -Update to 1.0.6. |
3929 | - |
3930 | -* Wed May 16 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> |
3931 | -Drop -n libticables, the tarball uses name-version format now. |
3932 | -Add BR tfdocgen and apidocs subpackage. |
3933 | -Package non-API documentation files in main package. |
3934 | - |
3935 | -* Thu May 3 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> |
3936 | -Give access to serial and parallel ports in the pam_console configuration. |
3937 | - |
3938 | -* Mon Apr 16 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 1:1.0.5-1 |
3939 | -Bump Epoch. |
3940 | -Use real version number instead of date. |
3941 | - |
3942 | -* Mon Apr 16 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> |
3943 | -Remove redundant explicit Requires. |
3944 | -Don't BuildRequire newer versions than actually needed. |
3945 | - |
3946 | -* Sun Oct 15 2006 Kevin Kofler <Kevin@tigcc.ticalc.org> |
3947 | -Add non-SE TI-84+ to the pam_console configuration. |
3948 | - |
3949 | -* Mon Sep 25 2006 Kevin Kofler <Kevin@tigcc.ticalc.org> |
3950 | -Split out -devel into separate subpackage. |
3951 | -Own /usr/include/tilp2 in -devel. |
3952 | -Use more efficient method to call ldconfig in post/postun. |
3953 | - |
3954 | -* Sun Jul 23 2006 Kevin Kofler <Kevin@tigcc.ticalc.org> |
3955 | -Fix incorrect escaping in console.perms.d file. |
3956 | - |
3957 | -* Thu Jul 20 2006 Kevin Kofler <Kevin@tigcc.ticalc.org> |
3958 | -Libdir fixes for lib64 platforms. |
3959 | -Add Provides for future -devel subpackage. |
3960 | - |
3961 | -* Fri Jun 16 2006 Kevin Kofler <Kevin@tigcc.ticalc.org> |
3962 | -Remove redundant %%defattr at the end of %%files. |
3963 | - |
3964 | -* Wed Jun 7 2006 Kevin Kofler <Kevin@tigcc.ticalc.org> |
3965 | -Update file list (stdints.h now numbered to avoid conflicts). |
3966 | -Use /etc/security/console.perms.d for the pam_console setup instead of |
3967 | -hand-written script hack. |
3968 | - |
3969 | -* Wed May 24 2006 Kevin Kofler <Kevin@tigcc.ticalc.org> |
3970 | -Don't package .la file (not needed under Fedora). |
3971 | -Make sure permissions are set correctly when building as non-root. |
3972 | - |
3973 | -* Mon May 22 2006 Kevin Kofler <Kevin@tigcc.ticalc.org> |
3974 | -Build debuginfo RPM. |
3975 | -Use the system-wide default RPM_OPT_FLAGS instead of my own. |
3976 | -Use BuildRoot recommended by the Fedora packaging guidelines. |
3977 | - |
3978 | -* Sun May 7 2006 Kevin Kofler <Kevin@tigcc.ticalc.org> |
3979 | -License now GPL (with exception for TilEm). |
3980 | -Add missing glib2 BuildRequires/Requires. |
3981 | -Now requires libticonv. |
3982 | -Convert hotplug rules to udev rules and add DirectLink DeviceIDs. |
3983 | - |
3984 | -* Sat Feb 11 2006 Kevin Kofler <Kevin@tigcc.ticalc.org> |
3985 | -Update setup -n to use the new directory name (libticables, not libticables2). |
3986 | - |
3987 | -* Sun Jan 29 2006 Kevin Kofler <Kevin@tigcc.ticalc.org> |
3988 | -Strip library because -s gets ignored somehow. |
3989 | - |
3990 | -* Wed Jan 4 2006 Kevin Kofler <Kevin@tigcc.ticalc.org> |
3991 | -Change Vendor to LPG. |
3992 | - |
3993 | -* Wed Sep 14 2005 Kevin Kofler <Kevin@tigcc.ticalc.org> |
3994 | -Update to libticables-2: new package name, updated file list. |
3995 | - |
3996 | -* Wed Jun 22 2005 Kevin Kofler <Kevin@tigcc.ticalc.org> |
3997 | -SilverLink support (based on Julien Blache's Debian packages and Nalin |
3998 | -Dahyabhai's usbcam script) |
3999 | - |
4000 | -* Sun Jun 19 2005 Kevin Kofler <Kevin@tigcc.ticalc.org> |
4001 | -Change Copyright to License. |
4002 | -Don't list cabl_def.h twice. |
4003 | - |
4004 | -* Mon May 2 2005 Kevin Kofler <Kevin@tigcc.ticalc.org> |
4005 | -First Fedora RPM. |
4006 | |
4007 | === modified file 'build/mingw/Makefile' |
4008 | --- build/mingw/Makefile 2009-05-17 13:34:18 +0000 |
4009 | +++ build/mingw/Makefile 2010-02-23 21:48:16 +0000 |
4010 | @@ -1,8 +1,8 @@ |
4011 | -# Makefile.in generated by automake 1.10 from Makefile.am. |
4012 | +# Makefile.in generated by automake 1.10.1 from Makefile.am. |
4013 | # build/mingw/Makefile. Generated from Makefile.in by configure. |
4014 | |
4015 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
4016 | -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. |
4017 | +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
4018 | # This Makefile.in is free software; the Free Software Foundation |
4019 | # gives unlimited permission to copy and/or distribute it, |
4020 | # with or without modifications, as long as this notice is preserved. |
4021 | @@ -30,8 +30,8 @@ |
4022 | NORMAL_UNINSTALL = : |
4023 | PRE_UNINSTALL = : |
4024 | POST_UNINSTALL = : |
4025 | -build_triplet = x86_64-unknown-linux-gnu |
4026 | -host_triplet = x86_64-unknown-linux-gnu |
4027 | +build_triplet = i686-pc-linux-gnu |
4028 | +host_triplet = i686-pc-linux-gnu |
4029 | subdir = build/mingw |
4030 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in |
4031 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
4032 | @@ -45,32 +45,28 @@ |
4033 | DIST_SOURCES = |
4034 | DATA = $(noinst_DATA) |
4035 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
4036 | -ACLOCAL = ${SHELL} /tmp/libticables2-1.2.0/missing --run aclocal-1.10 |
4037 | -ALLOCA = |
4038 | -AMTAR = ${SHELL} /tmp/libticables2-1.2.0/missing --run tar |
4039 | +ACLOCAL = ${SHELL} /tmp/ticables2/missing --run aclocal-1.10 |
4040 | +AMTAR = ${SHELL} /tmp/ticables2/missing --run tar |
4041 | AR = ar |
4042 | AS = as |
4043 | -AUTOCONF = ${SHELL} /tmp/libticables2-1.2.0/missing --run autoconf |
4044 | -AUTOHEADER = ${SHELL} /tmp/libticables2-1.2.0/missing --run autoheader |
4045 | -AUTOMAKE = ${SHELL} /tmp/libticables2-1.2.0/missing --run automake-1.10 |
4046 | +AUTOCONF = ${SHELL} /tmp/ticables2/missing --run autoconf |
4047 | +AUTOHEADER = ${SHELL} /tmp/ticables2/missing --run autoheader |
4048 | +AUTOMAKE = ${SHELL} /tmp/ticables2/missing --run automake-1.10 |
4049 | AWK = mawk |
4050 | -BUILD_INCLUDED_LIBINTL = no |
4051 | -CATOBJEXT = .gmo |
4052 | CC = gcc |
4053 | CCDEPMODE = depmode=gcc3 |
4054 | -CFLAGS = -g -O2 -D__LINUX__ -fvisibility=hidden |
4055 | -CFLAG_VISIBILITY = -fvisibility=hidden |
4056 | +CFLAGS = -g -O2 -D__I386__ -D__LINUX__ -fvisibility=hidden |
4057 | CPP = gcc -E |
4058 | CPPFLAGS = |
4059 | CXX = g++ |
4060 | -CXXCPP = |
4061 | -CXXDEPMODE = depmode=none |
4062 | -CXXFLAGS = |
4063 | +CXXCPP = g++ -E |
4064 | +CXXDEPMODE = depmode=gcc3 |
4065 | +CXXFLAGS = -g -O2 |
4066 | CYGPATH_W = echo |
4067 | -DATADIRNAME = share |
4068 | DEFS = -DHAVE_CONFIG_H |
4069 | DEPDIR = .deps |
4070 | DLLTOOL = dlltool |
4071 | +DSYMUTIL = |
4072 | ECHO = echo |
4073 | ECHO_C = |
4074 | ECHO_N = -n |
4075 | @@ -79,85 +75,68 @@ |
4076 | EXEEXT = |
4077 | F77 = |
4078 | FFLAGS = |
4079 | -GENCAT = gencat |
4080 | -GLIBC2 = yes |
4081 | -GLIBC21 = yes |
4082 | +GETTEXT_MACRO_VERSION = 0.17 |
4083 | GLIB_CFLAGS = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include |
4084 | GLIB_LIBS = -lglib-2.0 |
4085 | GMSGFMT = /usr/bin/msgfmt |
4086 | GMSGFMT_015 = /usr/bin/msgfmt |
4087 | GREP = /bin/grep |
4088 | -HAVE_ASPRINTF = 1 |
4089 | -HAVE_POSIX_PRINTF = 1 |
4090 | -HAVE_SNPRINTF = 1 |
4091 | -HAVE_VISIBILITY = 1 |
4092 | -HAVE_WPRINTF = 0 |
4093 | INSTALL = /usr/bin/install -c |
4094 | INSTALL_DATA = ${INSTALL} -m 644 |
4095 | INSTALL_PROGRAM = ${INSTALL} |
4096 | INSTALL_SCRIPT = ${INSTALL} |
4097 | INSTALL_STRIP_PROGRAM = $(install_sh) -c -s |
4098 | -INSTOBJEXT = .mo |
4099 | -INTLBISON = bison |
4100 | INTLLIBS = |
4101 | -INTLOBJS = |
4102 | -INTL_LIBTOOL_SUFFIX_PREFIX = |
4103 | INTL_MACOSX_LIBS = |
4104 | LDFLAGS = |
4105 | -LIBICONV = |
4106 | +LIBICONV = -liconv |
4107 | LIBINTL = |
4108 | -LIBMULTITHREAD = -lpthread |
4109 | LIBOBJS = |
4110 | -LIBPTH = |
4111 | LIBS = |
4112 | -LIBTHREAD = |
4113 | LIBTOOL = $(SHELL) $(top_builddir)/libtool |
4114 | LIBUSB_CFLAGS = |
4115 | LIBUSB_LIBS = -lusb |
4116 | LN_S = ln -s |
4117 | -LTLIBICONV = |
4118 | +LTLIBICONV = -liconv |
4119 | LTLIBINTL = |
4120 | -LTLIBMULTITHREAD = -lpthread |
4121 | LTLIBOBJS = |
4122 | -LTLIBPTH = |
4123 | -LTLIBTHREAD = |
4124 | -LT_LIBVERSION = 1:16:0 |
4125 | +LT_LIBVERSION = 2:0:0 |
4126 | MAINT = # |
4127 | -MAKEINFO = ${SHELL} /tmp/libticables2-1.2.0/missing --run makeinfo |
4128 | +MAKEINFO = ${SHELL} /tmp/ticables2/missing --run makeinfo |
4129 | MKDIR_P = /bin/mkdir -p |
4130 | MSGFMT = /usr/bin/msgfmt |
4131 | MSGFMT_015 = /usr/bin/msgfmt |
4132 | MSGMERGE = /usr/bin/msgmerge |
4133 | +NMEDIT = |
4134 | OBJDUMP = objdump |
4135 | OBJEXT = o |
4136 | PACKAGE = libticables2 |
4137 | PACKAGE_BUGREPORT = tilp-users@lists.sourceforge.net |
4138 | PACKAGE_NAME = libticables2 |
4139 | -PACKAGE_STRING = libticables2 1.2.0 |
4140 | +PACKAGE_STRING = libticables2 1.3.0 |
4141 | PACKAGE_TARNAME = libticables2 |
4142 | -PACKAGE_VERSION = 1.2.0 |
4143 | +PACKAGE_VERSION = 1.3.0 |
4144 | PATH_SEPARATOR = : |
4145 | PKG_CONFIG = /usr/bin/pkg-config |
4146 | POSUB = po |
4147 | -PRI_MACROS_BROKEN = 0 |
4148 | RANLIB = ranlib |
4149 | RC = windres |
4150 | +SED = /bin/sed |
4151 | SET_MAKE = |
4152 | SHELL = /bin/sh |
4153 | STRIP = strip |
4154 | TFDOCGEN = yes |
4155 | -USE_INCLUDED_LIBINTL = no |
4156 | USE_NLS = yes |
4157 | -VERSION = 1.2.0 |
4158 | -WOE32DLL = no |
4159 | +VERSION = 1.3.0 |
4160 | XGETTEXT = /usr/bin/xgettext |
4161 | XGETTEXT_015 = /usr/bin/xgettext |
4162 | -abs_builddir = /tmp/libticables2-1.2.0/build/mingw |
4163 | -abs_srcdir = /tmp/libticables2-1.2.0/build/mingw |
4164 | -abs_top_builddir = /tmp/libticables2-1.2.0 |
4165 | -abs_top_srcdir = /tmp/libticables2-1.2.0 |
4166 | +XGETTEXT_EXTRA_OPTIONS = |
4167 | +abs_builddir = /tmp/ticables2/build/mingw |
4168 | +abs_srcdir = /tmp/ticables2/build/mingw |
4169 | +abs_top_builddir = /tmp/ticables2 |
4170 | +abs_top_srcdir = /tmp/ticables2 |
4171 | ac_ct_CC = gcc |
4172 | -ac_ct_CXX = |
4173 | +ac_ct_CXX = g++ |
4174 | ac_ct_F77 = |
4175 | am__include = include |
4176 | am__leading_dot = . |
4177 | @@ -165,26 +144,26 @@ |
4178 | am__tar = ${AMTAR} chof - "$$tardir" |
4179 | am__untar = ${AMTAR} xf - |
4180 | bindir = ${exec_prefix}/bin |
4181 | -build = x86_64-unknown-linux-gnu |
4182 | +build = i686-pc-linux-gnu |
4183 | build_alias = |
4184 | -build_cpu = x86_64 |
4185 | +build_cpu = i686 |
4186 | build_os = linux-gnu |
4187 | -build_vendor = unknown |
4188 | +build_vendor = pc |
4189 | builddir = . |
4190 | datadir = ${datarootdir} |
4191 | datarootdir = ${prefix}/share |
4192 | docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} |
4193 | dvidir = ${docdir} |
4194 | exec_prefix = ${prefix} |
4195 | -host = x86_64-unknown-linux-gnu |
4196 | +host = i686-pc-linux-gnu |
4197 | host_alias = |
4198 | -host_cpu = x86_64 |
4199 | +host_cpu = i686 |
4200 | host_os = linux-gnu |
4201 | -host_vendor = unknown |
4202 | +host_vendor = pc |
4203 | htmldir = ${docdir} |
4204 | includedir = ${prefix}/include |
4205 | infodir = ${datarootdir}/info |
4206 | -install_sh = $(SHELL) /tmp/libticables2-1.2.0/install-sh |
4207 | +install_sh = $(SHELL) /tmp/ticables2/install-sh |
4208 | libdir = ${exec_prefix}/lib |
4209 | libexecdir = ${exec_prefix}/libexec |
4210 | localedir = ${datarootdir}/locale |
4211 | |
4212 | === modified file 'build/mingw/Makefile.in' |
4213 | --- build/mingw/Makefile.in 2009-05-17 13:34:18 +0000 |
4214 | +++ build/mingw/Makefile.in 2010-02-23 21:48:16 +0000 |
4215 | @@ -1,8 +1,8 @@ |
4216 | -# Makefile.in generated by automake 1.10 from Makefile.am. |
4217 | +# Makefile.in generated by automake 1.10.1 from Makefile.am. |
4218 | # @configure_input@ |
4219 | |
4220 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
4221 | -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. |
4222 | +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
4223 | # This Makefile.in is free software; the Free Software Foundation |
4224 | # gives unlimited permission to copy and/or distribute it, |
4225 | # with or without modifications, as long as this notice is preserved. |
4226 | @@ -46,7 +46,6 @@ |
4227 | DATA = $(noinst_DATA) |
4228 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
4229 | ACLOCAL = @ACLOCAL@ |
4230 | -ALLOCA = @ALLOCA@ |
4231 | AMTAR = @AMTAR@ |
4232 | AR = @AR@ |
4233 | AS = @AS@ |
4234 | @@ -54,12 +53,9 @@ |
4235 | AUTOHEADER = @AUTOHEADER@ |
4236 | AUTOMAKE = @AUTOMAKE@ |
4237 | AWK = @AWK@ |
4238 | -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ |
4239 | -CATOBJEXT = @CATOBJEXT@ |
4240 | CC = @CC@ |
4241 | CCDEPMODE = @CCDEPMODE@ |
4242 | CFLAGS = @CFLAGS@ |
4243 | -CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ |
4244 | CPP = @CPP@ |
4245 | CPPFLAGS = @CPPFLAGS@ |
4246 | CXX = @CXX@ |
4247 | @@ -67,10 +63,10 @@ |
4248 | CXXDEPMODE = @CXXDEPMODE@ |
4249 | CXXFLAGS = @CXXFLAGS@ |
4250 | CYGPATH_W = @CYGPATH_W@ |
4251 | -DATADIRNAME = @DATADIRNAME@ |
4252 | DEFS = @DEFS@ |
4253 | DEPDIR = @DEPDIR@ |
4254 | DLLTOOL = @DLLTOOL@ |
4255 | +DSYMUTIL = @DSYMUTIL@ |
4256 | ECHO = @ECHO@ |
4257 | ECHO_C = @ECHO_C@ |
4258 | ECHO_N = @ECHO_N@ |
4259 | @@ -79,48 +75,31 @@ |
4260 | EXEEXT = @EXEEXT@ |
4261 | F77 = @F77@ |
4262 | FFLAGS = @FFLAGS@ |
4263 | -GENCAT = @GENCAT@ |
4264 | -GLIBC2 = @GLIBC2@ |
4265 | -GLIBC21 = @GLIBC21@ |
4266 | +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ |
4267 | GLIB_CFLAGS = @GLIB_CFLAGS@ |
4268 | GLIB_LIBS = @GLIB_LIBS@ |
4269 | GMSGFMT = @GMSGFMT@ |
4270 | GMSGFMT_015 = @GMSGFMT_015@ |
4271 | GREP = @GREP@ |
4272 | -HAVE_ASPRINTF = @HAVE_ASPRINTF@ |
4273 | -HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ |
4274 | -HAVE_SNPRINTF = @HAVE_SNPRINTF@ |
4275 | -HAVE_VISIBILITY = @HAVE_VISIBILITY@ |
4276 | -HAVE_WPRINTF = @HAVE_WPRINTF@ |
4277 | INSTALL = @INSTALL@ |
4278 | INSTALL_DATA = @INSTALL_DATA@ |
4279 | INSTALL_PROGRAM = @INSTALL_PROGRAM@ |
4280 | INSTALL_SCRIPT = @INSTALL_SCRIPT@ |
4281 | INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ |
4282 | -INSTOBJEXT = @INSTOBJEXT@ |
4283 | -INTLBISON = @INTLBISON@ |
4284 | INTLLIBS = @INTLLIBS@ |
4285 | -INTLOBJS = @INTLOBJS@ |
4286 | -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ |
4287 | INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ |
4288 | LDFLAGS = @LDFLAGS@ |
4289 | LIBICONV = @LIBICONV@ |
4290 | LIBINTL = @LIBINTL@ |
4291 | -LIBMULTITHREAD = @LIBMULTITHREAD@ |
4292 | LIBOBJS = @LIBOBJS@ |
4293 | -LIBPTH = @LIBPTH@ |
4294 | LIBS = @LIBS@ |
4295 | -LIBTHREAD = @LIBTHREAD@ |
4296 | LIBTOOL = @LIBTOOL@ |
4297 | LIBUSB_CFLAGS = @LIBUSB_CFLAGS@ |
4298 | LIBUSB_LIBS = @LIBUSB_LIBS@ |
4299 | LN_S = @LN_S@ |
4300 | LTLIBICONV = @LTLIBICONV@ |
4301 | LTLIBINTL = @LTLIBINTL@ |
4302 | -LTLIBMULTITHREAD = @LTLIBMULTITHREAD@ |
4303 | LTLIBOBJS = @LTLIBOBJS@ |
4304 | -LTLIBPTH = @LTLIBPTH@ |
4305 | -LTLIBTHREAD = @LTLIBTHREAD@ |
4306 | LT_LIBVERSION = @LT_LIBVERSION@ |
4307 | MAINT = @MAINT@ |
4308 | MAKEINFO = @MAKEINFO@ |
4309 | @@ -128,6 +107,7 @@ |
4310 | MSGFMT = @MSGFMT@ |
4311 | MSGFMT_015 = @MSGFMT_015@ |
4312 | MSGMERGE = @MSGMERGE@ |
4313 | +NMEDIT = @NMEDIT@ |
4314 | OBJDUMP = @OBJDUMP@ |
4315 | OBJEXT = @OBJEXT@ |
4316 | PACKAGE = @PACKAGE@ |
4317 | @@ -139,19 +119,18 @@ |
4318 | PATH_SEPARATOR = @PATH_SEPARATOR@ |
4319 | PKG_CONFIG = @PKG_CONFIG@ |
4320 | POSUB = @POSUB@ |
4321 | -PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ |
4322 | RANLIB = @RANLIB@ |
4323 | RC = @RC@ |
4324 | +SED = @SED@ |
4325 | SET_MAKE = @SET_MAKE@ |
4326 | SHELL = @SHELL@ |
4327 | STRIP = @STRIP@ |
4328 | TFDOCGEN = @TFDOCGEN@ |
4329 | -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ |
4330 | USE_NLS = @USE_NLS@ |
4331 | VERSION = @VERSION@ |
4332 | -WOE32DLL = @WOE32DLL@ |
4333 | XGETTEXT = @XGETTEXT@ |
4334 | XGETTEXT_015 = @XGETTEXT_015@ |
4335 | +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ |
4336 | abs_builddir = @abs_builddir@ |
4337 | abs_srcdir = @abs_srcdir@ |
4338 | abs_top_builddir = @abs_top_builddir@ |
4339 | |
4340 | === modified file 'build/mingw/ticables2.rc' |
4341 | --- build/mingw/ticables2.rc 2009-05-17 13:34:18 +0000 |
4342 | +++ build/mingw/ticables2.rc 2010-02-23 21:48:16 +0000 |
4343 | @@ -4,8 +4,8 @@ |
4344 | // |
4345 | |
4346 | 1 VERSIONINFO |
4347 | - FILEVERSION 1,2,0,0 |
4348 | - PRODUCTVERSION 1,2,0,0 |
4349 | + FILEVERSION 1,3,0,0 |
4350 | + PRODUCTVERSION 1,3,0,0 |
4351 | FILEFLAGSMASK 0x3fL |
4352 | #ifdef _DEBUG |
4353 | FILEFLAGS 0x21L |
4354 | @@ -23,14 +23,14 @@ |
4355 | VALUE "Comments", "This lib is placed under GPL license. The license can be found on www.gnu.org\0" |
4356 | VALUE "CompanyName", "The TiLP Team\0" |
4357 | VALUE "FileDescription", "TI cables library\0" |
4358 | - VALUE "FileVersion", "1.2.0\0" |
4359 | + VALUE "FileVersion", "1.3.0\0" |
4360 | VALUE "InternalName", "libticables2\0" |
4361 | - VALUE "LegalCopyright", "Copyright © 1999-2007, Romain Liévin\0" |
4362 | + VALUE "LegalCopyright", "Copyright © 1999-2009, Romain Liévin\0" |
4363 | VALUE "LegalTrademarks", "\0" |
4364 | VALUE "OriginalFilename", "libticables2-1.dll\0" |
4365 | VALUE "PrivateBuild", "\0" |
4366 | VALUE "ProductName", "TI cables library\0" |
4367 | - VALUE "ProductVersion", "1.2.0\0" |
4368 | + VALUE "ProductVersion", "1.3.0\0" |
4369 | VALUE "SpecialBuild", "Windows 9x/Me, NT4/2000/XP version\0" |
4370 | END |
4371 | END |
4372 | |
4373 | === modified file 'build/msvc/test_ticables2.dsp' |
4374 | --- build/msvc/test_ticables2.dsp 2009-05-17 13:34:18 +0000 |
4375 | +++ build/msvc/test_ticables2.dsp 2010-02-23 21:48:16 +0000 |
4376 | @@ -49,8 +49,8 @@ |
4377 | # ADD BASE BSC32 /nologo |
4378 | # ADD BSC32 /nologo |
4379 | LINK32=link.exe |
4380 | -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 |
4381 | -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"..\..\tests\test_ticables2.exe" |
4382 | +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:I386 |
4383 | +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:I386 /out:"..\..\tests\test_ticables2.exe" |
4384 | |
4385 | !ELSEIF "$(CFG)" == "test_ticables2 - Win32 Debug" |
4386 | |
4387 | @@ -73,8 +73,8 @@ |
4388 | # ADD BASE BSC32 /nologo |
4389 | # ADD BSC32 /nologo |
4390 | LINK32=link.exe |
4391 | -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept |
4392 | -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept |
4393 | +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept |
4394 | +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept |
4395 | |
4396 | !ENDIF |
4397 | |
4398 | |
4399 | === modified file 'build/msvc/ticables2.dsp' |
4400 | --- build/msvc/ticables2.dsp 2009-05-17 13:34:18 +0000 |
4401 | +++ build/msvc/ticables2.dsp 2010-02-23 21:48:16 +0000 |
4402 | @@ -39,11 +39,11 @@ |
4403 | # PROP Use_MFC 0 |
4404 | # PROP Use_Debug_Libraries 0 |
4405 | # PROP Output_Dir "" |
4406 | -# PROP Intermediate_Dir "C:\msvc\Output\ticables2" |
4407 | +# PROP Intermediate_Dir "C:\lpg\msvc\Output\ticables2" |
4408 | # PROP Ignore_Export_Lib 0 |
4409 | # PROP Target_Dir "" |
4410 | # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c |
4411 | -# ADD CPP /nologo /MD /w /W0 /GX /I "C:\Gtk2Dev\include" /I "c:\gtk2dev\include\glib-2.0" /I "C:\GTK2DEV\lib\glib-2.0\include" /D "NDEBUG" /D "_WINDOWS" /D "WIN32" /D "TICABLES_EXPORTS" /D "__WIN32__" /D "__I386__" /D "ENABLE_NLS" /YX /FD /c |
4412 | +# ADD CPP /nologo /MD /w /W0 /GX /I "c:\lpg\gtk\include" /I "c:\lpg\gtk\include\glib-2.0" /I "c:\lpg\gtk\lib\glib-2.0\include" /D "NDEBUG" /D "_WINDOWS" /D "WIN32" /D "TICABLES_EXPORTS" /D "__WIN32__" /D "__I386__" /D "ENABLE_NLS" /YX /FD /c |
4413 | # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" |
4414 | # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" |
4415 | # ADD BASE RSC /l 0x40c /d "NDEBUG" |
4416 | @@ -52,8 +52,8 @@ |
4417 | # ADD BASE BSC32 /nologo |
4418 | # ADD BSC32 /nologo |
4419 | LINK32=link.exe |
4420 | -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 |
4421 | -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\tests\libticables2-1.dll" |
4422 | +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /machine:I386 |
4423 | +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\tests\libticables2-2.dll" |
4424 | |
4425 | !ELSEIF "$(CFG)" == "ticables2 - Win32 Debug" |
4426 | |
4427 | @@ -64,12 +64,12 @@ |
4428 | # PROP BASE Target_Dir "" |
4429 | # PROP Use_MFC 0 |
4430 | # PROP Use_Debug_Libraries 1 |
4431 | -# PROP Output_Dir "C:\msvc\tilp2" |
4432 | -# PROP Intermediate_Dir "C:\msvc\Output\ticables2" |
4433 | +# PROP Output_Dir "c:\lpg\msvc" |
4434 | +# PROP Intermediate_Dir "C:\lpg\msvc\Output\ticables2" |
4435 | # PROP Ignore_Export_Lib 0 |
4436 | # PROP Target_Dir "" |
4437 | # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c |
4438 | -# ADD CPP /nologo /MD /W3 /GX /ZI /Od /I "C:\Gtk2Dev\include" /I "c:\gtk2dev\include\glib-2.0" /I "C:\GTK2DEV\lib\glib-2.0\include" /D "_DEBUG" /D "_CONSOLE" /D "ENABLE_LOGGING" /D "ENABLE_NLS" /D "WIN32" /D "TICABLES_EXPORTS" /D "__WIN32__" /D "__I386__" /FD /c |
4439 | +# ADD CPP /nologo /MD /W3 /GX /ZI /Od /I "c:\lpg\gtk\include" /I "c:\lpg\gtk\include\glib-2.0" /I "c:\lpg\gtk\lib\glib-2.0\include" /D "_DEBUG" /D "_CONSOLE" /D "ENABLE_LOGGING" /D "ENABLE_NLS" /D "WIN32" /D "TICABLES_EXPORTS" /D "__WIN32__" /D "__I386__" /FD /c |
4440 | # SUBTRACT CPP /Fr /YX |
4441 | # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" |
4442 | # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" |
4443 | @@ -79,8 +79,8 @@ |
4444 | # ADD BASE BSC32 /nologo |
4445 | # SUBTRACT BSC32 /nologo |
4446 | LINK32=link.exe |
4447 | -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept |
4448 | -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /debugtype:both /machine:I386 /out:"C:\msvc\tilp2\libticables2-1.dll" /pdbtype:sept |
4449 | +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept |
4450 | +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /debug /debugtype:both /machine:I386 /out:"c:\lpg\msvc\libticables2-2.dll" /pdbtype:sept |
4451 | # SUBTRACT LINK32 /map |
4452 | |
4453 | !ENDIF |
4454 | @@ -243,15 +243,15 @@ |
4455 | # End Source File |
4456 | # Begin Source File |
4457 | |
4458 | -SOURCE="..\..\..\..\..\GTK2DEV\lib\glib-2.0.lib" |
4459 | -# End Source File |
4460 | -# Begin Source File |
4461 | - |
4462 | -SOURCE=..\..\..\..\..\GTK2DEV\lib\intl.lib |
4463 | -# End Source File |
4464 | -# Begin Source File |
4465 | - |
4466 | -SOURCE="..\..\..\libusb-win32\lib\msvc\libusb.lib" |
4467 | +SOURCE="C:\LPG\GTK\lib\glib-2.0.lib" |
4468 | +# End Source File |
4469 | +# Begin Source File |
4470 | + |
4471 | +SOURCE=C:\LPG\GTK\lib\intl.lib |
4472 | +# End Source File |
4473 | +# Begin Source File |
4474 | + |
4475 | +SOURCE="C:\lpg\libusb-win32\lib\msvc\libusb.lib" |
4476 | # End Source File |
4477 | # End Target |
4478 | # End Project |
4479 | |
4480 | === modified file 'config.guess' |
4481 | --- config.guess 2009-05-17 13:34:18 +0000 |
4482 | +++ config.guess 2010-02-23 21:48:16 +0000 |
4483 | @@ -1,10 +1,10 @@ |
4484 | #! /bin/sh |
4485 | # Attempt to guess a canonical system name. |
4486 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
4487 | -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, |
4488 | -# Inc. |
4489 | +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 |
4490 | +# Free Software Foundation, Inc. |
4491 | |
4492 | -timestamp='2006-07-02' |
4493 | +timestamp='2008-01-23' |
4494 | |
4495 | # This file is free software; you can redistribute it and/or modify it |
4496 | # under the terms of the GNU General Public License as published by |
4497 | @@ -56,8 +56,8 @@ |
4498 | GNU config.guess ($timestamp) |
4499 | |
4500 | Originally written by Per Bothner. |
4501 | -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 |
4502 | -Free Software Foundation, Inc. |
4503 | +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, |
4504 | +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
4505 | |
4506 | This is free software; see the source for copying conditions. There is NO |
4507 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
4508 | @@ -161,6 +161,7 @@ |
4509 | arm*) machine=arm-unknown ;; |
4510 | sh3el) machine=shl-unknown ;; |
4511 | sh3eb) machine=sh-unknown ;; |
4512 | + sh5el) machine=sh5le-unknown ;; |
4513 | *) machine=${UNAME_MACHINE_ARCH}-unknown ;; |
4514 | esac |
4515 | # The Operating System including object format, if it has switched |
4516 | @@ -329,7 +330,7 @@ |
4517 | sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) |
4518 | echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
4519 | exit ;; |
4520 | - i86pc:SunOS:5.*:*) |
4521 | + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) |
4522 | echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
4523 | exit ;; |
4524 | sun4*:SunOS:6*:*) |
4525 | @@ -531,7 +532,7 @@ |
4526 | echo rs6000-ibm-aix3.2 |
4527 | fi |
4528 | exit ;; |
4529 | - *:AIX:*:[45]) |
4530 | + *:AIX:*:[456]) |
4531 | IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` |
4532 | if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then |
4533 | IBM_ARCH=rs6000 |
4534 | @@ -780,7 +781,7 @@ |
4535 | i*:CYGWIN*:*) |
4536 | echo ${UNAME_MACHINE}-pc-cygwin |
4537 | exit ;; |
4538 | - i*:MINGW*:*) |
4539 | + *:MINGW*:*) |
4540 | echo ${UNAME_MACHINE}-pc-mingw32 |
4541 | exit ;; |
4542 | i*:windows32*:*) |
4543 | @@ -790,12 +791,18 @@ |
4544 | i*:PW*:*) |
4545 | echo ${UNAME_MACHINE}-pc-pw32 |
4546 | exit ;; |
4547 | - x86:Interix*:[3456]*) |
4548 | - echo i586-pc-interix${UNAME_RELEASE} |
4549 | - exit ;; |
4550 | - EM64T:Interix*:[3456]*) |
4551 | - echo x86_64-unknown-interix${UNAME_RELEASE} |
4552 | - exit ;; |
4553 | + *:Interix*:[3456]*) |
4554 | + case ${UNAME_MACHINE} in |
4555 | + x86) |
4556 | + echo i586-pc-interix${UNAME_RELEASE} |
4557 | + exit ;; |
4558 | + EM64T | authenticamd) |
4559 | + echo x86_64-unknown-interix${UNAME_RELEASE} |
4560 | + exit ;; |
4561 | + IA64) |
4562 | + echo ia64-unknown-interix${UNAME_RELEASE} |
4563 | + exit ;; |
4564 | + esac ;; |
4565 | [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) |
4566 | echo i${UNAME_MACHINE}-pc-mks |
4567 | exit ;; |
4568 | @@ -829,7 +836,14 @@ |
4569 | echo ${UNAME_MACHINE}-pc-minix |
4570 | exit ;; |
4571 | arm*:Linux:*:*) |
4572 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
4573 | + eval $set_cc_for_build |
4574 | + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
4575 | + | grep -q __ARM_EABI__ |
4576 | + then |
4577 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
4578 | + else |
4579 | + echo ${UNAME_MACHINE}-unknown-linux-gnueabi |
4580 | + fi |
4581 | exit ;; |
4582 | avr32*:Linux:*:*) |
4583 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
4584 | @@ -950,6 +964,9 @@ |
4585 | x86_64:Linux:*:*) |
4586 | echo x86_64-unknown-linux-gnu |
4587 | exit ;; |
4588 | + xtensa*:Linux:*:*) |
4589 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
4590 | + exit ;; |
4591 | i*86:Linux:*:*) |
4592 | # The BFD linker knows what the default object file format is, so |
4593 | # first see if it will tell us. cd to the root directory to prevent |
4594 | @@ -1208,6 +1225,15 @@ |
4595 | SX-6:SUPER-UX:*:*) |
4596 | echo sx6-nec-superux${UNAME_RELEASE} |
4597 | exit ;; |
4598 | + SX-7:SUPER-UX:*:*) |
4599 | + echo sx7-nec-superux${UNAME_RELEASE} |
4600 | + exit ;; |
4601 | + SX-8:SUPER-UX:*:*) |
4602 | + echo sx8-nec-superux${UNAME_RELEASE} |
4603 | + exit ;; |
4604 | + SX-8R:SUPER-UX:*:*) |
4605 | + echo sx8r-nec-superux${UNAME_RELEASE} |
4606 | + exit ;; |
4607 | Power*:Rhapsody:*:*) |
4608 | echo powerpc-apple-rhapsody${UNAME_RELEASE} |
4609 | exit ;; |
4610 | @@ -1458,9 +1484,9 @@ |
4611 | the operating system you are using. It is advised that you |
4612 | download the most up to date version of the config scripts from |
4613 | |
4614 | - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess |
4615 | + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD |
4616 | and |
4617 | - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub |
4618 | + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD |
4619 | |
4620 | If the version you run ($0) is already up to date, please |
4621 | send the following data and any information you think might be |
4622 | |
4623 | === modified file 'config.sub' |
4624 | --- config.sub 2009-05-17 13:34:18 +0000 |
4625 | +++ config.sub 2010-02-23 21:48:16 +0000 |
4626 | @@ -1,10 +1,10 @@ |
4627 | #! /bin/sh |
4628 | # Configuration validation subroutine script. |
4629 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
4630 | -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, |
4631 | -# Inc. |
4632 | +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 |
4633 | +# Free Software Foundation, Inc. |
4634 | |
4635 | -timestamp='2006-07-02' |
4636 | +timestamp='2008-01-16' |
4637 | |
4638 | # This file is (in principle) common to ALL GNU software. |
4639 | # The presence of a machine in this file suggests that SOME GNU software |
4640 | @@ -72,8 +72,8 @@ |
4641 | version="\ |
4642 | GNU config.sub ($timestamp) |
4643 | |
4644 | -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 |
4645 | -Free Software Foundation, Inc. |
4646 | +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, |
4647 | +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
4648 | |
4649 | This is free software; see the source for copying conditions. There is NO |
4650 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
4651 | @@ -245,12 +245,12 @@ |
4652 | | bfin \ |
4653 | | c4x | clipper \ |
4654 | | d10v | d30v | dlx | dsp16xx \ |
4655 | - | fr30 | frv \ |
4656 | + | fido | fr30 | frv \ |
4657 | | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ |
4658 | | i370 | i860 | i960 | ia64 \ |
4659 | | ip2k | iq2000 \ |
4660 | | m32c | m32r | m32rle | m68000 | m68k | m88k \ |
4661 | - | maxq | mb | microblaze | mcore \ |
4662 | + | maxq | mb | microblaze | mcore | mep \ |
4663 | | mips | mipsbe | mipseb | mipsel | mipsle \ |
4664 | | mips16 \ |
4665 | | mips64 | mips64el \ |
4666 | @@ -276,6 +276,7 @@ |
4667 | | pdp10 | pdp11 | pj | pjl \ |
4668 | | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ |
4669 | | pyramid \ |
4670 | + | score \ |
4671 | | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ |
4672 | | sh64 | sh64le \ |
4673 | | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ |
4674 | @@ -284,7 +285,7 @@ |
4675 | | tahoe | thumb | tic4x | tic80 | tron \ |
4676 | | v850 | v850e \ |
4677 | | we32k \ |
4678 | - | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ |
4679 | + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ |
4680 | | z8k) |
4681 | basic_machine=$basic_machine-unknown |
4682 | ;; |
4683 | @@ -323,7 +324,7 @@ |
4684 | | clipper-* | craynv-* | cydra-* \ |
4685 | | d10v-* | d30v-* | dlx-* \ |
4686 | | elxsi-* \ |
4687 | - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ |
4688 | + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ |
4689 | | h8300-* | h8500-* \ |
4690 | | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ |
4691 | | i*86-* | i860-* | i960-* | ia64-* \ |
4692 | @@ -367,11 +368,15 @@ |
4693 | | tron-* \ |
4694 | | v850-* | v850e-* | vax-* \ |
4695 | | we32k-* \ |
4696 | - | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ |
4697 | - | xstormy16-* | xtensa-* \ |
4698 | + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ |
4699 | + | xstormy16-* | xtensa*-* \ |
4700 | | ymp-* \ |
4701 | | z8k-*) |
4702 | ;; |
4703 | + # Recognize the basic CPU types without company name, with glob match. |
4704 | + xtensa*) |
4705 | + basic_machine=$basic_machine-unknown |
4706 | + ;; |
4707 | # Recognize the various machine names and aliases which stand |
4708 | # for a CPU type and a company and sometimes even an OS. |
4709 | 386bsd) |
4710 | @@ -442,6 +447,14 @@ |
4711 | basic_machine=ns32k-sequent |
4712 | os=-dynix |
4713 | ;; |
4714 | + blackfin) |
4715 | + basic_machine=bfin-unknown |
4716 | + os=-linux |
4717 | + ;; |
4718 | + blackfin-*) |
4719 | + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` |
4720 | + os=-linux |
4721 | + ;; |
4722 | c90) |
4723 | basic_machine=c90-cray |
4724 | os=-unicos |
4725 | @@ -474,8 +487,8 @@ |
4726 | basic_machine=craynv-cray |
4727 | os=-unicosmp |
4728 | ;; |
4729 | - cr16c) |
4730 | - basic_machine=cr16c-unknown |
4731 | + cr16) |
4732 | + basic_machine=cr16-unknown |
4733 | os=-elf |
4734 | ;; |
4735 | crds | unos) |
4736 | @@ -667,6 +680,14 @@ |
4737 | basic_machine=m68k-isi |
4738 | os=-sysv |
4739 | ;; |
4740 | + m68knommu) |
4741 | + basic_machine=m68k-unknown |
4742 | + os=-linux |
4743 | + ;; |
4744 | + m68knommu-*) |
4745 | + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` |
4746 | + os=-linux |
4747 | + ;; |
4748 | m88k-omron*) |
4749 | basic_machine=m88k-omron |
4750 | ;; |
4751 | @@ -682,6 +703,10 @@ |
4752 | basic_machine=i386-pc |
4753 | os=-mingw32 |
4754 | ;; |
4755 | + mingw32ce) |
4756 | + basic_machine=arm-unknown |
4757 | + os=-mingw32ce |
4758 | + ;; |
4759 | miniframe) |
4760 | basic_machine=m68000-convergent |
4761 | ;; |
4762 | @@ -808,6 +833,14 @@ |
4763 | basic_machine=i860-intel |
4764 | os=-osf |
4765 | ;; |
4766 | + parisc) |
4767 | + basic_machine=hppa-unknown |
4768 | + os=-linux |
4769 | + ;; |
4770 | + parisc-*) |
4771 | + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` |
4772 | + os=-linux |
4773 | + ;; |
4774 | pbd) |
4775 | basic_machine=sparc-tti |
4776 | ;; |
4777 | @@ -909,6 +942,10 @@ |
4778 | sb1el) |
4779 | basic_machine=mipsisa64sb1el-unknown |
4780 | ;; |
4781 | + sde) |
4782 | + basic_machine=mipsisa32-sde |
4783 | + os=-elf |
4784 | + ;; |
4785 | sei) |
4786 | basic_machine=mips-sei |
4787 | os=-seiux |
4788 | @@ -920,6 +957,9 @@ |
4789 | basic_machine=sh-hitachi |
4790 | os=-hms |
4791 | ;; |
4792 | + sh5el) |
4793 | + basic_machine=sh5le-unknown |
4794 | + ;; |
4795 | sh64) |
4796 | basic_machine=sh64-unknown |
4797 | ;; |
4798 | @@ -1009,6 +1049,10 @@ |
4799 | basic_machine=tic6x-unknown |
4800 | os=-coff |
4801 | ;; |
4802 | + tile*) |
4803 | + basic_machine=tile-unknown |
4804 | + os=-linux-gnu |
4805 | + ;; |
4806 | tx39) |
4807 | basic_machine=mipstx39-unknown |
4808 | ;; |
4809 | @@ -1214,7 +1258,7 @@ |
4810 | | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ |
4811 | | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ |
4812 | | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ |
4813 | - | -skyos* | -haiku* | -rdos* | -toppers*) |
4814 | + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) |
4815 | # Remember, each alternative MUST END IN *, to match a version number. |
4816 | ;; |
4817 | -qnx*) |
4818 | @@ -1366,6 +1410,9 @@ |
4819 | # system, and we'll never get to this point. |
4820 | |
4821 | case $basic_machine in |
4822 | + score-*) |
4823 | + os=-elf |
4824 | + ;; |
4825 | spu-*) |
4826 | os=-elf |
4827 | ;; |
4828 | @@ -1406,6 +1453,9 @@ |
4829 | m68*-cisco) |
4830 | os=-aout |
4831 | ;; |
4832 | + mep-*) |
4833 | + os=-elf |
4834 | + ;; |
4835 | mips*-cisco) |
4836 | os=-elf |
4837 | ;; |
4838 | |
4839 | === modified file 'configure' |
4840 | --- configure 2009-05-17 13:34:18 +0000 |
4841 | +++ configure 2010-02-23 21:48:16 +0000 |
4842 | @@ -1,6 +1,6 @@ |
4843 | #! /bin/sh |
4844 | # Guess values for system-dependent variables and create Makefiles. |
4845 | -# Generated by GNU Autoconf 2.61 for libticables2 1.2.0. |
4846 | +# Generated by GNU Autoconf 2.61 for libticables2 1.3.0. |
4847 | # |
4848 | # Report bugs to <tilp-users@lists.sourceforge.net>. |
4849 | # |
4850 | @@ -728,8 +728,8 @@ |
4851 | # Identity of this package. |
4852 | PACKAGE_NAME='libticables2' |
4853 | PACKAGE_TARNAME='libticables2' |
4854 | -PACKAGE_VERSION='1.2.0' |
4855 | -PACKAGE_STRING='libticables2 1.2.0' |
4856 | +PACKAGE_VERSION='1.3.0' |
4857 | +PACKAGE_STRING='libticables2 1.3.0' |
4858 | PACKAGE_BUGREPORT='tilp-users@lists.sourceforge.net' |
4859 | |
4860 | ac_default_prefix=/usr/local |
4861 | @@ -858,12 +858,15 @@ |
4862 | CCDEPMODE |
4863 | am__fastdepCC_TRUE |
4864 | am__fastdepCC_FALSE |
4865 | +SED |
4866 | GREP |
4867 | EGREP |
4868 | LN_S |
4869 | ECHO |
4870 | AR |
4871 | RANLIB |
4872 | +DSYMUTIL |
4873 | +NMEDIT |
4874 | DLLTOOL |
4875 | AS |
4876 | OBJDUMP |
4877 | @@ -884,6 +887,7 @@ |
4878 | USE_DOCGEN_FALSE |
4879 | RC |
4880 | USE_NLS |
4881 | +GETTEXT_MACRO_VERSION |
4882 | MSGFMT |
4883 | GMSGFMT |
4884 | MSGFMT_015 |
4885 | @@ -891,35 +895,10 @@ |
4886 | XGETTEXT |
4887 | XGETTEXT_015 |
4888 | MSGMERGE |
4889 | -GLIBC2 |
4890 | -CFLAG_VISIBILITY |
4891 | -HAVE_VISIBILITY |
4892 | -ALLOCA |
4893 | -PRI_MACROS_BROKEN |
4894 | -LIBPTH |
4895 | -LTLIBPTH |
4896 | -LIBTHREAD |
4897 | -LTLIBTHREAD |
4898 | -LIBMULTITHREAD |
4899 | -LTLIBMULTITHREAD |
4900 | +XGETTEXT_EXTRA_OPTIONS |
4901 | +INTL_MACOSX_LIBS |
4902 | LIBICONV |
4903 | LTLIBICONV |
4904 | -INTLBISON |
4905 | -GLIBC21 |
4906 | -INTL_MACOSX_LIBS |
4907 | -HAVE_POSIX_PRINTF |
4908 | -HAVE_ASPRINTF |
4909 | -HAVE_SNPRINTF |
4910 | -HAVE_WPRINTF |
4911 | -WOE32DLL |
4912 | -BUILD_INCLUDED_LIBINTL |
4913 | -USE_INCLUDED_LIBINTL |
4914 | -CATOBJEXT |
4915 | -DATADIRNAME |
4916 | -INSTOBJEXT |
4917 | -GENCAT |
4918 | -INTLOBJS |
4919 | -INTL_LIBTOOL_SUFFIX_PREFIX |
4920 | INTLLIBS |
4921 | LIBINTL |
4922 | LTLIBINTL |
4923 | @@ -1456,7 +1435,7 @@ |
4924 | # Omit some internal or obsolete options to make the list less imposing. |
4925 | # This message is too long to be a string in the A/UX 3.1 sh. |
4926 | cat <<_ACEOF |
4927 | -\`configure' configures libticables2 1.2.0 to adapt to many kinds of systems. |
4928 | +\`configure' configures libticables2 1.3.0 to adapt to many kinds of systems. |
4929 | |
4930 | Usage: $0 [OPTION]... [VAR=VALUE]... |
4931 | |
4932 | @@ -1526,7 +1505,7 @@ |
4933 | |
4934 | if test -n "$ac_init_help"; then |
4935 | case $ac_init_help in |
4936 | - short | recursive ) echo "Configuration of libticables2 1.2.0:";; |
4937 | + short | recursive ) echo "Configuration of libticables2 1.3.0:";; |
4938 | esac |
4939 | cat <<\_ACEOF |
4940 | |
4941 | @@ -1543,9 +1522,6 @@ |
4942 | --enable-dependency-tracking do not reject slow dependency extractors |
4943 | --disable-libtool-lock avoid locking (might break parallel builds) |
4944 | --disable-nls do not use Native Language Support |
4945 | - --enable-threads={posix|solaris|pth|win32} |
4946 | - specify multithreading API |
4947 | - --disable-threads build without multithread safety |
4948 | --disable-rpath do not hardcode runtime library paths |
4949 | --disable-libusb disable USB support |
4950 | --enable-logging enable logging |
4951 | @@ -1558,11 +1534,8 @@ |
4952 | both] |
4953 | --with-tags[=TAGS] include additional configurations [automatic] |
4954 | --with-gnu-ld assume the C compiler uses GNU ld default=no |
4955 | - --with-libpth-prefix[=DIR] search for libpth in DIR/include and DIR/lib |
4956 | - --without-libpth-prefix don't search for libpth in includedir and libdir |
4957 | --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib |
4958 | --without-libiconv-prefix don't search for libiconv in includedir and libdir |
4959 | - --with-included-gettext use the GNU gettext library included here |
4960 | --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib |
4961 | --without-libintl-prefix don't search for libintl in includedir and libdir |
4962 | |
4963 | @@ -1651,7 +1624,7 @@ |
4964 | test -n "$ac_init_help" && exit $ac_status |
4965 | if $ac_init_version; then |
4966 | cat <<\_ACEOF |
4967 | -libticables2 configure 1.2.0 |
4968 | +libticables2 configure 1.3.0 |
4969 | generated by GNU Autoconf 2.61 |
4970 | |
4971 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, |
4972 | @@ -1665,7 +1638,7 @@ |
4973 | This file contains any messages produced by compilers while |
4974 | running configure, to aid debugging if configure makes a mistake. |
4975 | |
4976 | -It was created by libticables2 $as_me 1.2.0, which was |
4977 | +It was created by libticables2 $as_me 1.3.0, which was |
4978 | generated by GNU Autoconf 2.61. Invocation command line was |
4979 | |
4980 | $ $0 $@ |
4981 | @@ -2020,11 +1993,11 @@ |
4982 | |
4983 | |
4984 | |
4985 | -VERSION="1.2.0" |
4986 | - |
4987 | - |
4988 | -LT_CURRENT=1 |
4989 | -LT_REVISION=16 |
4990 | +VERSION="1.3.0" |
4991 | + |
4992 | + |
4993 | +LT_CURRENT=2 |
4994 | +LT_REVISION=0 |
4995 | LT_AGE=0 |
4996 | LT_LIBVERSION="$LT_CURRENT:$LT_REVISION:$LT_AGE" |
4997 | LT_LIBVERSION=$LT_CURRENT:$LT_REVISION:$LT_AGE |
4998 | @@ -2367,7 +2340,7 @@ |
4999 | |
5000 | # Define the identity of the package. |
The diff has been truncated for viewing.
This libticables merge is part of the "drop the 2 from libti*2" project. We've done the same thing to libtifiles2 and libticalcs2 in Lucid.
The upshot is that once this gets merged into libticables, we can remove the libticables2 package from Lucid.