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 @@ | |||
6 | 1 | SubVersion: $Id: ChangeLog 4035 2007-12-01 14:43:51Z roms $ | 1 | SubVersion: $Id: ChangeLog 4252 2009-05-08 11:28:09Z roms $ |
7 | 2 | 2 | ||
8 | 3 | Log: | 3 | Log: |
9 | 4 | 4 | ||
10 | 5 | - 03/05/2009, version 1.3.0: roms | ||
11 | 6 | - removed obsolete virtual link cable | ||
12 | 7 | - fixed possible buffer overflow in DBUS packet decompiler | ||
13 | 8 | |||
14 | 9 | - 01/01/2009, version 1.2.1: roms | ||
15 | 10 | - modified ticables_string_to_model to be case unsensitive like | ||
16 | 11 | other functions | ||
17 | 12 | - log files are stored now in the user's folder rather than a static location (Vista) | ||
18 | 13 | |||
19 | 5 | - 16/10/2007, version 1.2.0: roms | 14 | - 16/10/2007, version 1.2.0: roms |
20 | 6 | - reverted back a wrong commit done in rev. 3042 (31/10/2006 !!!): | 15 | - reverted back a wrong commit done in rev. 3042 (31/10/2006 !!!): |
21 | 7 | USB reset code had been removed from slv_reset. | 16 | USB reset code had been removed from slv_reset. |
22 | 8 | 17 | ||
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 @@ | |||
28 | 1 | # Makefile.in generated by automake 1.10 from Makefile.am. | 1 | # Makefile.in generated by automake 1.10.1 from Makefile.am. |
29 | 2 | # @configure_input@ | 2 | # @configure_input@ |
30 | 3 | 3 | ||
31 | 4 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | 4 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
33 | 5 | # 2003, 2004, 2005, 2006 Free Software Foundation, Inc. | 5 | # 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
34 | 6 | # This Makefile.in is free software; the Free Software Foundation | 6 | # This Makefile.in is free software; the Free Software Foundation |
35 | 7 | # gives unlimited permission to copy and/or distribute it, | 7 | # gives unlimited permission to copy and/or distribute it, |
36 | 8 | # with or without modifications, as long as this notice is preserved. | 8 | # with or without modifications, as long as this notice is preserved. |
37 | @@ -83,7 +83,6 @@ | |||
38 | 83 | distuninstallcheck_listfiles = find . -type f -print | 83 | distuninstallcheck_listfiles = find . -type f -print |
39 | 84 | distcleancheck_listfiles = find . -type f -print | 84 | distcleancheck_listfiles = find . -type f -print |
40 | 85 | ACLOCAL = @ACLOCAL@ | 85 | ACLOCAL = @ACLOCAL@ |
41 | 86 | ALLOCA = @ALLOCA@ | ||
42 | 87 | AMTAR = @AMTAR@ | 86 | AMTAR = @AMTAR@ |
43 | 88 | AR = @AR@ | 87 | AR = @AR@ |
44 | 89 | AS = @AS@ | 88 | AS = @AS@ |
45 | @@ -91,12 +90,9 @@ | |||
46 | 91 | AUTOHEADER = @AUTOHEADER@ | 90 | AUTOHEADER = @AUTOHEADER@ |
47 | 92 | AUTOMAKE = @AUTOMAKE@ | 91 | AUTOMAKE = @AUTOMAKE@ |
48 | 93 | AWK = @AWK@ | 92 | AWK = @AWK@ |
49 | 94 | BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ | ||
50 | 95 | CATOBJEXT = @CATOBJEXT@ | ||
51 | 96 | CC = @CC@ | 93 | CC = @CC@ |
52 | 97 | CCDEPMODE = @CCDEPMODE@ | 94 | CCDEPMODE = @CCDEPMODE@ |
53 | 98 | CFLAGS = @CFLAGS@ | 95 | CFLAGS = @CFLAGS@ |
54 | 99 | CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ | ||
55 | 100 | CPP = @CPP@ | 96 | CPP = @CPP@ |
56 | 101 | CPPFLAGS = @CPPFLAGS@ | 97 | CPPFLAGS = @CPPFLAGS@ |
57 | 102 | CXX = @CXX@ | 98 | CXX = @CXX@ |
58 | @@ -104,10 +100,10 @@ | |||
59 | 104 | CXXDEPMODE = @CXXDEPMODE@ | 100 | CXXDEPMODE = @CXXDEPMODE@ |
60 | 105 | CXXFLAGS = @CXXFLAGS@ | 101 | CXXFLAGS = @CXXFLAGS@ |
61 | 106 | CYGPATH_W = @CYGPATH_W@ | 102 | CYGPATH_W = @CYGPATH_W@ |
62 | 107 | DATADIRNAME = @DATADIRNAME@ | ||
63 | 108 | DEFS = @DEFS@ | 103 | DEFS = @DEFS@ |
64 | 109 | DEPDIR = @DEPDIR@ | 104 | DEPDIR = @DEPDIR@ |
65 | 110 | DLLTOOL = @DLLTOOL@ | 105 | DLLTOOL = @DLLTOOL@ |
66 | 106 | DSYMUTIL = @DSYMUTIL@ | ||
67 | 111 | ECHO = @ECHO@ | 107 | ECHO = @ECHO@ |
68 | 112 | ECHO_C = @ECHO_C@ | 108 | ECHO_C = @ECHO_C@ |
69 | 113 | ECHO_N = @ECHO_N@ | 109 | ECHO_N = @ECHO_N@ |
70 | @@ -116,48 +112,31 @@ | |||
71 | 116 | EXEEXT = @EXEEXT@ | 112 | EXEEXT = @EXEEXT@ |
72 | 117 | F77 = @F77@ | 113 | F77 = @F77@ |
73 | 118 | FFLAGS = @FFLAGS@ | 114 | FFLAGS = @FFLAGS@ |
77 | 119 | GENCAT = @GENCAT@ | 115 | GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ |
75 | 120 | GLIBC2 = @GLIBC2@ | ||
76 | 121 | GLIBC21 = @GLIBC21@ | ||
78 | 122 | GLIB_CFLAGS = @GLIB_CFLAGS@ | 116 | GLIB_CFLAGS = @GLIB_CFLAGS@ |
79 | 123 | GLIB_LIBS = @GLIB_LIBS@ | 117 | GLIB_LIBS = @GLIB_LIBS@ |
80 | 124 | GMSGFMT = @GMSGFMT@ | 118 | GMSGFMT = @GMSGFMT@ |
81 | 125 | GMSGFMT_015 = @GMSGFMT_015@ | 119 | GMSGFMT_015 = @GMSGFMT_015@ |
82 | 126 | GREP = @GREP@ | 120 | GREP = @GREP@ |
83 | 127 | HAVE_ASPRINTF = @HAVE_ASPRINTF@ | ||
84 | 128 | HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ | ||
85 | 129 | HAVE_SNPRINTF = @HAVE_SNPRINTF@ | ||
86 | 130 | HAVE_VISIBILITY = @HAVE_VISIBILITY@ | ||
87 | 131 | HAVE_WPRINTF = @HAVE_WPRINTF@ | ||
88 | 132 | INSTALL = @INSTALL@ | 121 | INSTALL = @INSTALL@ |
89 | 133 | INSTALL_DATA = @INSTALL_DATA@ | 122 | INSTALL_DATA = @INSTALL_DATA@ |
90 | 134 | INSTALL_PROGRAM = @INSTALL_PROGRAM@ | 123 | INSTALL_PROGRAM = @INSTALL_PROGRAM@ |
91 | 135 | INSTALL_SCRIPT = @INSTALL_SCRIPT@ | 124 | INSTALL_SCRIPT = @INSTALL_SCRIPT@ |
92 | 136 | INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ | 125 | INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ |
93 | 137 | INSTOBJEXT = @INSTOBJEXT@ | ||
94 | 138 | INTLBISON = @INTLBISON@ | ||
95 | 139 | INTLLIBS = @INTLLIBS@ | 126 | INTLLIBS = @INTLLIBS@ |
96 | 140 | INTLOBJS = @INTLOBJS@ | ||
97 | 141 | INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ | ||
98 | 142 | INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ | 127 | INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ |
99 | 143 | LDFLAGS = @LDFLAGS@ | 128 | LDFLAGS = @LDFLAGS@ |
100 | 144 | LIBICONV = @LIBICONV@ | 129 | LIBICONV = @LIBICONV@ |
101 | 145 | LIBINTL = @LIBINTL@ | 130 | LIBINTL = @LIBINTL@ |
102 | 146 | LIBMULTITHREAD = @LIBMULTITHREAD@ | ||
103 | 147 | LIBOBJS = @LIBOBJS@ | 131 | LIBOBJS = @LIBOBJS@ |
104 | 148 | LIBPTH = @LIBPTH@ | ||
105 | 149 | LIBS = @LIBS@ | 132 | LIBS = @LIBS@ |
106 | 150 | LIBTHREAD = @LIBTHREAD@ | ||
107 | 151 | LIBTOOL = @LIBTOOL@ | 133 | LIBTOOL = @LIBTOOL@ |
108 | 152 | LIBUSB_CFLAGS = @LIBUSB_CFLAGS@ | 134 | LIBUSB_CFLAGS = @LIBUSB_CFLAGS@ |
109 | 153 | LIBUSB_LIBS = @LIBUSB_LIBS@ | 135 | LIBUSB_LIBS = @LIBUSB_LIBS@ |
110 | 154 | LN_S = @LN_S@ | 136 | LN_S = @LN_S@ |
111 | 155 | LTLIBICONV = @LTLIBICONV@ | 137 | LTLIBICONV = @LTLIBICONV@ |
112 | 156 | LTLIBINTL = @LTLIBINTL@ | 138 | LTLIBINTL = @LTLIBINTL@ |
113 | 157 | LTLIBMULTITHREAD = @LTLIBMULTITHREAD@ | ||
114 | 158 | LTLIBOBJS = @LTLIBOBJS@ | 139 | LTLIBOBJS = @LTLIBOBJS@ |
115 | 159 | LTLIBPTH = @LTLIBPTH@ | ||
116 | 160 | LTLIBTHREAD = @LTLIBTHREAD@ | ||
117 | 161 | LT_LIBVERSION = @LT_LIBVERSION@ | 140 | LT_LIBVERSION = @LT_LIBVERSION@ |
118 | 162 | MAINT = @MAINT@ | 141 | MAINT = @MAINT@ |
119 | 163 | MAKEINFO = @MAKEINFO@ | 142 | MAKEINFO = @MAKEINFO@ |
120 | @@ -165,6 +144,7 @@ | |||
121 | 165 | MSGFMT = @MSGFMT@ | 144 | MSGFMT = @MSGFMT@ |
122 | 166 | MSGFMT_015 = @MSGFMT_015@ | 145 | MSGFMT_015 = @MSGFMT_015@ |
123 | 167 | MSGMERGE = @MSGMERGE@ | 146 | MSGMERGE = @MSGMERGE@ |
124 | 147 | NMEDIT = @NMEDIT@ | ||
125 | 168 | OBJDUMP = @OBJDUMP@ | 148 | OBJDUMP = @OBJDUMP@ |
126 | 169 | OBJEXT = @OBJEXT@ | 149 | OBJEXT = @OBJEXT@ |
127 | 170 | PACKAGE = @PACKAGE@ | 150 | PACKAGE = @PACKAGE@ |
128 | @@ -176,19 +156,18 @@ | |||
129 | 176 | PATH_SEPARATOR = @PATH_SEPARATOR@ | 156 | PATH_SEPARATOR = @PATH_SEPARATOR@ |
130 | 177 | PKG_CONFIG = @PKG_CONFIG@ | 157 | PKG_CONFIG = @PKG_CONFIG@ |
131 | 178 | POSUB = @POSUB@ | 158 | POSUB = @POSUB@ |
132 | 179 | PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ | ||
133 | 180 | RANLIB = @RANLIB@ | 159 | RANLIB = @RANLIB@ |
134 | 181 | RC = @RC@ | 160 | RC = @RC@ |
135 | 161 | SED = @SED@ | ||
136 | 182 | SET_MAKE = @SET_MAKE@ | 162 | SET_MAKE = @SET_MAKE@ |
137 | 183 | SHELL = @SHELL@ | 163 | SHELL = @SHELL@ |
138 | 184 | STRIP = @STRIP@ | 164 | STRIP = @STRIP@ |
139 | 185 | TFDOCGEN = @TFDOCGEN@ | 165 | TFDOCGEN = @TFDOCGEN@ |
140 | 186 | USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ | ||
141 | 187 | USE_NLS = @USE_NLS@ | 166 | USE_NLS = @USE_NLS@ |
142 | 188 | VERSION = @VERSION@ | 167 | VERSION = @VERSION@ |
143 | 189 | WOE32DLL = @WOE32DLL@ | ||
144 | 190 | XGETTEXT = @XGETTEXT@ | 168 | XGETTEXT = @XGETTEXT@ |
145 | 191 | XGETTEXT_015 = @XGETTEXT_015@ | 169 | XGETTEXT_015 = @XGETTEXT_015@ |
146 | 170 | XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ | ||
147 | 192 | abs_builddir = @abs_builddir@ | 171 | abs_builddir = @abs_builddir@ |
148 | 193 | abs_srcdir = @abs_srcdir@ | 172 | abs_srcdir = @abs_srcdir@ |
149 | 194 | abs_top_builddir = @abs_top_builddir@ | 173 | abs_top_builddir = @abs_top_builddir@ |
150 | @@ -406,8 +385,8 @@ | |||
151 | 406 | unique=`for i in $$list; do \ | 385 | unique=`for i in $$list; do \ |
152 | 407 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | 386 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
153 | 408 | done | \ | 387 | done | \ |
156 | 409 | $(AWK) ' { files[$$0] = 1; } \ | 388 | $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ |
157 | 410 | END { for (i in files) print i; }'`; \ | 389 | END { if (nonempty) { for (i in files) print i; }; }'`; \ |
158 | 411 | mkid -fID $$unique | 390 | mkid -fID $$unique |
159 | 412 | tags: TAGS | 391 | tags: TAGS |
160 | 413 | 392 | ||
161 | @@ -432,8 +411,8 @@ | |||
162 | 432 | unique=`for i in $$list; do \ | 411 | unique=`for i in $$list; do \ |
163 | 433 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | 412 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
164 | 434 | done | \ | 413 | done | \ |
167 | 435 | $(AWK) ' { files[$$0] = 1; } \ | 414 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
168 | 436 | END { for (i in files) print i; }'`; \ | 415 | END { if (nonempty) { for (i in files) print i; }; }'`; \ |
169 | 437 | if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ | 416 | if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ |
170 | 438 | test -n "$$unique" || unique=$$empty_fix; \ | 417 | test -n "$$unique" || unique=$$empty_fix; \ |
171 | 439 | $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | 418 | $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ |
172 | @@ -443,13 +422,12 @@ | |||
173 | 443 | CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ | 422 | CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ |
174 | 444 | $(TAGS_FILES) $(LISP) | 423 | $(TAGS_FILES) $(LISP) |
175 | 445 | tags=; \ | 424 | tags=; \ |
176 | 446 | here=`pwd`; \ | ||
177 | 447 | list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ | 425 | list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ |
178 | 448 | unique=`for i in $$list; do \ | 426 | unique=`for i in $$list; do \ |
179 | 449 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | 427 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
180 | 450 | done | \ | 428 | done | \ |
183 | 451 | $(AWK) ' { files[$$0] = 1; } \ | 429 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
184 | 452 | END { for (i in files) print i; }'`; \ | 430 | END { if (nonempty) { for (i in files) print i; }; }'`; \ |
185 | 453 | test -z "$(CTAGS_ARGS)$$tags$$unique" \ | 431 | test -z "$(CTAGS_ARGS)$$tags$$unique" \ |
186 | 454 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ | 432 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ |
187 | 455 | $$tags $$unique | 433 | $$tags $$unique |
188 | @@ -519,6 +497,10 @@ | |||
189 | 519 | tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 | 497 | tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 |
190 | 520 | $(am__remove_distdir) | 498 | $(am__remove_distdir) |
191 | 521 | 499 | ||
192 | 500 | dist-lzma: distdir | ||
193 | 501 | tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma | ||
194 | 502 | $(am__remove_distdir) | ||
195 | 503 | |||
196 | 522 | dist-tarZ: distdir | 504 | dist-tarZ: distdir |
197 | 523 | tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z | 505 | tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z |
198 | 524 | $(am__remove_distdir) | 506 | $(am__remove_distdir) |
199 | @@ -546,6 +528,8 @@ | |||
200 | 546 | GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ | 528 | GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ |
201 | 547 | *.tar.bz2*) \ | 529 | *.tar.bz2*) \ |
202 | 548 | bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ | 530 | bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ |
203 | 531 | *.tar.lzma*) \ | ||
204 | 532 | unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ | ||
205 | 549 | *.tar.Z*) \ | 533 | *.tar.Z*) \ |
206 | 550 | uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ | 534 | uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ |
207 | 551 | *.shar.gz*) \ | 535 | *.shar.gz*) \ |
208 | @@ -561,7 +545,6 @@ | |||
209 | 561 | && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ | 545 | && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ |
210 | 562 | && cd $(distdir)/_build \ | 546 | && cd $(distdir)/_build \ |
211 | 563 | && ../configure --srcdir=.. --prefix="$$dc_install_base" \ | 547 | && ../configure --srcdir=.. --prefix="$$dc_install_base" \ |
212 | 564 | --with-included-gettext \ | ||
213 | 565 | $(DISTCHECK_CONFIGURE_FLAGS) \ | 548 | $(DISTCHECK_CONFIGURE_FLAGS) \ |
214 | 566 | && $(MAKE) $(AM_MAKEFLAGS) \ | 549 | && $(MAKE) $(AM_MAKEFLAGS) \ |
215 | 567 | && $(MAKE) $(AM_MAKEFLAGS) dvi \ | 550 | && $(MAKE) $(AM_MAKEFLAGS) dvi \ |
216 | @@ -701,8 +684,8 @@ | |||
217 | 701 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ | 684 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ |
218 | 702 | all all-am am--refresh check check-am clean clean-generic \ | 685 | all all-am am--refresh check check-am clean clean-generic \ |
219 | 703 | clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ | 686 | clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ |
222 | 704 | dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \ | 687 | dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \ |
223 | 705 | distclean-generic distclean-hdr distclean-libtool \ | 688 | distclean distclean-generic distclean-hdr distclean-libtool \ |
224 | 706 | distclean-tags distcleancheck distdir distuninstallcheck dvi \ | 689 | distclean-tags distcleancheck distdir distuninstallcheck dvi \ |
225 | 707 | dvi-am html html-am info info-am install install-am \ | 690 | dvi-am html html-am info info-am install install-am \ |
226 | 708 | install-data install-data-am install-dvi install-dvi-am \ | 691 | install-data install-data-am install-dvi install-dvi-am \ |
227 | 709 | 692 | ||
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 | 67 | Copyright | 67 | Copyright |
233 | 68 | -------------------------------------------------------------------------- | 68 | -------------------------------------------------------------------------- |
234 | 69 | 69 | ||
236 | 70 | ticables library is Copyright (C) 1999-2007 by the TiLP team: | 70 | ticables library is Copyright (C) 1999-2009 by the TiLP team: |
237 | 71 | <tilp-users@lists.sf.net> | 71 | <tilp-users@lists.sf.net> |
238 | 72 | 72 | ||
239 | 73 | Copying is allowed under the terms of GNU General Public | 73 | Copying is allowed under the terms of GNU General Public |
240 | 74 | 74 | ||
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 @@ | |||
246 | 1 | # generated automatically by aclocal 1.10 -*- Autoconf -*- | 1 | # generated automatically by aclocal 1.10.1 -*- Autoconf -*- |
247 | 2 | 2 | ||
248 | 3 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, | 3 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
250 | 4 | # 2005, 2006 Free Software Foundation, Inc. | 4 | # 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
251 | 5 | # This file is free software; the Free Software Foundation | 5 | # This file is free software; the Free Software Foundation |
252 | 6 | # gives unlimited permission to copy and/or distribute it, | 6 | # gives unlimited permission to copy and/or distribute it, |
253 | 7 | # with or without modifications, as long as this notice is preserved. | 7 | # with or without modifications, as long as this notice is preserved. |
254 | @@ -11,35 +11,16 @@ | |||
255 | 11 | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A | 11 | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
256 | 12 | # PARTICULAR PURPOSE. | 12 | # PARTICULAR PURPOSE. |
257 | 13 | 13 | ||
287 | 14 | m4_if(m4_PACKAGE_VERSION, [2.61],, | 14 | m4_ifndef([AC_AUTOCONF_VERSION], |
288 | 15 | [m4_fatal([this file was generated for autoconf 2.61. | 15 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
289 | 16 | You have another version of autoconf. If you want to use that, | 16 | m4_if(AC_AUTOCONF_VERSION, [2.61],, |
290 | 17 | you should regenerate the build system entirely.], [63])]) | 17 | [m4_warning([this file was generated for autoconf 2.61. |
291 | 18 | 18 | You have another version of autoconf. It may work, but is not guaranteed to. | |
292 | 19 | # codeset.m4 serial 2 (gettext-0.16) | 19 | If you have problems, you may need to regenerate the build system entirely. |
293 | 20 | dnl Copyright (C) 2000-2002, 2006 Free Software Foundation, Inc. | 20 | To do so, use the procedure documented by the package, typically `autoreconf'.])]) |
294 | 21 | dnl This file is free software; the Free Software Foundation | 21 | |
295 | 22 | dnl gives unlimited permission to copy and/or distribute it, | 22 | # gettext.m4 serial 60 (gettext-0.17) |
296 | 23 | dnl with or without modifications, as long as this notice is preserved. | 23 | dnl Copyright (C) 1995-2007 Free Software Foundation, Inc. |
268 | 24 | |||
269 | 25 | dnl From Bruno Haible. | ||
270 | 26 | |||
271 | 27 | AC_DEFUN([AM_LANGINFO_CODESET], | ||
272 | 28 | [ | ||
273 | 29 | AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset, | ||
274 | 30 | [AC_TRY_LINK([#include <langinfo.h>], | ||
275 | 31 | [char* cs = nl_langinfo(CODESET); return !cs;], | ||
276 | 32 | am_cv_langinfo_codeset=yes, | ||
277 | 33 | am_cv_langinfo_codeset=no) | ||
278 | 34 | ]) | ||
279 | 35 | if test $am_cv_langinfo_codeset = yes; then | ||
280 | 36 | AC_DEFINE(HAVE_LANGINFO_CODESET, 1, | ||
281 | 37 | [Define if you have <langinfo.h> and nl_langinfo(CODESET).]) | ||
282 | 38 | fi | ||
283 | 39 | ]) | ||
284 | 40 | |||
285 | 41 | # gettext.m4 serial 59 (gettext-0.16.1) | ||
286 | 42 | dnl Copyright (C) 1995-2006 Free Software Foundation, Inc. | ||
297 | 43 | dnl This file is free software; the Free Software Foundation | 24 | dnl This file is free software; the Free Software Foundation |
298 | 44 | dnl gives unlimited permission to copy and/or distribute it, | 25 | dnl gives unlimited permission to copy and/or distribute it, |
299 | 45 | dnl with or without modifications, as long as this notice is preserved. | 26 | dnl with or without modifications, as long as this notice is preserved. |
300 | @@ -402,44 +383,6 @@ | |||
301 | 402 | ]) | 383 | ]) |
302 | 403 | 384 | ||
303 | 404 | 385 | ||
304 | 405 | dnl Checks for special options needed on MacOS X. | ||
305 | 406 | dnl Defines INTL_MACOSX_LIBS. | ||
306 | 407 | AC_DEFUN([gt_INTL_MACOSX], | ||
307 | 408 | [ | ||
308 | 409 | dnl Check for API introduced in MacOS X 10.2. | ||
309 | 410 | AC_CACHE_CHECK([for CFPreferencesCopyAppValue], | ||
310 | 411 | gt_cv_func_CFPreferencesCopyAppValue, | ||
311 | 412 | [gt_save_LIBS="$LIBS" | ||
312 | 413 | LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" | ||
313 | 414 | AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>], | ||
314 | 415 | [CFPreferencesCopyAppValue(NULL, NULL)], | ||
315 | 416 | [gt_cv_func_CFPreferencesCopyAppValue=yes], | ||
316 | 417 | [gt_cv_func_CFPreferencesCopyAppValue=no]) | ||
317 | 418 | LIBS="$gt_save_LIBS"]) | ||
318 | 419 | if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then | ||
319 | 420 | AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1, | ||
320 | 421 | [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) | ||
321 | 422 | fi | ||
322 | 423 | dnl Check for API introduced in MacOS X 10.3. | ||
323 | 424 | AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent, | ||
324 | 425 | [gt_save_LIBS="$LIBS" | ||
325 | 426 | LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" | ||
326 | 427 | AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();], | ||
327 | 428 | [gt_cv_func_CFLocaleCopyCurrent=yes], | ||
328 | 429 | [gt_cv_func_CFLocaleCopyCurrent=no]) | ||
329 | 430 | LIBS="$gt_save_LIBS"]) | ||
330 | 431 | if test $gt_cv_func_CFLocaleCopyCurrent = yes; then | ||
331 | 432 | AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1, | ||
332 | 433 | [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) | ||
333 | 434 | fi | ||
334 | 435 | INTL_MACOSX_LIBS= | ||
335 | 436 | if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then | ||
336 | 437 | INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" | ||
337 | 438 | fi | ||
338 | 439 | AC_SUBST([INTL_MACOSX_LIBS]) | ||
339 | 440 | ]) | ||
340 | 441 | |||
341 | 442 | |||
342 | 443 | dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized. | 386 | dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized. |
343 | 444 | m4_define([gt_NEEDS_INIT], | 387 | m4_define([gt_NEEDS_INIT], |
344 | 445 | [ | 388 | [ |
345 | @@ -458,70 +401,8 @@ | |||
346 | 458 | dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version]) | 401 | dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version]) |
347 | 459 | AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) | 402 | AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) |
348 | 460 | 403 | ||
413 | 461 | # glibc2.m4 serial 1 | 404 | # iconv.m4 serial AM6 (gettext-0.17) |
414 | 462 | dnl Copyright (C) 2000-2002, 2004 Free Software Foundation, Inc. | 405 | dnl Copyright (C) 2000-2002, 2007 Free Software Foundation, Inc. |
351 | 463 | dnl This file is free software; the Free Software Foundation | ||
352 | 464 | dnl gives unlimited permission to copy and/or distribute it, | ||
353 | 465 | dnl with or without modifications, as long as this notice is preserved. | ||
354 | 466 | |||
355 | 467 | # Test for the GNU C Library, version 2.0 or newer. | ||
356 | 468 | # From Bruno Haible. | ||
357 | 469 | |||
358 | 470 | AC_DEFUN([gt_GLIBC2], | ||
359 | 471 | [ | ||
360 | 472 | AC_CACHE_CHECK(whether we are using the GNU C Library 2 or newer, | ||
361 | 473 | ac_cv_gnu_library_2, | ||
362 | 474 | [AC_EGREP_CPP([Lucky GNU user], | ||
363 | 475 | [ | ||
364 | 476 | #include <features.h> | ||
365 | 477 | #ifdef __GNU_LIBRARY__ | ||
366 | 478 | #if (__GLIBC__ >= 2) | ||
367 | 479 | Lucky GNU user | ||
368 | 480 | #endif | ||
369 | 481 | #endif | ||
370 | 482 | ], | ||
371 | 483 | ac_cv_gnu_library_2=yes, | ||
372 | 484 | ac_cv_gnu_library_2=no) | ||
373 | 485 | ] | ||
374 | 486 | ) | ||
375 | 487 | AC_SUBST(GLIBC2) | ||
376 | 488 | GLIBC2="$ac_cv_gnu_library_2" | ||
377 | 489 | ] | ||
378 | 490 | ) | ||
379 | 491 | |||
380 | 492 | # glibc21.m4 serial 3 | ||
381 | 493 | dnl Copyright (C) 2000-2002, 2004 Free Software Foundation, Inc. | ||
382 | 494 | dnl This file is free software; the Free Software Foundation | ||
383 | 495 | dnl gives unlimited permission to copy and/or distribute it, | ||
384 | 496 | dnl with or without modifications, as long as this notice is preserved. | ||
385 | 497 | |||
386 | 498 | # Test for the GNU C Library, version 2.1 or newer. | ||
387 | 499 | # From Bruno Haible. | ||
388 | 500 | |||
389 | 501 | AC_DEFUN([gl_GLIBC21], | ||
390 | 502 | [ | ||
391 | 503 | AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer, | ||
392 | 504 | ac_cv_gnu_library_2_1, | ||
393 | 505 | [AC_EGREP_CPP([Lucky GNU user], | ||
394 | 506 | [ | ||
395 | 507 | #include <features.h> | ||
396 | 508 | #ifdef __GNU_LIBRARY__ | ||
397 | 509 | #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) | ||
398 | 510 | Lucky GNU user | ||
399 | 511 | #endif | ||
400 | 512 | #endif | ||
401 | 513 | ], | ||
402 | 514 | ac_cv_gnu_library_2_1=yes, | ||
403 | 515 | ac_cv_gnu_library_2_1=no) | ||
404 | 516 | ] | ||
405 | 517 | ) | ||
406 | 518 | AC_SUBST(GLIBC21) | ||
407 | 519 | GLIBC21="$ac_cv_gnu_library_2_1" | ||
408 | 520 | ] | ||
409 | 521 | ) | ||
410 | 522 | |||
411 | 523 | # iconv.m4 serial AM4 (gettext-0.11.3) | ||
412 | 524 | dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. | ||
415 | 525 | dnl This file is free software; the Free Software Foundation | 406 | dnl This file is free software; the Free Software Foundation |
416 | 526 | dnl gives unlimited permission to copy and/or distribute it, | 407 | dnl gives unlimited permission to copy and/or distribute it, |
417 | 527 | dnl with or without modifications, as long as this notice is preserved. | 408 | dnl with or without modifications, as long as this notice is preserved. |
418 | @@ -543,6 +424,7 @@ | |||
419 | 543 | [ | 424 | [ |
420 | 544 | dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and | 425 | dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and |
421 | 545 | dnl those with the standalone portable GNU libiconv installed). | 426 | dnl those with the standalone portable GNU libiconv installed). |
422 | 427 | AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles | ||
423 | 546 | 428 | ||
424 | 547 | dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV | 429 | dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV |
425 | 548 | dnl accordingly. | 430 | dnl accordingly. |
426 | @@ -555,7 +437,7 @@ | |||
427 | 555 | am_save_CPPFLAGS="$CPPFLAGS" | 437 | am_save_CPPFLAGS="$CPPFLAGS" |
428 | 556 | AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) | 438 | AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) |
429 | 557 | 439 | ||
431 | 558 | AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [ | 440 | AC_CACHE_CHECK([for iconv], am_cv_func_iconv, [ |
432 | 559 | am_cv_func_iconv="no, consider installing GNU libiconv" | 441 | am_cv_func_iconv="no, consider installing GNU libiconv" |
433 | 560 | am_cv_lib_iconv=no | 442 | am_cv_lib_iconv=no |
434 | 561 | AC_TRY_LINK([#include <stdlib.h> | 443 | AC_TRY_LINK([#include <stdlib.h> |
435 | @@ -578,7 +460,85 @@ | |||
436 | 578 | fi | 460 | fi |
437 | 579 | ]) | 461 | ]) |
438 | 580 | if test "$am_cv_func_iconv" = yes; then | 462 | if test "$am_cv_func_iconv" = yes; then |
440 | 581 | AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.]) | 463 | AC_CACHE_CHECK([for working iconv], am_cv_func_iconv_works, [ |
441 | 464 | dnl This tests against bugs in AIX 5.1 and HP-UX 11.11. | ||
442 | 465 | am_save_LIBS="$LIBS" | ||
443 | 466 | if test $am_cv_lib_iconv = yes; then | ||
444 | 467 | LIBS="$LIBS $LIBICONV" | ||
445 | 468 | fi | ||
446 | 469 | AC_TRY_RUN([ | ||
447 | 470 | #include <iconv.h> | ||
448 | 471 | #include <string.h> | ||
449 | 472 | int main () | ||
450 | 473 | { | ||
451 | 474 | /* Test against AIX 5.1 bug: Failures are not distinguishable from successful | ||
452 | 475 | returns. */ | ||
453 | 476 | { | ||
454 | 477 | iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); | ||
455 | 478 | if (cd_utf8_to_88591 != (iconv_t)(-1)) | ||
456 | 479 | { | ||
457 | 480 | static const char input[] = "\342\202\254"; /* EURO SIGN */ | ||
458 | 481 | char buf[10]; | ||
459 | 482 | const char *inptr = input; | ||
460 | 483 | size_t inbytesleft = strlen (input); | ||
461 | 484 | char *outptr = buf; | ||
462 | 485 | size_t outbytesleft = sizeof (buf); | ||
463 | 486 | size_t res = iconv (cd_utf8_to_88591, | ||
464 | 487 | (char **) &inptr, &inbytesleft, | ||
465 | 488 | &outptr, &outbytesleft); | ||
466 | 489 | if (res == 0) | ||
467 | 490 | return 1; | ||
468 | 491 | } | ||
469 | 492 | } | ||
470 | 493 | #if 0 /* This bug could be worked around by the caller. */ | ||
471 | 494 | /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */ | ||
472 | 495 | { | ||
473 | 496 | iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); | ||
474 | 497 | if (cd_88591_to_utf8 != (iconv_t)(-1)) | ||
475 | 498 | { | ||
476 | 499 | static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; | ||
477 | 500 | char buf[50]; | ||
478 | 501 | const char *inptr = input; | ||
479 | 502 | size_t inbytesleft = strlen (input); | ||
480 | 503 | char *outptr = buf; | ||
481 | 504 | size_t outbytesleft = sizeof (buf); | ||
482 | 505 | size_t res = iconv (cd_88591_to_utf8, | ||
483 | 506 | (char **) &inptr, &inbytesleft, | ||
484 | 507 | &outptr, &outbytesleft); | ||
485 | 508 | if ((int)res > 0) | ||
486 | 509 | return 1; | ||
487 | 510 | } | ||
488 | 511 | } | ||
489 | 512 | #endif | ||
490 | 513 | /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is | ||
491 | 514 | provided. */ | ||
492 | 515 | if (/* Try standardized names. */ | ||
493 | 516 | iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1) | ||
494 | 517 | /* Try IRIX, OSF/1 names. */ | ||
495 | 518 | && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1) | ||
496 | 519 | /* Try AIX names. */ | ||
497 | 520 | && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) | ||
498 | 521 | /* Try HP-UX names. */ | ||
499 | 522 | && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) | ||
500 | 523 | return 1; | ||
501 | 524 | return 0; | ||
502 | 525 | }], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no], | ||
503 | 526 | [case "$host_os" in | ||
504 | 527 | aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; | ||
505 | 528 | *) am_cv_func_iconv_works="guessing yes" ;; | ||
506 | 529 | esac]) | ||
507 | 530 | LIBS="$am_save_LIBS" | ||
508 | 531 | ]) | ||
509 | 532 | case "$am_cv_func_iconv_works" in | ||
510 | 533 | *no) am_func_iconv=no am_cv_lib_iconv=no ;; | ||
511 | 534 | *) am_func_iconv=yes ;; | ||
512 | 535 | esac | ||
513 | 536 | else | ||
514 | 537 | am_func_iconv=no am_cv_lib_iconv=no | ||
515 | 538 | fi | ||
516 | 539 | if test "$am_func_iconv" = yes; then | ||
517 | 540 | AC_DEFINE(HAVE_ICONV, 1, | ||
518 | 541 | [Define if you have the iconv() function and it works.]) | ||
519 | 582 | fi | 542 | fi |
520 | 583 | if test "$am_cv_lib_iconv" = yes; then | 543 | if test "$am_cv_lib_iconv" = yes; then |
521 | 584 | AC_MSG_CHECKING([how to link with libiconv]) | 544 | AC_MSG_CHECKING([how to link with libiconv]) |
522 | @@ -622,464 +582,56 @@ | |||
523 | 622 | fi | 582 | fi |
524 | 623 | ]) | 583 | ]) |
525 | 624 | 584 | ||
984 | 625 | # intdiv0.m4 serial 1 (gettext-0.11.3) | 585 | # intlmacosx.m4 serial 1 (gettext-0.17) |
985 | 626 | dnl Copyright (C) 2002 Free Software Foundation, Inc. | 586 | dnl Copyright (C) 2004-2007 Free Software Foundation, Inc. |
986 | 627 | dnl This file is free software; the Free Software Foundation | 587 | dnl This file is free software; the Free Software Foundation |
987 | 628 | dnl gives unlimited permission to copy and/or distribute it, | 588 | dnl gives unlimited permission to copy and/or distribute it, |
988 | 629 | dnl with or without modifications, as long as this notice is preserved. | 589 | dnl with or without modifications, as long as this notice is preserved. |
989 | 630 | 590 | dnl | |
990 | 631 | dnl From Bruno Haible. | 591 | dnl This file can can be used in projects which are not available under |
991 | 632 | 592 | dnl the GNU General Public License or the GNU Library General Public | |
992 | 633 | AC_DEFUN([gt_INTDIV0], | 593 | dnl License but which still want to provide support for the GNU gettext |
993 | 634 | [ | 594 | dnl functionality. |
994 | 635 | AC_REQUIRE([AC_PROG_CC])dnl | 595 | dnl Please note that the actual code of the GNU gettext library is covered |
995 | 636 | AC_REQUIRE([AC_CANONICAL_HOST])dnl | 596 | dnl by the GNU Library General Public License, and the rest of the GNU |
996 | 637 | 597 | dnl gettext package package is covered by the GNU General Public License. | |
997 | 638 | AC_CACHE_CHECK([whether integer division by zero raises SIGFPE], | 598 | dnl They are *not* in the public domain. |
998 | 639 | gt_cv_int_divbyzero_sigfpe, | 599 | |
999 | 640 | [ | 600 | dnl Checks for special options needed on MacOS X. |
1000 | 641 | AC_TRY_RUN([ | 601 | dnl Defines INTL_MACOSX_LIBS. |
1001 | 642 | #include <stdlib.h> | 602 | AC_DEFUN([gt_INTL_MACOSX], |
1002 | 643 | #include <signal.h> | 603 | [ |
1003 | 644 | 604 | dnl Check for API introduced in MacOS X 10.2. | |
1004 | 645 | static void | 605 | AC_CACHE_CHECK([for CFPreferencesCopyAppValue], |
1005 | 646 | #ifdef __cplusplus | 606 | gt_cv_func_CFPreferencesCopyAppValue, |
1006 | 647 | sigfpe_handler (int sig) | 607 | [gt_save_LIBS="$LIBS" |
1007 | 648 | #else | 608 | LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" |
1008 | 649 | sigfpe_handler (sig) int sig; | 609 | AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>], |
1009 | 650 | #endif | 610 | [CFPreferencesCopyAppValue(NULL, NULL)], |
1010 | 651 | { | 611 | [gt_cv_func_CFPreferencesCopyAppValue=yes], |
1011 | 652 | /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */ | 612 | [gt_cv_func_CFPreferencesCopyAppValue=no]) |
1012 | 653 | exit (sig != SIGFPE); | 613 | LIBS="$gt_save_LIBS"]) |
1013 | 654 | } | 614 | if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then |
1014 | 655 | 615 | AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1, | |
1015 | 656 | int x = 1; | 616 | [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) |
1016 | 657 | int y = 0; | 617 | fi |
1017 | 658 | int z; | 618 | dnl Check for API introduced in MacOS X 10.3. |
1018 | 659 | int nan; | 619 | AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent, |
1019 | 660 | 620 | [gt_save_LIBS="$LIBS" | |
1020 | 661 | int main () | 621 | LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" |
1021 | 662 | { | 622 | AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();], |
1022 | 663 | signal (SIGFPE, sigfpe_handler); | 623 | [gt_cv_func_CFLocaleCopyCurrent=yes], |
1023 | 664 | /* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */ | 624 | [gt_cv_func_CFLocaleCopyCurrent=no]) |
1024 | 665 | #if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP) | 625 | LIBS="$gt_save_LIBS"]) |
1025 | 666 | signal (SIGTRAP, sigfpe_handler); | 626 | if test $gt_cv_func_CFLocaleCopyCurrent = yes; then |
1026 | 667 | #endif | 627 | AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1, |
1027 | 668 | /* Linux/SPARC yields signal SIGILL. */ | 628 | [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) |
1028 | 669 | #if defined (__sparc__) && defined (__linux__) | 629 | fi |
1029 | 670 | signal (SIGILL, sigfpe_handler); | 630 | INTL_MACOSX_LIBS= |
1030 | 671 | #endif | 631 | if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then |
1031 | 672 | 632 | INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" | |
1032 | 673 | z = x / y; | 633 | fi |
1033 | 674 | nan = y / y; | 634 | AC_SUBST([INTL_MACOSX_LIBS]) |
576 | 675 | exit (1); | ||
577 | 676 | } | ||
578 | 677 | ], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no, | ||
579 | 678 | [ | ||
580 | 679 | # Guess based on the CPU. | ||
581 | 680 | case "$host_cpu" in | ||
582 | 681 | alpha* | i[34567]86 | m68k | s390*) | ||
583 | 682 | gt_cv_int_divbyzero_sigfpe="guessing yes";; | ||
584 | 683 | *) | ||
585 | 684 | gt_cv_int_divbyzero_sigfpe="guessing no";; | ||
586 | 685 | esac | ||
587 | 686 | ]) | ||
588 | 687 | ]) | ||
589 | 688 | case "$gt_cv_int_divbyzero_sigfpe" in | ||
590 | 689 | *yes) value=1;; | ||
591 | 690 | *) value=0;; | ||
592 | 691 | esac | ||
593 | 692 | AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value, | ||
594 | 693 | [Define if integer division by zero raises signal SIGFPE.]) | ||
595 | 694 | ]) | ||
596 | 695 | |||
597 | 696 | # intl.m4 serial 3 (gettext-0.16) | ||
598 | 697 | dnl Copyright (C) 1995-2006 Free Software Foundation, Inc. | ||
599 | 698 | dnl This file is free software; the Free Software Foundation | ||
600 | 699 | dnl gives unlimited permission to copy and/or distribute it, | ||
601 | 700 | dnl with or without modifications, as long as this notice is preserved. | ||
602 | 701 | dnl | ||
603 | 702 | dnl This file can can be used in projects which are not available under | ||
604 | 703 | dnl the GNU General Public License or the GNU Library General Public | ||
605 | 704 | dnl License but which still want to provide support for the GNU gettext | ||
606 | 705 | dnl functionality. | ||
607 | 706 | dnl Please note that the actual code of the GNU gettext library is covered | ||
608 | 707 | dnl by the GNU Library General Public License, and the rest of the GNU | ||
609 | 708 | dnl gettext package package is covered by the GNU General Public License. | ||
610 | 709 | dnl They are *not* in the public domain. | ||
611 | 710 | |||
612 | 711 | dnl Authors: | ||
613 | 712 | dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. | ||
614 | 713 | dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006. | ||
615 | 714 | |||
616 | 715 | AC_PREREQ(2.52) | ||
617 | 716 | |||
618 | 717 | dnl Checks for all prerequisites of the intl subdirectory, | ||
619 | 718 | dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS, | ||
620 | 719 | dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL. | ||
621 | 720 | AC_DEFUN([AM_INTL_SUBDIR], | ||
622 | 721 | [ | ||
623 | 722 | AC_REQUIRE([AC_PROG_INSTALL])dnl | ||
624 | 723 | AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake | ||
625 | 724 | AC_REQUIRE([AC_PROG_CC])dnl | ||
626 | 725 | AC_REQUIRE([AC_CANONICAL_HOST])dnl | ||
627 | 726 | AC_REQUIRE([gt_GLIBC2])dnl | ||
628 | 727 | AC_REQUIRE([AC_PROG_RANLIB])dnl | ||
629 | 728 | AC_REQUIRE([gl_VISIBILITY])dnl | ||
630 | 729 | AC_REQUIRE([gt_INTL_SUBDIR_CORE])dnl | ||
631 | 730 | AC_REQUIRE([AC_TYPE_LONG_LONG_INT])dnl | ||
632 | 731 | AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl | ||
633 | 732 | AC_REQUIRE([gt_TYPE_WCHAR_T])dnl | ||
634 | 733 | AC_REQUIRE([gt_TYPE_WINT_T])dnl | ||
635 | 734 | AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) | ||
636 | 735 | AC_REQUIRE([gt_TYPE_INTMAX_T]) | ||
637 | 736 | AC_REQUIRE([gt_PRINTF_POSIX]) | ||
638 | 737 | AC_REQUIRE([gl_GLIBC21])dnl | ||
639 | 738 | AC_REQUIRE([gl_XSIZE])dnl | ||
640 | 739 | AC_REQUIRE([gt_INTL_MACOSX])dnl | ||
641 | 740 | |||
642 | 741 | AC_CHECK_TYPE([ptrdiff_t], , | ||
643 | 742 | [AC_DEFINE([ptrdiff_t], [long], | ||
644 | 743 | [Define as the type of the result of subtracting two pointers, if the system doesn't define it.]) | ||
645 | 744 | ]) | ||
646 | 745 | AC_CHECK_HEADERS([stddef.h stdlib.h string.h]) | ||
647 | 746 | AC_CHECK_FUNCS([asprintf fwprintf putenv setenv setlocale snprintf wcslen]) | ||
648 | 747 | |||
649 | 748 | dnl Use the _snprintf function only if it is declared (because on NetBSD it | ||
650 | 749 | dnl is defined as a weak alias of snprintf; we prefer to use the latter). | ||
651 | 750 | gt_CHECK_DECL(_snprintf, [#include <stdio.h>]) | ||
652 | 751 | gt_CHECK_DECL(_snwprintf, [#include <stdio.h>]) | ||
653 | 752 | |||
654 | 753 | dnl Use the *_unlocked functions only if they are declared. | ||
655 | 754 | dnl (because some of them were defined without being declared in Solaris | ||
656 | 755 | dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built | ||
657 | 756 | dnl on Solaris 2.5.1 to run on Solaris 2.6). | ||
658 | 757 | dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13. | ||
659 | 758 | gt_CHECK_DECL(getc_unlocked, [#include <stdio.h>]) | ||
660 | 759 | |||
661 | 760 | case $gt_cv_func_printf_posix in | ||
662 | 761 | *yes) HAVE_POSIX_PRINTF=1 ;; | ||
663 | 762 | *) HAVE_POSIX_PRINTF=0 ;; | ||
664 | 763 | esac | ||
665 | 764 | AC_SUBST([HAVE_POSIX_PRINTF]) | ||
666 | 765 | if test "$ac_cv_func_asprintf" = yes; then | ||
667 | 766 | HAVE_ASPRINTF=1 | ||
668 | 767 | else | ||
669 | 768 | HAVE_ASPRINTF=0 | ||
670 | 769 | fi | ||
671 | 770 | AC_SUBST([HAVE_ASPRINTF]) | ||
672 | 771 | if test "$ac_cv_func_snprintf" = yes; then | ||
673 | 772 | HAVE_SNPRINTF=1 | ||
674 | 773 | else | ||
675 | 774 | HAVE_SNPRINTF=0 | ||
676 | 775 | fi | ||
677 | 776 | AC_SUBST([HAVE_SNPRINTF]) | ||
678 | 777 | if test "$ac_cv_func_wprintf" = yes; then | ||
679 | 778 | HAVE_WPRINTF=1 | ||
680 | 779 | else | ||
681 | 780 | HAVE_WPRINTF=0 | ||
682 | 781 | fi | ||
683 | 782 | AC_SUBST([HAVE_WPRINTF]) | ||
684 | 783 | |||
685 | 784 | AM_LANGINFO_CODESET | ||
686 | 785 | gt_LC_MESSAGES | ||
687 | 786 | |||
688 | 787 | dnl Compilation on mingw and Cygwin needs special Makefile rules, because | ||
689 | 788 | dnl 1. when we install a shared library, we must arrange to export | ||
690 | 789 | dnl auxiliary pointer variables for every exported variable, | ||
691 | 790 | dnl 2. when we install a shared library and a static library simultaneously, | ||
692 | 791 | dnl the include file specifies __declspec(dllimport) and therefore we | ||
693 | 792 | dnl must arrange to define the auxiliary pointer variables for the | ||
694 | 793 | dnl exported variables _also_ in the static library. | ||
695 | 794 | if test "$enable_shared" = yes; then | ||
696 | 795 | case "$host_os" in | ||
697 | 796 | cygwin*) is_woe32dll=yes ;; | ||
698 | 797 | *) is_woe32dll=no ;; | ||
699 | 798 | esac | ||
700 | 799 | else | ||
701 | 800 | is_woe32dll=no | ||
702 | 801 | fi | ||
703 | 802 | WOE32DLL=$is_woe32dll | ||
704 | 803 | AC_SUBST([WOE32DLL]) | ||
705 | 804 | |||
706 | 805 | dnl Rename some macros and functions used for locking. | ||
707 | 806 | AH_BOTTOM([ | ||
708 | 807 | #define __libc_lock_t gl_lock_t | ||
709 | 808 | #define __libc_lock_define gl_lock_define | ||
710 | 809 | #define __libc_lock_define_initialized gl_lock_define_initialized | ||
711 | 810 | #define __libc_lock_init gl_lock_init | ||
712 | 811 | #define __libc_lock_lock gl_lock_lock | ||
713 | 812 | #define __libc_lock_unlock gl_lock_unlock | ||
714 | 813 | #define __libc_lock_recursive_t gl_recursive_lock_t | ||
715 | 814 | #define __libc_lock_define_recursive gl_recursive_lock_define | ||
716 | 815 | #define __libc_lock_define_initialized_recursive gl_recursive_lock_define_initialized | ||
717 | 816 | #define __libc_lock_init_recursive gl_recursive_lock_init | ||
718 | 817 | #define __libc_lock_lock_recursive gl_recursive_lock_lock | ||
719 | 818 | #define __libc_lock_unlock_recursive gl_recursive_lock_unlock | ||
720 | 819 | #define glthread_in_use libintl_thread_in_use | ||
721 | 820 | #define glthread_lock_init libintl_lock_init | ||
722 | 821 | #define glthread_lock_lock libintl_lock_lock | ||
723 | 822 | #define glthread_lock_unlock libintl_lock_unlock | ||
724 | 823 | #define glthread_lock_destroy libintl_lock_destroy | ||
725 | 824 | #define glthread_rwlock_init libintl_rwlock_init | ||
726 | 825 | #define glthread_rwlock_rdlock libintl_rwlock_rdlock | ||
727 | 826 | #define glthread_rwlock_wrlock libintl_rwlock_wrlock | ||
728 | 827 | #define glthread_rwlock_unlock libintl_rwlock_unlock | ||
729 | 828 | #define glthread_rwlock_destroy libintl_rwlock_destroy | ||
730 | 829 | #define glthread_recursive_lock_init libintl_recursive_lock_init | ||
731 | 830 | #define glthread_recursive_lock_lock libintl_recursive_lock_lock | ||
732 | 831 | #define glthread_recursive_lock_unlock libintl_recursive_lock_unlock | ||
733 | 832 | #define glthread_recursive_lock_destroy libintl_recursive_lock_destroy | ||
734 | 833 | #define glthread_once libintl_once | ||
735 | 834 | #define glthread_once_call libintl_once_call | ||
736 | 835 | #define glthread_once_singlethreaded libintl_once_singlethreaded | ||
737 | 836 | ]) | ||
738 | 837 | ]) | ||
739 | 838 | |||
740 | 839 | |||
741 | 840 | dnl Checks for the core files of the intl subdirectory: | ||
742 | 841 | dnl dcigettext.c | ||
743 | 842 | dnl eval-plural.h | ||
744 | 843 | dnl explodename.c | ||
745 | 844 | dnl finddomain.c | ||
746 | 845 | dnl gettextP.h | ||
747 | 846 | dnl gmo.h | ||
748 | 847 | dnl hash-string.h hash-string.c | ||
749 | 848 | dnl l10nflist.c | ||
750 | 849 | dnl libgnuintl.h.in (except the *printf stuff) | ||
751 | 850 | dnl loadinfo.h | ||
752 | 851 | dnl loadmsgcat.c | ||
753 | 852 | dnl localealias.c | ||
754 | 853 | dnl log.c | ||
755 | 854 | dnl plural-exp.h plural-exp.c | ||
756 | 855 | dnl plural.y | ||
757 | 856 | dnl Used by libglocale. | ||
758 | 857 | AC_DEFUN([gt_INTL_SUBDIR_CORE], | ||
759 | 858 | [ | ||
760 | 859 | AC_REQUIRE([AC_C_INLINE])dnl | ||
761 | 860 | AC_REQUIRE([AC_TYPE_SIZE_T])dnl | ||
762 | 861 | AC_REQUIRE([gl_AC_HEADER_STDINT_H]) | ||
763 | 862 | AC_REQUIRE([AC_FUNC_ALLOCA])dnl | ||
764 | 863 | AC_REQUIRE([AC_FUNC_MMAP])dnl | ||
765 | 864 | AC_REQUIRE([gt_INTDIV0])dnl | ||
766 | 865 | AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl | ||
767 | 866 | AC_REQUIRE([gt_INTTYPES_PRI])dnl | ||
768 | 867 | AC_REQUIRE([gl_LOCK])dnl | ||
769 | 868 | |||
770 | 869 | AC_TRY_LINK( | ||
771 | 870 | [int foo (int a) { a = __builtin_expect (a, 10); return a == 10 ? 0 : 1; }], | ||
772 | 871 | [], | ||
773 | 872 | [AC_DEFINE([HAVE_BUILTIN_EXPECT], 1, | ||
774 | 873 | [Define to 1 if the compiler understands __builtin_expect.])]) | ||
775 | 874 | |||
776 | 875 | AC_CHECK_HEADERS([argz.h inttypes.h limits.h unistd.h sys/param.h]) | ||
777 | 876 | AC_CHECK_FUNCS([getcwd getegid geteuid getgid getuid mempcpy munmap \ | ||
778 | 877 | stpcpy strcasecmp strdup strtoul tsearch argz_count argz_stringify \ | ||
779 | 878 | argz_next __fsetlocking]) | ||
780 | 879 | |||
781 | 880 | dnl Use the *_unlocked functions only if they are declared. | ||
782 | 881 | dnl (because some of them were defined without being declared in Solaris | ||
783 | 882 | dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built | ||
784 | 883 | dnl on Solaris 2.5.1 to run on Solaris 2.6). | ||
785 | 884 | dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13. | ||
786 | 885 | gt_CHECK_DECL(feof_unlocked, [#include <stdio.h>]) | ||
787 | 886 | gt_CHECK_DECL(fgets_unlocked, [#include <stdio.h>]) | ||
788 | 887 | |||
789 | 888 | AM_ICONV | ||
790 | 889 | |||
791 | 890 | dnl glibc >= 2.4 has a NL_LOCALE_NAME macro when _GNU_SOURCE is defined, | ||
792 | 891 | dnl and a _NL_LOCALE_NAME macro always. | ||
793 | 892 | AC_CACHE_CHECK([for NL_LOCALE_NAME macro], gt_cv_nl_locale_name, | ||
794 | 893 | [AC_TRY_LINK([#include <langinfo.h> | ||
795 | 894 | #include <locale.h>], | ||
796 | 895 | [char* cs = nl_langinfo(_NL_LOCALE_NAME(LC_MESSAGES));], | ||
797 | 896 | gt_cv_nl_locale_name=yes, | ||
798 | 897 | gt_cv_nl_locale_name=no) | ||
799 | 898 | ]) | ||
800 | 899 | if test $gt_cv_nl_locale_name = yes; then | ||
801 | 900 | AC_DEFINE(HAVE_NL_LOCALE_NAME, 1, | ||
802 | 901 | [Define if you have <langinfo.h> and it defines the NL_LOCALE_NAME macro if _GNU_SOURCE is defined.]) | ||
803 | 902 | fi | ||
804 | 903 | |||
805 | 904 | dnl intl/plural.c is generated from intl/plural.y. It requires bison, | ||
806 | 905 | dnl because plural.y uses bison specific features. It requires at least | ||
807 | 906 | dnl bison-1.26 because earlier versions generate a plural.c that doesn't | ||
808 | 907 | dnl compile. | ||
809 | 908 | dnl bison is only needed for the maintainer (who touches plural.y). But in | ||
810 | 909 | dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put | ||
811 | 910 | dnl the rule in general Makefile. Now, some people carelessly touch the | ||
812 | 911 | dnl files or have a broken "make" program, hence the plural.c rule will | ||
813 | 912 | dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not | ||
814 | 913 | dnl present or too old. | ||
815 | 914 | AC_CHECK_PROGS([INTLBISON], [bison]) | ||
816 | 915 | if test -z "$INTLBISON"; then | ||
817 | 916 | ac_verc_fail=yes | ||
818 | 917 | else | ||
819 | 918 | dnl Found it, now check the version. | ||
820 | 919 | AC_MSG_CHECKING([version of bison]) | ||
821 | 920 | changequote(<<,>>)dnl | ||
822 | 921 | ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` | ||
823 | 922 | case $ac_prog_version in | ||
824 | 923 | '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; | ||
825 | 924 | 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) | ||
826 | 925 | changequote([,])dnl | ||
827 | 926 | ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; | ||
828 | 927 | *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; | ||
829 | 928 | esac | ||
830 | 929 | AC_MSG_RESULT([$ac_prog_version]) | ||
831 | 930 | fi | ||
832 | 931 | if test $ac_verc_fail = yes; then | ||
833 | 932 | INTLBISON=: | ||
834 | 933 | fi | ||
835 | 934 | ]) | ||
836 | 935 | |||
837 | 936 | |||
838 | 937 | dnl gt_CHECK_DECL(FUNC, INCLUDES) | ||
839 | 938 | dnl Check whether a function is declared. | ||
840 | 939 | AC_DEFUN([gt_CHECK_DECL], | ||
841 | 940 | [ | ||
842 | 941 | AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1, | ||
843 | 942 | [AC_TRY_COMPILE([$2], [ | ||
844 | 943 | #ifndef $1 | ||
845 | 944 | char *p = (char *) $1; | ||
846 | 945 | #endif | ||
847 | 946 | ], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)]) | ||
848 | 947 | if test $ac_cv_have_decl_$1 = yes; then | ||
849 | 948 | gt_value=1 | ||
850 | 949 | else | ||
851 | 950 | gt_value=0 | ||
852 | 951 | fi | ||
853 | 952 | AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value], | ||
854 | 953 | [Define to 1 if you have the declaration of `$1', and to 0 if you don't.]) | ||
855 | 954 | ]) | ||
856 | 955 | |||
857 | 956 | # intmax.m4 serial 3 (gettext-0.16) | ||
858 | 957 | dnl Copyright (C) 2002-2005 Free Software Foundation, Inc. | ||
859 | 958 | dnl This file is free software; the Free Software Foundation | ||
860 | 959 | dnl gives unlimited permission to copy and/or distribute it, | ||
861 | 960 | dnl with or without modifications, as long as this notice is preserved. | ||
862 | 961 | |||
863 | 962 | dnl From Bruno Haible. | ||
864 | 963 | dnl Test whether the system has the 'intmax_t' type, but don't attempt to | ||
865 | 964 | dnl find a replacement if it is lacking. | ||
866 | 965 | |||
867 | 966 | AC_DEFUN([gt_TYPE_INTMAX_T], | ||
868 | 967 | [ | ||
869 | 968 | AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) | ||
870 | 969 | AC_REQUIRE([gl_AC_HEADER_STDINT_H]) | ||
871 | 970 | AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t, | ||
872 | 971 | [AC_TRY_COMPILE([ | ||
873 | 972 | #include <stddef.h> | ||
874 | 973 | #include <stdlib.h> | ||
875 | 974 | #if HAVE_STDINT_H_WITH_UINTMAX | ||
876 | 975 | #include <stdint.h> | ||
877 | 976 | #endif | ||
878 | 977 | #if HAVE_INTTYPES_H_WITH_UINTMAX | ||
879 | 978 | #include <inttypes.h> | ||
880 | 979 | #endif | ||
881 | 980 | ], [intmax_t x = -1; | ||
882 | 981 | return !x;], | ||
883 | 982 | gt_cv_c_intmax_t=yes, | ||
884 | 983 | gt_cv_c_intmax_t=no)]) | ||
885 | 984 | if test $gt_cv_c_intmax_t = yes; then | ||
886 | 985 | AC_DEFINE(HAVE_INTMAX_T, 1, | ||
887 | 986 | [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.]) | ||
888 | 987 | fi | ||
889 | 988 | ]) | ||
890 | 989 | |||
891 | 990 | # inttypes-pri.m4 serial 4 (gettext-0.16) | ||
892 | 991 | dnl Copyright (C) 1997-2002, 2006 Free Software Foundation, Inc. | ||
893 | 992 | dnl This file is free software; the Free Software Foundation | ||
894 | 993 | dnl gives unlimited permission to copy and/or distribute it, | ||
895 | 994 | dnl with or without modifications, as long as this notice is preserved. | ||
896 | 995 | |||
897 | 996 | dnl From Bruno Haible. | ||
898 | 997 | |||
899 | 998 | AC_PREREQ(2.52) | ||
900 | 999 | |||
901 | 1000 | # Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI* | ||
902 | 1001 | # macros to non-string values. This is the case on AIX 4.3.3. | ||
903 | 1002 | |||
904 | 1003 | AC_DEFUN([gt_INTTYPES_PRI], | ||
905 | 1004 | [ | ||
906 | 1005 | AC_CHECK_HEADERS([inttypes.h]) | ||
907 | 1006 | if test $ac_cv_header_inttypes_h = yes; then | ||
908 | 1007 | AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken], | ||
909 | 1008 | gt_cv_inttypes_pri_broken, | ||
910 | 1009 | [ | ||
911 | 1010 | AC_TRY_COMPILE([#include <inttypes.h> | ||
912 | 1011 | #ifdef PRId32 | ||
913 | 1012 | char *p = PRId32; | ||
914 | 1013 | #endif | ||
915 | 1014 | ], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes) | ||
916 | 1015 | ]) | ||
917 | 1016 | fi | ||
918 | 1017 | if test "$gt_cv_inttypes_pri_broken" = yes; then | ||
919 | 1018 | AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1, | ||
920 | 1019 | [Define if <inttypes.h> exists and defines unusable PRI* macros.]) | ||
921 | 1020 | PRI_MACROS_BROKEN=1 | ||
922 | 1021 | else | ||
923 | 1022 | PRI_MACROS_BROKEN=0 | ||
924 | 1023 | fi | ||
925 | 1024 | AC_SUBST([PRI_MACROS_BROKEN]) | ||
926 | 1025 | ]) | ||
927 | 1026 | |||
928 | 1027 | # inttypes_h.m4 serial 7 | ||
929 | 1028 | dnl Copyright (C) 1997-2004, 2006 Free Software Foundation, Inc. | ||
930 | 1029 | dnl This file is free software; the Free Software Foundation | ||
931 | 1030 | dnl gives unlimited permission to copy and/or distribute it, | ||
932 | 1031 | dnl with or without modifications, as long as this notice is preserved. | ||
933 | 1032 | |||
934 | 1033 | dnl From Paul Eggert. | ||
935 | 1034 | |||
936 | 1035 | # Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists, | ||
937 | 1036 | # doesn't clash with <sys/types.h>, and declares uintmax_t. | ||
938 | 1037 | |||
939 | 1038 | AC_DEFUN([gl_AC_HEADER_INTTYPES_H], | ||
940 | 1039 | [ | ||
941 | 1040 | AC_CACHE_CHECK([for inttypes.h], gl_cv_header_inttypes_h, | ||
942 | 1041 | [AC_TRY_COMPILE( | ||
943 | 1042 | [#include <sys/types.h> | ||
944 | 1043 | #include <inttypes.h>], | ||
945 | 1044 | [uintmax_t i = (uintmax_t) -1; return !i;], | ||
946 | 1045 | gl_cv_header_inttypes_h=yes, | ||
947 | 1046 | gl_cv_header_inttypes_h=no)]) | ||
948 | 1047 | if test $gl_cv_header_inttypes_h = yes; then | ||
949 | 1048 | AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1, | ||
950 | 1049 | [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, | ||
951 | 1050 | and declares uintmax_t. ]) | ||
952 | 1051 | fi | ||
953 | 1052 | ]) | ||
954 | 1053 | |||
955 | 1054 | # lcmessage.m4 serial 4 (gettext-0.14.2) | ||
956 | 1055 | dnl Copyright (C) 1995-2002, 2004-2005 Free Software Foundation, Inc. | ||
957 | 1056 | dnl This file is free software; the Free Software Foundation | ||
958 | 1057 | dnl gives unlimited permission to copy and/or distribute it, | ||
959 | 1058 | dnl with or without modifications, as long as this notice is preserved. | ||
960 | 1059 | dnl | ||
961 | 1060 | dnl This file can can be used in projects which are not available under | ||
962 | 1061 | dnl the GNU General Public License or the GNU Library General Public | ||
963 | 1062 | dnl License but which still want to provide support for the GNU gettext | ||
964 | 1063 | dnl functionality. | ||
965 | 1064 | dnl Please note that the actual code of the GNU gettext library is covered | ||
966 | 1065 | dnl by the GNU Library General Public License, and the rest of the GNU | ||
967 | 1066 | dnl gettext package package is covered by the GNU General Public License. | ||
968 | 1067 | dnl They are *not* in the public domain. | ||
969 | 1068 | |||
970 | 1069 | dnl Authors: | ||
971 | 1070 | dnl Ulrich Drepper <drepper@cygnus.com>, 1995. | ||
972 | 1071 | |||
973 | 1072 | # Check whether LC_MESSAGES is available in <locale.h>. | ||
974 | 1073 | |||
975 | 1074 | AC_DEFUN([gt_LC_MESSAGES], | ||
976 | 1075 | [ | ||
977 | 1076 | AC_CACHE_CHECK([for LC_MESSAGES], gt_cv_val_LC_MESSAGES, | ||
978 | 1077 | [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES], | ||
979 | 1078 | gt_cv_val_LC_MESSAGES=yes, gt_cv_val_LC_MESSAGES=no)]) | ||
980 | 1079 | if test $gt_cv_val_LC_MESSAGES = yes; then | ||
981 | 1080 | AC_DEFINE(HAVE_LC_MESSAGES, 1, | ||
982 | 1081 | [Define if your <locale.h> file defines LC_MESSAGES.]) | ||
983 | 1082 | fi | ||
1034 | 1083 | ]) | 635 | ]) |
1035 | 1084 | 636 | ||
1036 | 1085 | # lib-ld.m4 serial 3 (gettext-0.13) | 637 | # lib-ld.m4 serial 3 (gettext-0.13) |
1037 | @@ -1193,20 +745,22 @@ | |||
1038 | 1193 | AC_LIB_PROG_LD_GNU | 745 | AC_LIB_PROG_LD_GNU |
1039 | 1194 | ]) | 746 | ]) |
1040 | 1195 | 747 | ||
1043 | 1196 | # lib-link.m4 serial 9 (gettext-0.16) | 748 | # lib-link.m4 serial 13 (gettext-0.17) |
1044 | 1197 | dnl Copyright (C) 2001-2006 Free Software Foundation, Inc. | 749 | dnl Copyright (C) 2001-2007 Free Software Foundation, Inc. |
1045 | 1198 | dnl This file is free software; the Free Software Foundation | 750 | dnl This file is free software; the Free Software Foundation |
1046 | 1199 | dnl gives unlimited permission to copy and/or distribute it, | 751 | dnl gives unlimited permission to copy and/or distribute it, |
1047 | 1200 | dnl with or without modifications, as long as this notice is preserved. | 752 | dnl with or without modifications, as long as this notice is preserved. |
1048 | 1201 | 753 | ||
1049 | 1202 | dnl From Bruno Haible. | 754 | dnl From Bruno Haible. |
1050 | 1203 | 755 | ||
1052 | 1204 | AC_PREREQ(2.50) | 756 | AC_PREREQ(2.54) |
1053 | 1205 | 757 | ||
1054 | 1206 | dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and | 758 | dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and |
1055 | 1207 | dnl the libraries corresponding to explicit and implicit dependencies. | 759 | dnl the libraries corresponding to explicit and implicit dependencies. |
1056 | 1208 | dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and | 760 | dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and |
1057 | 1209 | dnl augments the CPPFLAGS variable. | 761 | dnl augments the CPPFLAGS variable. |
1058 | 762 | dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname | ||
1059 | 763 | dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem. | ||
1060 | 1210 | AC_DEFUN([AC_LIB_LINKFLAGS], | 764 | AC_DEFUN([AC_LIB_LINKFLAGS], |
1061 | 1211 | [ | 765 | [ |
1062 | 1212 | AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) | 766 | AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) |
1063 | @@ -1219,13 +773,16 @@ | |||
1064 | 1219 | ac_cv_lib[]Name[]_libs="$LIB[]NAME" | 773 | ac_cv_lib[]Name[]_libs="$LIB[]NAME" |
1065 | 1220 | ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" | 774 | ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" |
1066 | 1221 | ac_cv_lib[]Name[]_cppflags="$INC[]NAME" | 775 | ac_cv_lib[]Name[]_cppflags="$INC[]NAME" |
1067 | 776 | ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX" | ||
1068 | 1222 | ]) | 777 | ]) |
1069 | 1223 | LIB[]NAME="$ac_cv_lib[]Name[]_libs" | 778 | LIB[]NAME="$ac_cv_lib[]Name[]_libs" |
1070 | 1224 | LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" | 779 | LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" |
1071 | 1225 | INC[]NAME="$ac_cv_lib[]Name[]_cppflags" | 780 | INC[]NAME="$ac_cv_lib[]Name[]_cppflags" |
1072 | 781 | LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix" | ||
1073 | 1226 | AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) | 782 | AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) |
1074 | 1227 | AC_SUBST([LIB]NAME) | 783 | AC_SUBST([LIB]NAME) |
1075 | 1228 | AC_SUBST([LTLIB]NAME) | 784 | AC_SUBST([LTLIB]NAME) |
1076 | 785 | AC_SUBST([LIB]NAME[_PREFIX]) | ||
1077 | 1229 | dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the | 786 | dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the |
1078 | 1230 | dnl results of this search when this library appears as a dependency. | 787 | dnl results of this search when this library appears as a dependency. |
1079 | 1231 | HAVE_LIB[]NAME=yes | 788 | HAVE_LIB[]NAME=yes |
1080 | @@ -1241,6 +798,8 @@ | |||
1081 | 1241 | dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and | 798 | dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and |
1082 | 1242 | dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs | 799 | dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs |
1083 | 1243 | dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. | 800 | dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. |
1084 | 801 | dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname | ||
1085 | 802 | dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem. | ||
1086 | 1244 | AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], | 803 | AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], |
1087 | 1245 | [ | 804 | [ |
1088 | 1246 | AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) | 805 | AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) |
1089 | @@ -1277,17 +836,23 @@ | |||
1090 | 1277 | CPPFLAGS="$ac_save_CPPFLAGS" | 836 | CPPFLAGS="$ac_save_CPPFLAGS" |
1091 | 1278 | LIB[]NAME= | 837 | LIB[]NAME= |
1092 | 1279 | LTLIB[]NAME= | 838 | LTLIB[]NAME= |
1093 | 839 | LIB[]NAME[]_PREFIX= | ||
1094 | 1280 | fi | 840 | fi |
1095 | 1281 | AC_SUBST([HAVE_LIB]NAME) | 841 | AC_SUBST([HAVE_LIB]NAME) |
1096 | 1282 | AC_SUBST([LIB]NAME) | 842 | AC_SUBST([LIB]NAME) |
1097 | 1283 | AC_SUBST([LTLIB]NAME) | 843 | AC_SUBST([LTLIB]NAME) |
1098 | 844 | AC_SUBST([LIB]NAME[_PREFIX]) | ||
1099 | 1284 | undefine([Name]) | 845 | undefine([Name]) |
1100 | 1285 | undefine([NAME]) | 846 | undefine([NAME]) |
1101 | 1286 | ]) | 847 | ]) |
1102 | 1287 | 848 | ||
1103 | 1288 | dnl Determine the platform dependent parameters needed to use rpath: | 849 | dnl Determine the platform dependent parameters needed to use rpath: |
1106 | 1289 | dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator, | 850 | dnl acl_libext, |
1107 | 1290 | dnl hardcode_direct, hardcode_minus_L. | 851 | dnl acl_shlibext, |
1108 | 852 | dnl acl_hardcode_libdir_flag_spec, | ||
1109 | 853 | dnl acl_hardcode_libdir_separator, | ||
1110 | 854 | dnl acl_hardcode_direct, | ||
1111 | 855 | dnl acl_hardcode_minus_L. | ||
1112 | 1291 | AC_DEFUN([AC_LIB_RPATH], | 856 | AC_DEFUN([AC_LIB_RPATH], |
1113 | 1292 | [ | 857 | [ |
1114 | 1293 | dnl Tell automake >= 1.10 to complain if config.rpath is missing. | 858 | dnl Tell automake >= 1.10 to complain if config.rpath is missing. |
1115 | @@ -1304,12 +869,14 @@ | |||
1116 | 1304 | acl_cv_rpath=done | 869 | acl_cv_rpath=done |
1117 | 1305 | ]) | 870 | ]) |
1118 | 1306 | wl="$acl_cv_wl" | 871 | wl="$acl_cv_wl" |
1125 | 1307 | libext="$acl_cv_libext" | 872 | acl_libext="$acl_cv_libext" |
1126 | 1308 | shlibext="$acl_cv_shlibext" | 873 | acl_shlibext="$acl_cv_shlibext" |
1127 | 1309 | hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" | 874 | acl_libname_spec="$acl_cv_libname_spec" |
1128 | 1310 | hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" | 875 | acl_library_names_spec="$acl_cv_library_names_spec" |
1129 | 1311 | hardcode_direct="$acl_cv_hardcode_direct" | 876 | acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" |
1130 | 1312 | hardcode_minus_L="$acl_cv_hardcode_minus_L" | 877 | acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" |
1131 | 878 | acl_hardcode_direct="$acl_cv_hardcode_direct" | ||
1132 | 879 | acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" | ||
1133 | 1313 | dnl Determine whether the user wants rpath handling at all. | 880 | dnl Determine whether the user wants rpath handling at all. |
1134 | 1314 | AC_ARG_ENABLE(rpath, | 881 | AC_ARG_ENABLE(rpath, |
1135 | 1315 | [ --disable-rpath do not hardcode runtime library paths], | 882 | [ --disable-rpath do not hardcode runtime library paths], |
1136 | @@ -1319,20 +886,24 @@ | |||
1137 | 1319 | dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and | 886 | dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and |
1138 | 1320 | dnl the libraries corresponding to explicit and implicit dependencies. | 887 | dnl the libraries corresponding to explicit and implicit dependencies. |
1139 | 1321 | dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. | 888 | dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. |
1140 | 889 | dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found | ||
1141 | 890 | dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem. | ||
1142 | 1322 | AC_DEFUN([AC_LIB_LINKFLAGS_BODY], | 891 | AC_DEFUN([AC_LIB_LINKFLAGS_BODY], |
1143 | 1323 | [ | 892 | [ |
1144 | 1324 | AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) | 893 | AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) |
1145 | 1325 | define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], | 894 | define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], |
1146 | 1326 | [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) | 895 | [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) |
1147 | 896 | dnl Autoconf >= 2.61 supports dots in --with options. | ||
1148 | 897 | define([N_A_M_E],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit([$1],[.],[_])],[$1])]) | ||
1149 | 1327 | dnl By default, look in $includedir and $libdir. | 898 | dnl By default, look in $includedir and $libdir. |
1150 | 1328 | use_additional=yes | 899 | use_additional=yes |
1151 | 1329 | AC_LIB_WITH_FINAL_PREFIX([ | 900 | AC_LIB_WITH_FINAL_PREFIX([ |
1152 | 1330 | eval additional_includedir=\"$includedir\" | 901 | eval additional_includedir=\"$includedir\" |
1153 | 1331 | eval additional_libdir=\"$libdir\" | 902 | eval additional_libdir=\"$libdir\" |
1154 | 1332 | ]) | 903 | ]) |
1158 | 1333 | AC_LIB_ARG_WITH([lib$1-prefix], | 904 | AC_LIB_ARG_WITH([lib]N_A_M_E[-prefix], |
1159 | 1334 | [ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib | 905 | [ --with-lib]N_A_M_E[-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib |
1160 | 1335 | --without-lib$1-prefix don't search for lib$1 in includedir and libdir], | 906 | --without-lib]N_A_M_E[-prefix don't search for lib$1 in includedir and libdir], |
1161 | 1336 | [ | 907 | [ |
1162 | 1337 | if test "X$withval" = "Xno"; then | 908 | if test "X$withval" = "Xno"; then |
1163 | 1338 | use_additional=no | 909 | use_additional=no |
1164 | @@ -1353,6 +924,7 @@ | |||
1165 | 1353 | LIB[]NAME= | 924 | LIB[]NAME= |
1166 | 1354 | LTLIB[]NAME= | 925 | LTLIB[]NAME= |
1167 | 1355 | INC[]NAME= | 926 | INC[]NAME= |
1168 | 927 | LIB[]NAME[]_PREFIX= | ||
1169 | 1356 | rpathdirs= | 928 | rpathdirs= |
1170 | 1357 | ltrpathdirs= | 929 | ltrpathdirs= |
1171 | 1358 | names_already_handled= | 930 | names_already_handled= |
1172 | @@ -1392,29 +964,55 @@ | |||
1173 | 1392 | found_la= | 964 | found_la= |
1174 | 1393 | found_so= | 965 | found_so= |
1175 | 1394 | found_a= | 966 | found_a= |
1176 | 967 | eval libname=\"$acl_libname_spec\" # typically: libname=lib$name | ||
1177 | 968 | if test -n "$acl_shlibext"; then | ||
1178 | 969 | shrext=".$acl_shlibext" # typically: shrext=.so | ||
1179 | 970 | else | ||
1180 | 971 | shrext= | ||
1181 | 972 | fi | ||
1182 | 1395 | if test $use_additional = yes; then | 973 | if test $use_additional = yes; then |
1190 | 1396 | if test -n "$shlibext" \ | 974 | dir="$additional_libdir" |
1191 | 1397 | && { test -f "$additional_libdir/lib$name.$shlibext" \ | 975 | dnl The same code as in the loop below: |
1192 | 1398 | || { test "$shlibext" = dll \ | 976 | dnl First look for a shared library. |
1193 | 1399 | && test -f "$additional_libdir/lib$name.dll.a"; }; }; then | 977 | if test -n "$acl_shlibext"; then |
1194 | 1400 | found_dir="$additional_libdir" | 978 | if test -f "$dir/$libname$shrext"; then |
1195 | 1401 | if test -f "$additional_libdir/lib$name.$shlibext"; then | 979 | found_dir="$dir" |
1196 | 1402 | found_so="$additional_libdir/lib$name.$shlibext" | 980 | found_so="$dir/$libname$shrext" |
1197 | 1403 | else | 981 | else |
1209 | 1404 | found_so="$additional_libdir/lib$name.dll.a" | 982 | if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then |
1210 | 1405 | fi | 983 | ver=`(cd "$dir" && \ |
1211 | 1406 | if test -f "$additional_libdir/lib$name.la"; then | 984 | for f in "$libname$shrext".*; do echo "$f"; done \ |
1212 | 1407 | found_la="$additional_libdir/lib$name.la" | 985 | | sed -e "s,^$libname$shrext\\\\.,," \ |
1213 | 1408 | fi | 986 | | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ |
1214 | 1409 | else | 987 | | sed 1q ) 2>/dev/null` |
1215 | 1410 | if test -f "$additional_libdir/lib$name.$libext"; then | 988 | if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then |
1216 | 1411 | found_dir="$additional_libdir" | 989 | found_dir="$dir" |
1217 | 1412 | found_a="$additional_libdir/lib$name.$libext" | 990 | found_so="$dir/$libname$shrext.$ver" |
1218 | 1413 | if test -f "$additional_libdir/lib$name.la"; then | 991 | fi |
1219 | 1414 | found_la="$additional_libdir/lib$name.la" | 992 | else |
1220 | 993 | eval library_names=\"$acl_library_names_spec\" | ||
1221 | 994 | for f in $library_names; do | ||
1222 | 995 | if test -f "$dir/$f"; then | ||
1223 | 996 | found_dir="$dir" | ||
1224 | 997 | found_so="$dir/$f" | ||
1225 | 998 | break | ||
1226 | 999 | fi | ||
1227 | 1000 | done | ||
1228 | 1415 | fi | 1001 | fi |
1229 | 1416 | fi | 1002 | fi |
1230 | 1417 | fi | 1003 | fi |
1231 | 1004 | dnl Then look for a static library. | ||
1232 | 1005 | if test "X$found_dir" = "X"; then | ||
1233 | 1006 | if test -f "$dir/$libname.$acl_libext"; then | ||
1234 | 1007 | found_dir="$dir" | ||
1235 | 1008 | found_a="$dir/$libname.$acl_libext" | ||
1236 | 1009 | fi | ||
1237 | 1010 | fi | ||
1238 | 1011 | if test "X$found_dir" != "X"; then | ||
1239 | 1012 | if test -f "$dir/$libname.la"; then | ||
1240 | 1013 | found_la="$dir/$libname.la" | ||
1241 | 1014 | fi | ||
1242 | 1015 | fi | ||
1243 | 1418 | fi | 1016 | fi |
1244 | 1419 | if test "X$found_dir" = "X"; then | 1017 | if test "X$found_dir" = "X"; then |
1245 | 1420 | for x in $LDFLAGS $LTLIB[]NAME; do | 1018 | for x in $LDFLAGS $LTLIB[]NAME; do |
1246 | @@ -1422,28 +1020,46 @@ | |||
1247 | 1422 | case "$x" in | 1020 | case "$x" in |
1248 | 1423 | -L*) | 1021 | -L*) |
1249 | 1424 | dir=`echo "X$x" | sed -e 's/^X-L//'` | 1022 | dir=`echo "X$x" | sed -e 's/^X-L//'` |
1257 | 1425 | if test -n "$shlibext" \ | 1023 | dnl First look for a shared library. |
1258 | 1426 | && { test -f "$dir/lib$name.$shlibext" \ | 1024 | if test -n "$acl_shlibext"; then |
1259 | 1427 | || { test "$shlibext" = dll \ | 1025 | if test -f "$dir/$libname$shrext"; then |
1260 | 1428 | && test -f "$dir/lib$name.dll.a"; }; }; then | 1026 | found_dir="$dir" |
1261 | 1429 | found_dir="$dir" | 1027 | found_so="$dir/$libname$shrext" |
1255 | 1430 | if test -f "$dir/lib$name.$shlibext"; then | ||
1256 | 1431 | found_so="$dir/lib$name.$shlibext" | ||
1262 | 1432 | else | 1028 | else |
1274 | 1433 | found_so="$dir/lib$name.dll.a" | 1029 | if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then |
1275 | 1434 | fi | 1030 | ver=`(cd "$dir" && \ |
1276 | 1435 | if test -f "$dir/lib$name.la"; then | 1031 | for f in "$libname$shrext".*; do echo "$f"; done \ |
1277 | 1436 | found_la="$dir/lib$name.la" | 1032 | | sed -e "s,^$libname$shrext\\\\.,," \ |
1278 | 1437 | fi | 1033 | | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ |
1279 | 1438 | else | 1034 | | sed 1q ) 2>/dev/null` |
1280 | 1439 | if test -f "$dir/lib$name.$libext"; then | 1035 | if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then |
1281 | 1440 | found_dir="$dir" | 1036 | found_dir="$dir" |
1282 | 1441 | found_a="$dir/lib$name.$libext" | 1037 | found_so="$dir/$libname$shrext.$ver" |
1283 | 1442 | if test -f "$dir/lib$name.la"; then | 1038 | fi |
1284 | 1443 | found_la="$dir/lib$name.la" | 1039 | else |
1285 | 1040 | eval library_names=\"$acl_library_names_spec\" | ||
1286 | 1041 | for f in $library_names; do | ||
1287 | 1042 | if test -f "$dir/$f"; then | ||
1288 | 1043 | found_dir="$dir" | ||
1289 | 1044 | found_so="$dir/$f" | ||
1290 | 1045 | break | ||
1291 | 1046 | fi | ||
1292 | 1047 | done | ||
1293 | 1444 | fi | 1048 | fi |
1294 | 1445 | fi | 1049 | fi |
1295 | 1446 | fi | 1050 | fi |
1296 | 1051 | dnl Then look for a static library. | ||
1297 | 1052 | if test "X$found_dir" = "X"; then | ||
1298 | 1053 | if test -f "$dir/$libname.$acl_libext"; then | ||
1299 | 1054 | found_dir="$dir" | ||
1300 | 1055 | found_a="$dir/$libname.$acl_libext" | ||
1301 | 1056 | fi | ||
1302 | 1057 | fi | ||
1303 | 1058 | if test "X$found_dir" != "X"; then | ||
1304 | 1059 | if test -f "$dir/$libname.la"; then | ||
1305 | 1060 | found_la="$dir/$libname.la" | ||
1306 | 1061 | fi | ||
1307 | 1062 | fi | ||
1308 | 1447 | ;; | 1063 | ;; |
1309 | 1448 | esac | 1064 | esac |
1310 | 1449 | if test "X$found_dir" != "X"; then | 1065 | if test "X$found_dir" != "X"; then |
1311 | @@ -1477,12 +1093,12 @@ | |||
1312 | 1477 | ltrpathdirs="$ltrpathdirs $found_dir" | 1093 | ltrpathdirs="$ltrpathdirs $found_dir" |
1313 | 1478 | fi | 1094 | fi |
1314 | 1479 | dnl The hardcoding into $LIBNAME is system dependent. | 1095 | dnl The hardcoding into $LIBNAME is system dependent. |
1316 | 1480 | if test "$hardcode_direct" = yes; then | 1096 | if test "$acl_hardcode_direct" = yes; then |
1317 | 1481 | dnl Using DIR/libNAME.so during linking hardcodes DIR into the | 1097 | dnl Using DIR/libNAME.so during linking hardcodes DIR into the |
1318 | 1482 | dnl resulting binary. | 1098 | dnl resulting binary. |
1319 | 1483 | LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" | 1099 | LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" |
1320 | 1484 | else | 1100 | else |
1322 | 1485 | if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then | 1101 | if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then |
1323 | 1486 | dnl Use an explicit option to hardcode DIR into the resulting | 1102 | dnl Use an explicit option to hardcode DIR into the resulting |
1324 | 1487 | dnl binary. | 1103 | dnl binary. |
1325 | 1488 | LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" | 1104 | LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" |
1326 | @@ -1513,13 +1129,13 @@ | |||
1327 | 1513 | if test -z "$haveit"; then | 1129 | if test -z "$haveit"; then |
1328 | 1514 | LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" | 1130 | LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" |
1329 | 1515 | fi | 1131 | fi |
1331 | 1516 | if test "$hardcode_minus_L" != no; then | 1132 | if test "$acl_hardcode_minus_L" != no; then |
1332 | 1517 | dnl FIXME: Not sure whether we should use | 1133 | dnl FIXME: Not sure whether we should use |
1333 | 1518 | dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" | 1134 | dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" |
1334 | 1519 | dnl here. | 1135 | dnl here. |
1335 | 1520 | LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" | 1136 | LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" |
1336 | 1521 | else | 1137 | else |
1338 | 1522 | dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH | 1138 | dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH |
1339 | 1523 | dnl here, because this doesn't fit in flags passed to the | 1139 | dnl here, because this doesn't fit in flags passed to the |
1340 | 1524 | dnl compiler. So give up. No hardcoding. This affects only | 1140 | dnl compiler. So give up. No hardcoding. This affects only |
1341 | 1525 | dnl very old systems. | 1141 | dnl very old systems. |
1342 | @@ -1546,6 +1162,7 @@ | |||
1343 | 1546 | case "$found_dir" in | 1162 | case "$found_dir" in |
1344 | 1547 | */$acl_libdirstem | */$acl_libdirstem/) | 1163 | */$acl_libdirstem | */$acl_libdirstem/) |
1345 | 1548 | basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` | 1164 | basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` |
1346 | 1165 | LIB[]NAME[]_PREFIX="$basedir" | ||
1347 | 1549 | additional_includedir="$basedir/include" | 1166 | additional_includedir="$basedir/include" |
1348 | 1550 | ;; | 1167 | ;; |
1349 | 1551 | esac | 1168 | esac |
1350 | @@ -1707,18 +1324,18 @@ | |||
1351 | 1707 | done | 1324 | done |
1352 | 1708 | done | 1325 | done |
1353 | 1709 | if test "X$rpathdirs" != "X"; then | 1326 | if test "X$rpathdirs" != "X"; then |
1355 | 1710 | if test -n "$hardcode_libdir_separator"; then | 1327 | if test -n "$acl_hardcode_libdir_separator"; then |
1356 | 1711 | dnl Weird platform: only the last -rpath option counts, the user must | 1328 | dnl Weird platform: only the last -rpath option counts, the user must |
1357 | 1712 | dnl pass all path elements in one option. We can arrange that for a | 1329 | dnl pass all path elements in one option. We can arrange that for a |
1358 | 1713 | dnl single library, but not when more than one $LIBNAMEs are used. | 1330 | dnl single library, but not when more than one $LIBNAMEs are used. |
1359 | 1714 | alldirs= | 1331 | alldirs= |
1360 | 1715 | for found_dir in $rpathdirs; do | 1332 | for found_dir in $rpathdirs; do |
1362 | 1716 | alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" | 1333 | alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" |
1363 | 1717 | done | 1334 | done |
1365 | 1718 | dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl. | 1335 | dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl. |
1366 | 1719 | acl_save_libdir="$libdir" | 1336 | acl_save_libdir="$libdir" |
1367 | 1720 | libdir="$alldirs" | 1337 | libdir="$alldirs" |
1369 | 1721 | eval flag=\"$hardcode_libdir_flag_spec\" | 1338 | eval flag=\"$acl_hardcode_libdir_flag_spec\" |
1370 | 1722 | libdir="$acl_save_libdir" | 1339 | libdir="$acl_save_libdir" |
1371 | 1723 | LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" | 1340 | LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" |
1372 | 1724 | else | 1341 | else |
1373 | @@ -1726,7 +1343,7 @@ | |||
1374 | 1726 | for found_dir in $rpathdirs; do | 1343 | for found_dir in $rpathdirs; do |
1375 | 1727 | acl_save_libdir="$libdir" | 1344 | acl_save_libdir="$libdir" |
1376 | 1728 | libdir="$found_dir" | 1345 | libdir="$found_dir" |
1378 | 1729 | eval flag=\"$hardcode_libdir_flag_spec\" | 1346 | eval flag=\"$acl_hardcode_libdir_flag_spec\" |
1379 | 1730 | libdir="$acl_save_libdir" | 1347 | libdir="$acl_save_libdir" |
1380 | 1731 | LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" | 1348 | LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" |
1381 | 1732 | done | 1349 | done |
1382 | @@ -1775,7 +1392,7 @@ | |||
1383 | 1775 | AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) | 1392 | AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) |
1384 | 1776 | $1= | 1393 | $1= |
1385 | 1777 | if test "$enable_rpath" != no; then | 1394 | if test "$enable_rpath" != no; then |
1387 | 1778 | if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then | 1395 | if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then |
1388 | 1779 | dnl Use an explicit option to hardcode directories into the resulting | 1396 | dnl Use an explicit option to hardcode directories into the resulting |
1389 | 1780 | dnl binary. | 1397 | dnl binary. |
1390 | 1781 | rpathdirs= | 1398 | rpathdirs= |
1391 | @@ -1809,16 +1426,16 @@ | |||
1392 | 1809 | done | 1426 | done |
1393 | 1810 | else | 1427 | else |
1394 | 1811 | dnl The linker is used for linking directly. | 1428 | dnl The linker is used for linking directly. |
1396 | 1812 | if test -n "$hardcode_libdir_separator"; then | 1429 | if test -n "$acl_hardcode_libdir_separator"; then |
1397 | 1813 | dnl Weird platform: only the last -rpath option counts, the user | 1430 | dnl Weird platform: only the last -rpath option counts, the user |
1398 | 1814 | dnl must pass all path elements in one option. | 1431 | dnl must pass all path elements in one option. |
1399 | 1815 | alldirs= | 1432 | alldirs= |
1400 | 1816 | for dir in $rpathdirs; do | 1433 | for dir in $rpathdirs; do |
1402 | 1817 | alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$dir" | 1434 | alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir" |
1403 | 1818 | done | 1435 | done |
1404 | 1819 | acl_save_libdir="$libdir" | 1436 | acl_save_libdir="$libdir" |
1405 | 1820 | libdir="$alldirs" | 1437 | libdir="$alldirs" |
1407 | 1821 | eval flag=\"$hardcode_libdir_flag_spec\" | 1438 | eval flag=\"$acl_hardcode_libdir_flag_spec\" |
1408 | 1822 | libdir="$acl_save_libdir" | 1439 | libdir="$acl_save_libdir" |
1409 | 1823 | $1="$flag" | 1440 | $1="$flag" |
1410 | 1824 | else | 1441 | else |
1411 | @@ -1826,7 +1443,7 @@ | |||
1412 | 1826 | for dir in $rpathdirs; do | 1443 | for dir in $rpathdirs; do |
1413 | 1827 | acl_save_libdir="$libdir" | 1444 | acl_save_libdir="$libdir" |
1414 | 1828 | libdir="$dir" | 1445 | libdir="$dir" |
1416 | 1829 | eval flag=\"$hardcode_libdir_flag_spec\" | 1446 | eval flag=\"$acl_hardcode_libdir_flag_spec\" |
1417 | 1830 | libdir="$acl_save_libdir" | 1447 | libdir="$acl_save_libdir" |
1418 | 1831 | $1="${$1}${$1:+ }$flag" | 1448 | $1="${$1}${$1:+ }$flag" |
1419 | 1832 | done | 1449 | done |
1420 | @@ -2026,7 +1643,7 @@ | |||
1421 | 2026 | 1643 | ||
1422 | 2027 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- | 1644 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- |
1423 | 2028 | 1645 | ||
1425 | 2029 | # serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL | 1646 | # serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL |
1426 | 2030 | 1647 | ||
1427 | 2031 | 1648 | ||
1428 | 2032 | # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) | 1649 | # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) |
1429 | @@ -2114,7 +1731,6 @@ | |||
1430 | 2114 | AC_REQUIRE([AC_OBJEXT])dnl | 1731 | AC_REQUIRE([AC_OBJEXT])dnl |
1431 | 2115 | AC_REQUIRE([AC_EXEEXT])dnl | 1732 | AC_REQUIRE([AC_EXEEXT])dnl |
1432 | 2116 | dnl | 1733 | dnl |
1433 | 2117 | |||
1434 | 2118 | AC_LIBTOOL_SYS_MAX_CMD_LEN | 1734 | AC_LIBTOOL_SYS_MAX_CMD_LEN |
1435 | 2119 | AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE | 1735 | AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE |
1436 | 2120 | AC_LIBTOOL_OBJDIR | 1736 | AC_LIBTOOL_OBJDIR |
1437 | @@ -2189,7 +1805,7 @@ | |||
1438 | 2189 | test -z "$ac_objext" && ac_objext=o | 1805 | test -z "$ac_objext" && ac_objext=o |
1439 | 2190 | 1806 | ||
1440 | 2191 | # Determine commands to create old-style static archives. | 1807 | # Determine commands to create old-style static archives. |
1442 | 2192 | old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' | 1808 | old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' |
1443 | 2193 | old_postinstall_cmds='chmod 644 $oldlib' | 1809 | old_postinstall_cmds='chmod 644 $oldlib' |
1444 | 2194 | old_postuninstall_cmds= | 1810 | old_postuninstall_cmds= |
1445 | 2195 | 1811 | ||
1446 | @@ -2216,6 +1832,8 @@ | |||
1447 | 2216 | ;; | 1832 | ;; |
1448 | 2217 | esac | 1833 | esac |
1449 | 2218 | 1834 | ||
1450 | 1835 | _LT_REQUIRED_DARWIN_CHECKS | ||
1451 | 1836 | |||
1452 | 2219 | AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) | 1837 | AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) |
1453 | 2220 | AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], | 1838 | AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], |
1454 | 2221 | enable_win32_dll=yes, enable_win32_dll=no) | 1839 | enable_win32_dll=yes, enable_win32_dll=no) |
1455 | @@ -2276,8 +1894,9 @@ | |||
1456 | 2276 | # Check for compiler boilerplate output or warnings with | 1894 | # Check for compiler boilerplate output or warnings with |
1457 | 2277 | # the simple compiler test code. | 1895 | # the simple compiler test code. |
1458 | 2278 | AC_DEFUN([_LT_COMPILER_BOILERPLATE], | 1896 | AC_DEFUN([_LT_COMPILER_BOILERPLATE], |
1461 | 2279 | [ac_outfile=conftest.$ac_objext | 1897 | [AC_REQUIRE([LT_AC_PROG_SED])dnl |
1462 | 2280 | printf "$lt_simple_compile_test_code" >conftest.$ac_ext | 1898 | ac_outfile=conftest.$ac_objext |
1463 | 1899 | echo "$lt_simple_compile_test_code" >conftest.$ac_ext | ||
1464 | 2281 | eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err | 1900 | eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err |
1465 | 2282 | _lt_compiler_boilerplate=`cat conftest.err` | 1901 | _lt_compiler_boilerplate=`cat conftest.err` |
1466 | 2283 | $rm conftest* | 1902 | $rm conftest* |
1467 | @@ -2289,13 +1908,85 @@ | |||
1468 | 2289 | # Check for linker boilerplate output or warnings with | 1908 | # Check for linker boilerplate output or warnings with |
1469 | 2290 | # the simple link test code. | 1909 | # the simple link test code. |
1470 | 2291 | AC_DEFUN([_LT_LINKER_BOILERPLATE], | 1910 | AC_DEFUN([_LT_LINKER_BOILERPLATE], |
1473 | 2292 | [ac_outfile=conftest.$ac_objext | 1911 | [AC_REQUIRE([LT_AC_PROG_SED])dnl |
1474 | 2293 | printf "$lt_simple_link_test_code" >conftest.$ac_ext | 1912 | ac_outfile=conftest.$ac_objext |
1475 | 1913 | echo "$lt_simple_link_test_code" >conftest.$ac_ext | ||
1476 | 2294 | eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err | 1914 | eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err |
1477 | 2295 | _lt_linker_boilerplate=`cat conftest.err` | 1915 | _lt_linker_boilerplate=`cat conftest.err` |
1479 | 2296 | $rm conftest* | 1916 | $rm -r conftest* |
1480 | 2297 | ])# _LT_LINKER_BOILERPLATE | 1917 | ])# _LT_LINKER_BOILERPLATE |
1481 | 2298 | 1918 | ||
1482 | 1919 | # _LT_REQUIRED_DARWIN_CHECKS | ||
1483 | 1920 | # -------------------------- | ||
1484 | 1921 | # Check for some things on darwin | ||
1485 | 1922 | AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[ | ||
1486 | 1923 | case $host_os in | ||
1487 | 1924 | rhapsody* | darwin*) | ||
1488 | 1925 | AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) | ||
1489 | 1926 | AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) | ||
1490 | 1927 | |||
1491 | 1928 | AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], | ||
1492 | 1929 | [lt_cv_apple_cc_single_mod=no | ||
1493 | 1930 | if test -z "${LT_MULTI_MODULE}"; then | ||
1494 | 1931 | # By default we will add the -single_module flag. You can override | ||
1495 | 1932 | # by either setting the environment variable LT_MULTI_MODULE | ||
1496 | 1933 | # non-empty at configure time, or by adding -multi_module to the | ||
1497 | 1934 | # link flags. | ||
1498 | 1935 | echo "int foo(void){return 1;}" > conftest.c | ||
1499 | 1936 | $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ | ||
1500 | 1937 | -dynamiclib ${wl}-single_module conftest.c | ||
1501 | 1938 | if test -f libconftest.dylib; then | ||
1502 | 1939 | lt_cv_apple_cc_single_mod=yes | ||
1503 | 1940 | rm -rf libconftest.dylib* | ||
1504 | 1941 | fi | ||
1505 | 1942 | rm conftest.c | ||
1506 | 1943 | fi]) | ||
1507 | 1944 | AC_CACHE_CHECK([for -exported_symbols_list linker flag], | ||
1508 | 1945 | [lt_cv_ld_exported_symbols_list], | ||
1509 | 1946 | [lt_cv_ld_exported_symbols_list=no | ||
1510 | 1947 | save_LDFLAGS=$LDFLAGS | ||
1511 | 1948 | echo "_main" > conftest.sym | ||
1512 | 1949 | LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" | ||
1513 | 1950 | AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], | ||
1514 | 1951 | [lt_cv_ld_exported_symbols_list=yes], | ||
1515 | 1952 | [lt_cv_ld_exported_symbols_list=no]) | ||
1516 | 1953 | LDFLAGS="$save_LDFLAGS" | ||
1517 | 1954 | ]) | ||
1518 | 1955 | case $host_os in | ||
1519 | 1956 | rhapsody* | darwin1.[[0123]]) | ||
1520 | 1957 | _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; | ||
1521 | 1958 | darwin1.*) | ||
1522 | 1959 | _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; | ||
1523 | 1960 | darwin*) | ||
1524 | 1961 | # if running on 10.5 or later, the deployment target defaults | ||
1525 | 1962 | # to the OS version, if on x86, and 10.4, the deployment | ||
1526 | 1963 | # target defaults to 10.4. Don't you love it? | ||
1527 | 1964 | case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in | ||
1528 | 1965 | 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) | ||
1529 | 1966 | _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; | ||
1530 | 1967 | 10.[[012]]*) | ||
1531 | 1968 | _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; | ||
1532 | 1969 | 10.*) | ||
1533 | 1970 | _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; | ||
1534 | 1971 | esac | ||
1535 | 1972 | ;; | ||
1536 | 1973 | esac | ||
1537 | 1974 | if test "$lt_cv_apple_cc_single_mod" = "yes"; then | ||
1538 | 1975 | _lt_dar_single_mod='$single_module' | ||
1539 | 1976 | fi | ||
1540 | 1977 | if test "$lt_cv_ld_exported_symbols_list" = "yes"; then | ||
1541 | 1978 | _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' | ||
1542 | 1979 | else | ||
1543 | 1980 | _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" | ||
1544 | 1981 | fi | ||
1545 | 1982 | if test "$DSYMUTIL" != ":"; then | ||
1546 | 1983 | _lt_dsymutil="~$DSYMUTIL \$lib || :" | ||
1547 | 1984 | else | ||
1548 | 1985 | _lt_dsymutil= | ||
1549 | 1986 | fi | ||
1550 | 1987 | ;; | ||
1551 | 1988 | esac | ||
1552 | 1989 | ]) | ||
1553 | 2299 | 1990 | ||
1554 | 2300 | # _LT_AC_SYS_LIBPATH_AIX | 1991 | # _LT_AC_SYS_LIBPATH_AIX |
1555 | 2301 | # ---------------------- | 1992 | # ---------------------- |
1556 | @@ -2306,12 +1997,20 @@ | |||
1557 | 2306 | # If we don't find anything, use the default library path according | 1997 | # If we don't find anything, use the default library path according |
1558 | 2307 | # to the aix ld manual. | 1998 | # to the aix ld manual. |
1559 | 2308 | AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], | 1999 | AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], |
1563 | 2309 | [AC_LINK_IFELSE(AC_LANG_PROGRAM,[ | 2000 | [AC_REQUIRE([LT_AC_PROG_SED])dnl |
1564 | 2310 | aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } | 2001 | AC_LINK_IFELSE(AC_LANG_PROGRAM,[ |
1565 | 2311 | }'` | 2002 | lt_aix_libpath_sed=' |
1566 | 2003 | /Import File Strings/,/^$/ { | ||
1567 | 2004 | /^0/ { | ||
1568 | 2005 | s/^0 *\(.*\)$/\1/ | ||
1569 | 2006 | p | ||
1570 | 2007 | } | ||
1571 | 2008 | }' | ||
1572 | 2009 | aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
1573 | 2312 | # Check for a 64-bit object if we didn't find anything. | 2010 | # Check for a 64-bit object if we didn't find anything. |
1576 | 2313 | 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; } | 2011 | if test -z "$aix_libpath"; then |
1577 | 2314 | }'`; fi],[]) | 2012 | aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
1578 | 2013 | fi],[]) | ||
1579 | 2315 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 2014 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
1580 | 2316 | ])# _LT_AC_SYS_LIBPATH_AIX | 2015 | ])# _LT_AC_SYS_LIBPATH_AIX |
1581 | 2317 | 2016 | ||
1582 | @@ -2542,13 +2241,17 @@ | |||
1583 | 2542 | rm -rf conftest* | 2241 | rm -rf conftest* |
1584 | 2543 | ;; | 2242 | ;; |
1585 | 2544 | 2243 | ||
1587 | 2545 | x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) | 2244 | x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ |
1588 | 2245 | s390*-*linux*|sparc*-*linux*) | ||
1589 | 2546 | # Find out which ABI we are using. | 2246 | # Find out which ABI we are using. |
1590 | 2547 | echo 'int i;' > conftest.$ac_ext | 2247 | echo 'int i;' > conftest.$ac_ext |
1591 | 2548 | if AC_TRY_EVAL(ac_compile); then | 2248 | if AC_TRY_EVAL(ac_compile); then |
1592 | 2549 | case `/usr/bin/file conftest.o` in | 2249 | case `/usr/bin/file conftest.o` in |
1593 | 2550 | *32-bit*) | 2250 | *32-bit*) |
1594 | 2551 | case $host in | 2251 | case $host in |
1595 | 2252 | x86_64-*kfreebsd*-gnu) | ||
1596 | 2253 | LD="${LD-ld} -m elf_i386_fbsd" | ||
1597 | 2254 | ;; | ||
1598 | 2552 | x86_64-*linux*) | 2255 | x86_64-*linux*) |
1599 | 2553 | LD="${LD-ld} -m elf_i386" | 2256 | LD="${LD-ld} -m elf_i386" |
1600 | 2554 | ;; | 2257 | ;; |
1601 | @@ -2565,6 +2268,9 @@ | |||
1602 | 2565 | ;; | 2268 | ;; |
1603 | 2566 | *64-bit*) | 2269 | *64-bit*) |
1604 | 2567 | case $host in | 2270 | case $host in |
1605 | 2271 | x86_64-*kfreebsd*-gnu) | ||
1606 | 2272 | LD="${LD-ld} -m elf_x86_64_fbsd" | ||
1607 | 2273 | ;; | ||
1608 | 2568 | x86_64-*linux*) | 2274 | x86_64-*linux*) |
1609 | 2569 | LD="${LD-ld} -m elf_x86_64" | 2275 | LD="${LD-ld} -m elf_x86_64" |
1610 | 2570 | ;; | 2276 | ;; |
1611 | @@ -2605,7 +2311,11 @@ | |||
1612 | 2605 | *64-bit*) | 2311 | *64-bit*) |
1613 | 2606 | case $lt_cv_prog_gnu_ld in | 2312 | case $lt_cv_prog_gnu_ld in |
1614 | 2607 | yes*) LD="${LD-ld} -m elf64_sparc" ;; | 2313 | yes*) LD="${LD-ld} -m elf64_sparc" ;; |
1616 | 2608 | *) LD="${LD-ld} -64" ;; | 2314 | *) |
1617 | 2315 | if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then | ||
1618 | 2316 | LD="${LD-ld} -64" | ||
1619 | 2317 | fi | ||
1620 | 2318 | ;; | ||
1621 | 2609 | esac | 2319 | esac |
1622 | 2610 | ;; | 2320 | ;; |
1623 | 2611 | esac | 2321 | esac |
1624 | @@ -2636,7 +2346,7 @@ | |||
1625 | 2636 | AC_CACHE_CHECK([$1], [$2], | 2346 | AC_CACHE_CHECK([$1], [$2], |
1626 | 2637 | [$2=no | 2347 | [$2=no |
1627 | 2638 | ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) | 2348 | ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) |
1629 | 2639 | printf "$lt_simple_compile_test_code" > conftest.$ac_ext | 2349 | echo "$lt_simple_compile_test_code" > conftest.$ac_ext |
1630 | 2640 | lt_compiler_flag="$3" | 2350 | lt_compiler_flag="$3" |
1631 | 2641 | # Insert the option either (1) after the last *FLAGS variable, or | 2351 | # Insert the option either (1) after the last *FLAGS variable, or |
1632 | 2642 | # (2) before a word containing "conftest.", or (3) at the end. | 2352 | # (2) before a word containing "conftest.", or (3) at the end. |
1633 | @@ -2677,11 +2387,12 @@ | |||
1634 | 2677 | # ------------------------------------------------------------ | 2387 | # ------------------------------------------------------------ |
1635 | 2678 | # Check whether the given compiler option works | 2388 | # Check whether the given compiler option works |
1636 | 2679 | AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], | 2389 | AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], |
1638 | 2680 | [AC_CACHE_CHECK([$1], [$2], | 2390 | [AC_REQUIRE([LT_AC_PROG_SED])dnl |
1639 | 2391 | AC_CACHE_CHECK([$1], [$2], | ||
1640 | 2681 | [$2=no | 2392 | [$2=no |
1641 | 2682 | save_LDFLAGS="$LDFLAGS" | 2393 | save_LDFLAGS="$LDFLAGS" |
1642 | 2683 | LDFLAGS="$LDFLAGS $3" | 2394 | LDFLAGS="$LDFLAGS $3" |
1644 | 2684 | printf "$lt_simple_link_test_code" > conftest.$ac_ext | 2395 | echo "$lt_simple_link_test_code" > conftest.$ac_ext |
1645 | 2685 | if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then | 2396 | if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then |
1646 | 2686 | # The linker can only warn and ignore the option if not recognized | 2397 | # The linker can only warn and ignore the option if not recognized |
1647 | 2687 | # So say no if there are warnings | 2398 | # So say no if there are warnings |
1648 | @@ -2697,7 +2408,7 @@ | |||
1649 | 2697 | $2=yes | 2408 | $2=yes |
1650 | 2698 | fi | 2409 | fi |
1651 | 2699 | fi | 2410 | fi |
1653 | 2700 | $rm conftest* | 2411 | $rm -r conftest* |
1654 | 2701 | LDFLAGS="$save_LDFLAGS" | 2412 | LDFLAGS="$save_LDFLAGS" |
1655 | 2702 | ]) | 2413 | ]) |
1656 | 2703 | 2414 | ||
1657 | @@ -2795,24 +2506,27 @@ | |||
1658 | 2795 | fi | 2506 | fi |
1659 | 2796 | ;; | 2507 | ;; |
1660 | 2797 | *) | 2508 | *) |
1666 | 2798 | # If test is not a shell built-in, we'll probably end up computing a | 2509 | lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` |
1667 | 2799 | # maximum length that is only half of the actual maximum length, but | 2510 | if test -n "$lt_cv_sys_max_cmd_len"; then |
1668 | 2800 | # we can't tell. | 2511 | lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` |
1669 | 2801 | SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} | 2512 | lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` |
1670 | 2802 | while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ | 2513 | else |
1671 | 2514 | SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} | ||
1672 | 2515 | while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ | ||
1673 | 2803 | = "XX$teststring") >/dev/null 2>&1 && | 2516 | = "XX$teststring") >/dev/null 2>&1 && |
1686 | 2804 | new_result=`expr "X$teststring" : ".*" 2>&1` && | 2517 | new_result=`expr "X$teststring" : ".*" 2>&1` && |
1687 | 2805 | lt_cv_sys_max_cmd_len=$new_result && | 2518 | lt_cv_sys_max_cmd_len=$new_result && |
1688 | 2806 | test $i != 17 # 1/2 MB should be enough | 2519 | test $i != 17 # 1/2 MB should be enough |
1689 | 2807 | do | 2520 | do |
1690 | 2808 | i=`expr $i + 1` | 2521 | i=`expr $i + 1` |
1691 | 2809 | teststring=$teststring$teststring | 2522 | teststring=$teststring$teststring |
1692 | 2810 | done | 2523 | done |
1693 | 2811 | teststring= | 2524 | teststring= |
1694 | 2812 | # Add a significant safety factor because C++ compilers can tack on massive | 2525 | # Add a significant safety factor because C++ compilers can tack on massive |
1695 | 2813 | # amounts of additional arguments before passing them to the linker. | 2526 | # amounts of additional arguments before passing them to the linker. |
1696 | 2814 | # It appears as though 1/2 is a usable value. | 2527 | # It appears as though 1/2 is a usable value. |
1697 | 2815 | lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` | 2528 | lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` |
1698 | 2529 | fi | ||
1699 | 2816 | ;; | 2530 | ;; |
1700 | 2817 | esac | 2531 | esac |
1701 | 2818 | ]) | 2532 | ]) |
1702 | @@ -2965,7 +2679,7 @@ | |||
1703 | 2965 | AC_CHECK_FUNC([shl_load], | 2679 | AC_CHECK_FUNC([shl_load], |
1704 | 2966 | [lt_cv_dlopen="shl_load"], | 2680 | [lt_cv_dlopen="shl_load"], |
1705 | 2967 | [AC_CHECK_LIB([dld], [shl_load], | 2681 | [AC_CHECK_LIB([dld], [shl_load], |
1707 | 2968 | [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], | 2682 | [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], |
1708 | 2969 | [AC_CHECK_FUNC([dlopen], | 2683 | [AC_CHECK_FUNC([dlopen], |
1709 | 2970 | [lt_cv_dlopen="dlopen"], | 2684 | [lt_cv_dlopen="dlopen"], |
1710 | 2971 | [AC_CHECK_LIB([dl], [dlopen], | 2685 | [AC_CHECK_LIB([dl], [dlopen], |
1711 | @@ -2973,7 +2687,7 @@ | |||
1712 | 2973 | [AC_CHECK_LIB([svld], [dlopen], | 2687 | [AC_CHECK_LIB([svld], [dlopen], |
1713 | 2974 | [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], | 2688 | [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], |
1714 | 2975 | [AC_CHECK_LIB([dld], [dld_link], | 2689 | [AC_CHECK_LIB([dld], [dld_link], |
1716 | 2976 | [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) | 2690 | [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) |
1717 | 2977 | ]) | 2691 | ]) |
1718 | 2978 | ]) | 2692 | ]) |
1719 | 2979 | ]) | 2693 | ]) |
1720 | @@ -3039,7 +2753,8 @@ | |||
1721 | 3039 | # --------------------------------- | 2753 | # --------------------------------- |
1722 | 3040 | # Check to see if options -c and -o are simultaneously supported by compiler | 2754 | # Check to see if options -c and -o are simultaneously supported by compiler |
1723 | 3041 | AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], | 2755 | AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], |
1725 | 3042 | [AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl | 2756 | [AC_REQUIRE([LT_AC_PROG_SED])dnl |
1726 | 2757 | AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl | ||
1727 | 3043 | AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], | 2758 | AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], |
1728 | 3044 | [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], | 2759 | [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], |
1729 | 3045 | [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no | 2760 | [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no |
1730 | @@ -3047,7 +2762,7 @@ | |||
1731 | 3047 | mkdir conftest | 2762 | mkdir conftest |
1732 | 3048 | cd conftest | 2763 | cd conftest |
1733 | 3049 | mkdir out | 2764 | mkdir out |
1735 | 3050 | printf "$lt_simple_compile_test_code" > conftest.$ac_ext | 2765 | echo "$lt_simple_compile_test_code" > conftest.$ac_ext |
1736 | 3051 | 2766 | ||
1737 | 3052 | lt_compiler_flag="-o out/conftest2.$ac_objext" | 2767 | lt_compiler_flag="-o out/conftest2.$ac_objext" |
1738 | 3053 | # Insert the option either (1) after the last *FLAGS variable, or | 2768 | # Insert the option either (1) after the last *FLAGS variable, or |
1739 | @@ -3187,6 +2902,7 @@ | |||
1740 | 3187 | darwin*) | 2902 | darwin*) |
1741 | 3188 | if test -n "$STRIP" ; then | 2903 | if test -n "$STRIP" ; then |
1742 | 3189 | striplib="$STRIP -x" | 2904 | striplib="$STRIP -x" |
1743 | 2905 | old_striplib="$STRIP -S" | ||
1744 | 3190 | AC_MSG_RESULT([yes]) | 2906 | AC_MSG_RESULT([yes]) |
1745 | 3191 | else | 2907 | else |
1746 | 3192 | AC_MSG_RESULT([no]) | 2908 | AC_MSG_RESULT([no]) |
1747 | @@ -3204,7 +2920,8 @@ | |||
1748 | 3204 | # ----------------------------- | 2920 | # ----------------------------- |
1749 | 3205 | # PORTME Fill in your ld.so characteristics | 2921 | # PORTME Fill in your ld.so characteristics |
1750 | 3206 | AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], | 2922 | AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], |
1752 | 3207 | [AC_MSG_CHECKING([dynamic linker characteristics]) | 2923 | [AC_REQUIRE([LT_AC_PROG_SED])dnl |
1753 | 2924 | AC_MSG_CHECKING([dynamic linker characteristics]) | ||
1754 | 3208 | library_names_spec= | 2925 | library_names_spec= |
1755 | 3209 | libname_spec='lib$name' | 2926 | libname_spec='lib$name' |
1756 | 3210 | soname_spec= | 2927 | soname_spec= |
1757 | @@ -3218,20 +2935,58 @@ | |||
1758 | 3218 | version_type=none | 2935 | version_type=none |
1759 | 3219 | dynamic_linker="$host_os ld.so" | 2936 | dynamic_linker="$host_os ld.so" |
1760 | 3220 | sys_lib_dlsearch_path_spec="/lib /usr/lib" | 2937 | sys_lib_dlsearch_path_spec="/lib /usr/lib" |
1761 | 2938 | m4_if($1,[],[ | ||
1762 | 3221 | if test "$GCC" = yes; then | 2939 | if test "$GCC" = yes; then |
1765 | 3222 | sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` | 2940 | case $host_os in |
1766 | 3223 | if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then | 2941 | darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; |
1767 | 2942 | *) lt_awk_arg="/^libraries:/" ;; | ||
1768 | 2943 | esac | ||
1769 | 2944 | lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` | ||
1770 | 2945 | if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then | ||
1771 | 3224 | # if the path contains ";" then we assume it to be the separator | 2946 | # if the path contains ";" then we assume it to be the separator |
1772 | 3225 | # otherwise default to the standard path separator (i.e. ":") - it is | 2947 | # otherwise default to the standard path separator (i.e. ":") - it is |
1773 | 3226 | # assumed that no part of a normal pathname contains ";" but that should | 2948 | # assumed that no part of a normal pathname contains ";" but that should |
1774 | 3227 | # okay in the real world where ";" in dirpaths is itself problematic. | 2949 | # okay in the real world where ";" in dirpaths is itself problematic. |
1776 | 3228 | sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` | 2950 | lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` |
1777 | 3229 | else | 2951 | else |
1779 | 3230 | sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | 2952 | lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
1780 | 3231 | fi | 2953 | fi |
1781 | 2954 | # Ok, now we have the path, separated by spaces, we can step through it | ||
1782 | 2955 | # and add multilib dir if necessary. | ||
1783 | 2956 | lt_tmp_lt_search_path_spec= | ||
1784 | 2957 | lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` | ||
1785 | 2958 | for lt_sys_path in $lt_search_path_spec; do | ||
1786 | 2959 | if test -d "$lt_sys_path/$lt_multi_os_dir"; then | ||
1787 | 2960 | lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" | ||
1788 | 2961 | else | ||
1789 | 2962 | test -d "$lt_sys_path" && \ | ||
1790 | 2963 | lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" | ||
1791 | 2964 | fi | ||
1792 | 2965 | done | ||
1793 | 2966 | lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' | ||
1794 | 2967 | BEGIN {RS=" "; FS="/|\n";} { | ||
1795 | 2968 | lt_foo=""; | ||
1796 | 2969 | lt_count=0; | ||
1797 | 2970 | for (lt_i = NF; lt_i > 0; lt_i--) { | ||
1798 | 2971 | if ($lt_i != "" && $lt_i != ".") { | ||
1799 | 2972 | if ($lt_i == "..") { | ||
1800 | 2973 | lt_count++; | ||
1801 | 2974 | } else { | ||
1802 | 2975 | if (lt_count == 0) { | ||
1803 | 2976 | lt_foo="/" $lt_i lt_foo; | ||
1804 | 2977 | } else { | ||
1805 | 2978 | lt_count--; | ||
1806 | 2979 | } | ||
1807 | 2980 | } | ||
1808 | 2981 | } | ||
1809 | 2982 | } | ||
1810 | 2983 | if (lt_foo != "") { lt_freq[[lt_foo]]++; } | ||
1811 | 2984 | if (lt_freq[[lt_foo]] == 1) { print lt_foo; } | ||
1812 | 2985 | }'` | ||
1813 | 2986 | sys_lib_search_path_spec=`echo $lt_search_path_spec` | ||
1814 | 3232 | else | 2987 | else |
1815 | 3233 | sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" | 2988 | sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" |
1817 | 3234 | fi | 2989 | fi]) |
1818 | 3235 | need_lib_prefix=unknown | 2990 | need_lib_prefix=unknown |
1819 | 3236 | hardcode_into_libs=no | 2991 | hardcode_into_libs=no |
1820 | 3237 | 2992 | ||
1821 | @@ -3249,7 +3004,7 @@ | |||
1822 | 3249 | soname_spec='${libname}${release}${shared_ext}$major' | 3004 | soname_spec='${libname}${release}${shared_ext}$major' |
1823 | 3250 | ;; | 3005 | ;; |
1824 | 3251 | 3006 | ||
1826 | 3252 | aix4* | aix5*) | 3007 | aix[[4-9]]*) |
1827 | 3253 | version_type=linux | 3008 | version_type=linux |
1828 | 3254 | need_lib_prefix=no | 3009 | need_lib_prefix=no |
1829 | 3255 | need_version=no | 3010 | need_version=no |
1830 | @@ -3388,12 +3143,8 @@ | |||
1831 | 3388 | shlibpath_overrides_runpath=yes | 3143 | shlibpath_overrides_runpath=yes |
1832 | 3389 | shlibpath_var=DYLD_LIBRARY_PATH | 3144 | shlibpath_var=DYLD_LIBRARY_PATH |
1833 | 3390 | shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' | 3145 | shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' |
1840 | 3391 | # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. | 3146 | m4_if([$1], [],[ |
1841 | 3392 | if test "$GCC" = yes; then | 3147 | sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) |
1836 | 3393 | 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 | 3394 | else | ||
1838 | 3395 | sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' | ||
1839 | 3396 | fi | ||
1842 | 3397 | sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' | 3148 | sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' |
1843 | 3398 | ;; | 3149 | ;; |
1844 | 3399 | 3150 | ||
1845 | @@ -3447,7 +3198,7 @@ | |||
1846 | 3447 | shlibpath_overrides_runpath=no | 3198 | shlibpath_overrides_runpath=no |
1847 | 3448 | hardcode_into_libs=yes | 3199 | hardcode_into_libs=yes |
1848 | 3449 | ;; | 3200 | ;; |
1850 | 3450 | freebsd*) # from 4.6 on | 3201 | *) # from 4.6 on, and DragonFly |
1851 | 3451 | shlibpath_overrides_runpath=yes | 3202 | shlibpath_overrides_runpath=yes |
1852 | 3452 | hardcode_into_libs=yes | 3203 | hardcode_into_libs=yes |
1853 | 3453 | ;; | 3204 | ;; |
1854 | @@ -3510,7 +3261,7 @@ | |||
1855 | 3510 | postinstall_cmds='chmod 555 $lib' | 3261 | postinstall_cmds='chmod 555 $lib' |
1856 | 3511 | ;; | 3262 | ;; |
1857 | 3512 | 3263 | ||
1859 | 3513 | interix3*) | 3264 | interix[[3-9]]*) |
1860 | 3514 | version_type=linux | 3265 | version_type=linux |
1861 | 3515 | need_lib_prefix=no | 3266 | need_lib_prefix=no |
1862 | 3516 | need_version=no | 3267 | need_version=no |
1863 | @@ -3581,7 +3332,7 @@ | |||
1864 | 3581 | 3332 | ||
1865 | 3582 | # Append ld.so.conf contents to the search path | 3333 | # Append ld.so.conf contents to the search path |
1866 | 3583 | if test -f /etc/ld.so.conf; then | 3334 | if test -f /etc/ld.so.conf; then |
1868 | 3584 | 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' ' '` | 3335 | 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 | 3585 | sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" | 3336 | sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" |
1870 | 3586 | fi | 3337 | fi |
1871 | 3587 | 3338 | ||
1872 | @@ -3687,6 +3438,10 @@ | |||
1873 | 3687 | sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" | 3438 | sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" |
1874 | 3688 | ;; | 3439 | ;; |
1875 | 3689 | 3440 | ||
1876 | 3441 | rdos*) | ||
1877 | 3442 | dynamic_linker=no | ||
1878 | 3443 | ;; | ||
1879 | 3444 | |||
1880 | 3690 | solaris*) | 3445 | solaris*) |
1881 | 3691 | version_type=linux | 3446 | version_type=linux |
1882 | 3692 | need_lib_prefix=no | 3447 | need_lib_prefix=no |
1883 | @@ -3782,6 +3537,13 @@ | |||
1884 | 3782 | AC_MSG_RESULT([$dynamic_linker]) | 3537 | AC_MSG_RESULT([$dynamic_linker]) |
1885 | 3783 | test "$dynamic_linker" = no && can_build_shared=no | 3538 | test "$dynamic_linker" = no && can_build_shared=no |
1886 | 3784 | 3539 | ||
1887 | 3540 | AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec], | ||
1888 | 3541 | [lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"]) | ||
1889 | 3542 | sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" | ||
1890 | 3543 | AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec], | ||
1891 | 3544 | [lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"]) | ||
1892 | 3545 | sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" | ||
1893 | 3546 | |||
1894 | 3785 | variables_saved_for_relink="PATH $shlibpath_var $runpath_var" | 3547 | variables_saved_for_relink="PATH $shlibpath_var $runpath_var" |
1895 | 3786 | if test "$GCC" = yes; then | 3548 | if test "$GCC" = yes; then |
1896 | 3787 | variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" | 3549 | variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" |
1897 | @@ -3792,7 +3554,8 @@ | |||
1898 | 3792 | # _LT_AC_TAGCONFIG | 3554 | # _LT_AC_TAGCONFIG |
1899 | 3793 | # ---------------- | 3555 | # ---------------- |
1900 | 3794 | AC_DEFUN([_LT_AC_TAGCONFIG], | 3556 | AC_DEFUN([_LT_AC_TAGCONFIG], |
1902 | 3795 | [AC_ARG_WITH([tags], | 3557 | [AC_REQUIRE([LT_AC_PROG_SED])dnl |
1903 | 3558 | AC_ARG_WITH([tags], | ||
1904 | 3796 | [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], | 3559 | [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], |
1905 | 3797 | [include additional configurations @<:@automatic@:>@])], | 3560 | [include additional configurations @<:@automatic@:>@])], |
1906 | 3798 | [tagnames="$withval"]) | 3561 | [tagnames="$withval"]) |
1907 | @@ -4053,7 +3816,7 @@ | |||
1908 | 4053 | 3816 | ||
1909 | 4054 | # AC_PATH_TOOL_PREFIX | 3817 | # AC_PATH_TOOL_PREFIX |
1910 | 4055 | # ------------------- | 3818 | # ------------------- |
1912 | 4056 | # find a file program which can recognise shared library | 3819 | # find a file program which can recognize shared library |
1913 | 4057 | AC_DEFUN([AC_PATH_TOOL_PREFIX], | 3820 | AC_DEFUN([AC_PATH_TOOL_PREFIX], |
1914 | 4058 | [AC_REQUIRE([AC_PROG_EGREP])dnl | 3821 | [AC_REQUIRE([AC_PROG_EGREP])dnl |
1915 | 4059 | AC_MSG_CHECKING([for $1]) | 3822 | AC_MSG_CHECKING([for $1]) |
1916 | @@ -4116,7 +3879,7 @@ | |||
1917 | 4116 | 3879 | ||
1918 | 4117 | # AC_PATH_MAGIC | 3880 | # AC_PATH_MAGIC |
1919 | 4118 | # ------------- | 3881 | # ------------- |
1921 | 4119 | # find a file program which can recognise a shared library | 3882 | # find a file program which can recognize a shared library |
1922 | 4120 | AC_DEFUN([AC_PATH_MAGIC], | 3883 | AC_DEFUN([AC_PATH_MAGIC], |
1923 | 4121 | [AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) | 3884 | [AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) |
1924 | 4122 | if test -z "$lt_cv_path_MAGIC_CMD"; then | 3885 | if test -z "$lt_cv_path_MAGIC_CMD"; then |
1925 | @@ -4263,7 +4026,7 @@ | |||
1926 | 4263 | # how to check for library dependencies | 4026 | # how to check for library dependencies |
1927 | 4264 | # -- PORTME fill in with the dynamic library characteristics | 4027 | # -- PORTME fill in with the dynamic library characteristics |
1928 | 4265 | AC_DEFUN([AC_DEPLIBS_CHECK_METHOD], | 4028 | AC_DEFUN([AC_DEPLIBS_CHECK_METHOD], |
1930 | 4266 | [AC_CACHE_CHECK([how to recognise dependent libraries], | 4029 | [AC_CACHE_CHECK([how to recognize dependent libraries], |
1931 | 4267 | lt_cv_deplibs_check_method, | 4030 | lt_cv_deplibs_check_method, |
1932 | 4268 | [lt_cv_file_magic_cmd='$MAGIC_CMD' | 4031 | [lt_cv_file_magic_cmd='$MAGIC_CMD' |
1933 | 4269 | lt_cv_file_magic_test_file= | 4032 | lt_cv_file_magic_test_file= |
1934 | @@ -4280,7 +4043,7 @@ | |||
1935 | 4280 | # whether `pass_all' will *always* work, you probably want this one. | 4043 | # whether `pass_all' will *always* work, you probably want this one. |
1936 | 4281 | 4044 | ||
1937 | 4282 | case $host_os in | 4045 | case $host_os in |
1939 | 4283 | aix4* | aix5*) | 4046 | aix[[4-9]]*) |
1940 | 4284 | lt_cv_deplibs_check_method=pass_all | 4047 | lt_cv_deplibs_check_method=pass_all |
1941 | 4285 | ;; | 4048 | ;; |
1942 | 4286 | 4049 | ||
1943 | @@ -4302,9 +4065,15 @@ | |||
1944 | 4302 | 4065 | ||
1945 | 4303 | mingw* | pw32*) | 4066 | mingw* | pw32*) |
1946 | 4304 | # Base MSYS/MinGW do not provide the 'file' command needed by | 4067 | # Base MSYS/MinGW do not provide the 'file' command needed by |
1950 | 4305 | # func_win32_libid shell function, so use a weaker test based on 'objdump'. | 4068 | # func_win32_libid shell function, so use a weaker test based on 'objdump', |
1951 | 4306 | lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' | 4069 | # unless we find 'file', for example because we are cross-compiling. |
1952 | 4307 | lt_cv_file_magic_cmd='$OBJDUMP -f' | 4070 | if ( file / ) >/dev/null 2>&1; then |
1953 | 4071 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | ||
1954 | 4072 | lt_cv_file_magic_cmd='func_win32_libid' | ||
1955 | 4073 | else | ||
1956 | 4074 | lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' | ||
1957 | 4075 | lt_cv_file_magic_cmd='$OBJDUMP -f' | ||
1958 | 4076 | fi | ||
1959 | 4308 | ;; | 4077 | ;; |
1960 | 4309 | 4078 | ||
1961 | 4310 | darwin* | rhapsody*) | 4079 | darwin* | rhapsody*) |
1962 | @@ -4349,7 +4118,7 @@ | |||
1963 | 4349 | esac | 4118 | esac |
1964 | 4350 | ;; | 4119 | ;; |
1965 | 4351 | 4120 | ||
1967 | 4352 | interix3*) | 4121 | interix[[3-9]]*) |
1968 | 4353 | # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here | 4122 | # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here |
1969 | 4354 | lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' | 4123 | lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' |
1970 | 4355 | ;; | 4124 | ;; |
1971 | @@ -4399,6 +4168,10 @@ | |||
1972 | 4399 | lt_cv_deplibs_check_method=pass_all | 4168 | lt_cv_deplibs_check_method=pass_all |
1973 | 4400 | ;; | 4169 | ;; |
1974 | 4401 | 4170 | ||
1975 | 4171 | rdos*) | ||
1976 | 4172 | lt_cv_deplibs_check_method=pass_all | ||
1977 | 4173 | ;; | ||
1978 | 4174 | |||
1979 | 4402 | solaris*) | 4175 | solaris*) |
1980 | 4403 | lt_cv_deplibs_check_method=pass_all | 4176 | lt_cv_deplibs_check_method=pass_all |
1981 | 4404 | ;; | 4177 | ;; |
1982 | @@ -4451,7 +4224,7 @@ | |||
1983 | 4451 | lt_cv_path_NM="$NM" | 4224 | lt_cv_path_NM="$NM" |
1984 | 4452 | else | 4225 | else |
1985 | 4453 | lt_nm_to_check="${ac_tool_prefix}nm" | 4226 | lt_nm_to_check="${ac_tool_prefix}nm" |
1987 | 4454 | if test -n "$ac_tool_prefix" && test "$build" = "$host"; then | 4227 | if test -n "$ac_tool_prefix" && test "$build" = "$host"; then |
1988 | 4455 | lt_nm_to_check="$lt_nm_to_check nm" | 4228 | lt_nm_to_check="$lt_nm_to_check nm" |
1989 | 4456 | fi | 4229 | fi |
1990 | 4457 | for lt_tmp_nm in $lt_nm_to_check; do | 4230 | for lt_tmp_nm in $lt_nm_to_check; do |
1991 | @@ -4667,10 +4440,10 @@ | |||
1992 | 4667 | _LT_AC_TAGVAR(objext, $1)=$objext | 4440 | _LT_AC_TAGVAR(objext, $1)=$objext |
1993 | 4668 | 4441 | ||
1994 | 4669 | # Code to be used in simple compile tests | 4442 | # Code to be used in simple compile tests |
1996 | 4670 | lt_simple_compile_test_code="int some_variable = 0;\n" | 4443 | lt_simple_compile_test_code="int some_variable = 0;" |
1997 | 4671 | 4444 | ||
1998 | 4672 | # Code to be used in simple link tests | 4445 | # Code to be used in simple link tests |
2000 | 4673 | lt_simple_link_test_code='int main(){return(0);}\n' | 4446 | lt_simple_link_test_code='int main(){return(0);}' |
2001 | 4674 | 4447 | ||
2002 | 4675 | _LT_AC_SYS_COMPILER | 4448 | _LT_AC_SYS_COMPILER |
2003 | 4676 | 4449 | ||
2004 | @@ -4706,7 +4479,7 @@ | |||
2005 | 4706 | fi | 4479 | fi |
2006 | 4707 | ;; | 4480 | ;; |
2007 | 4708 | 4481 | ||
2009 | 4709 | aix4* | aix5*) | 4482 | aix[[4-9]]*) |
2010 | 4710 | if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then | 4483 | if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then |
2011 | 4711 | test "$enable_shared" = yes && enable_static=no | 4484 | test "$enable_shared" = yes && enable_static=no |
2012 | 4712 | fi | 4485 | fi |
2013 | @@ -4763,6 +4536,7 @@ | |||
2014 | 4763 | _LT_AC_TAGVAR(predeps, $1)= | 4536 | _LT_AC_TAGVAR(predeps, $1)= |
2015 | 4764 | _LT_AC_TAGVAR(postdeps, $1)= | 4537 | _LT_AC_TAGVAR(postdeps, $1)= |
2016 | 4765 | _LT_AC_TAGVAR(compiler_lib_search_path, $1)= | 4538 | _LT_AC_TAGVAR(compiler_lib_search_path, $1)= |
2017 | 4539 | _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= | ||
2018 | 4766 | 4540 | ||
2019 | 4767 | # Source file extension for C++ test sources. | 4541 | # Source file extension for C++ test sources. |
2020 | 4768 | ac_ext=cpp | 4542 | ac_ext=cpp |
2021 | @@ -4772,10 +4546,10 @@ | |||
2022 | 4772 | _LT_AC_TAGVAR(objext, $1)=$objext | 4546 | _LT_AC_TAGVAR(objext, $1)=$objext |
2023 | 4773 | 4547 | ||
2024 | 4774 | # Code to be used in simple compile tests | 4548 | # Code to be used in simple compile tests |
2026 | 4775 | lt_simple_compile_test_code="int some_variable = 0;\n" | 4549 | lt_simple_compile_test_code="int some_variable = 0;" |
2027 | 4776 | 4550 | ||
2028 | 4777 | # Code to be used in simple link tests | 4551 | # Code to be used in simple link tests |
2030 | 4778 | lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n' | 4552 | lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' |
2031 | 4779 | 4553 | ||
2032 | 4780 | # ltmain only uses $CC for tagged configurations so make sure $CC is set. | 4554 | # ltmain only uses $CC for tagged configurations so make sure $CC is set. |
2033 | 4781 | _LT_AC_SYS_COMPILER | 4555 | _LT_AC_SYS_COMPILER |
2034 | @@ -4872,7 +4646,7 @@ | |||
2035 | 4872 | # FIXME: insert proper C++ library support | 4646 | # FIXME: insert proper C++ library support |
2036 | 4873 | _LT_AC_TAGVAR(ld_shlibs, $1)=no | 4647 | _LT_AC_TAGVAR(ld_shlibs, $1)=no |
2037 | 4874 | ;; | 4648 | ;; |
2039 | 4875 | aix4* | aix5*) | 4649 | aix[[4-9]]*) |
2040 | 4876 | if test "$host_cpu" = ia64; then | 4650 | if test "$host_cpu" = ia64; then |
2041 | 4877 | # On IA64, the linker does run time linking by default, so we don't | 4651 | # On IA64, the linker does run time linking by default, so we don't |
2042 | 4878 | # have to do anything special. | 4652 | # have to do anything special. |
2043 | @@ -4885,7 +4659,7 @@ | |||
2044 | 4885 | # Test if we are trying to use run time linking or normal | 4659 | # Test if we are trying to use run time linking or normal |
2045 | 4886 | # AIX style linking. If -brtl is somewhere in LDFLAGS, we | 4660 | # AIX style linking. If -brtl is somewhere in LDFLAGS, we |
2046 | 4887 | # need to do runtime linking. | 4661 | # need to do runtime linking. |
2048 | 4888 | case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) | 4662 | case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) |
2049 | 4889 | for ld_flag in $LDFLAGS; do | 4663 | for ld_flag in $LDFLAGS; do |
2050 | 4890 | case $ld_flag in | 4664 | case $ld_flag in |
2051 | 4891 | *-brtl*) | 4665 | *-brtl*) |
2052 | @@ -4921,7 +4695,7 @@ | |||
2053 | 4921 | strings "$collect2name" | grep resolve_lib_name >/dev/null | 4695 | strings "$collect2name" | grep resolve_lib_name >/dev/null |
2054 | 4922 | then | 4696 | then |
2055 | 4923 | # We have reworked collect2 | 4697 | # We have reworked collect2 |
2057 | 4924 | _LT_AC_TAGVAR(hardcode_direct, $1)=yes | 4698 | : |
2058 | 4925 | else | 4699 | else |
2059 | 4926 | # We have old collect2 | 4700 | # We have old collect2 |
2060 | 4927 | _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported | 4701 | _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported |
2061 | @@ -5031,59 +4805,31 @@ | |||
2062 | 5031 | fi | 4805 | fi |
2063 | 5032 | ;; | 4806 | ;; |
2064 | 5033 | darwin* | rhapsody*) | 4807 | darwin* | rhapsody*) |
2065 | 5034 | case $host_os in | ||
2066 | 5035 | rhapsody* | darwin1.[[012]]) | ||
2067 | 5036 | _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' | ||
2068 | 5037 | ;; | ||
2069 | 5038 | *) # Darwin 1.3 on | ||
2070 | 5039 | if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then | ||
2071 | 5040 | _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' | ||
2072 | 5041 | else | ||
2073 | 5042 | case ${MACOSX_DEPLOYMENT_TARGET} in | ||
2074 | 5043 | 10.[[012]]) | ||
2075 | 5044 | _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' | ||
2076 | 5045 | ;; | ||
2077 | 5046 | 10.*) | ||
2078 | 5047 | _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' | ||
2079 | 5048 | ;; | ||
2080 | 5049 | esac | ||
2081 | 5050 | fi | ||
2082 | 5051 | ;; | ||
2083 | 5052 | esac | ||
2084 | 5053 | _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no | 4808 | _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no |
2085 | 5054 | _LT_AC_TAGVAR(hardcode_direct, $1)=no | 4809 | _LT_AC_TAGVAR(hardcode_direct, $1)=no |
2086 | 5055 | _LT_AC_TAGVAR(hardcode_automatic, $1)=yes | 4810 | _LT_AC_TAGVAR(hardcode_automatic, $1)=yes |
2087 | 5056 | _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported | 4811 | _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
2088 | 5057 | _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' | 4812 | _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' |
2089 | 5058 | _LT_AC_TAGVAR(link_all_deplibs, $1)=yes | 4813 | _LT_AC_TAGVAR(link_all_deplibs, $1)=yes |
2093 | 5059 | 4814 | _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" | |
2094 | 5060 | if test "$GXX" = yes ; then | 4815 | if test "$GXX" = yes ; then |
2092 | 5061 | lt_int_apple_cc_single_mod=no | ||
2095 | 5062 | output_verbose_link_cmd='echo' | 4816 | output_verbose_link_cmd='echo' |
2098 | 5063 | if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then | 4817 | _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 | 5064 | lt_int_apple_cc_single_mod=yes | 4818 | _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" |
2100 | 4819 | _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 | 4820 | _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 | 4821 | if test "$lt_cv_apple_cc_single_mod" != "yes"; then | ||
2103 | 4822 | _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 | 4823 | _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 | 5065 | fi | 4824 | fi |
2106 | 5066 | if test "X$lt_int_apple_cc_single_mod" = Xyes ; then | ||
2107 | 5067 | _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 | 5068 | else | ||
2109 | 5069 | _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 | 5070 | fi | ||
2111 | 5071 | _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' | ||
2112 | 5072 | # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds | ||
2113 | 5073 | if test "X$lt_int_apple_cc_single_mod" = Xyes ; then | ||
2114 | 5074 | _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 | 5075 | else | ||
2116 | 5076 | _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 | 5077 | fi | ||
2118 | 5078 | _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 | 5079 | else | 4825 | else |
2120 | 5080 | case $cc_basename in | 4826 | case $cc_basename in |
2121 | 5081 | xlc*) | 4827 | xlc*) |
2122 | 5082 | output_verbose_link_cmd='echo' | 4828 | output_verbose_link_cmd='echo' |
2124 | 5083 | _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' | 4829 | _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 | 5084 | _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' | 4830 | _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' |
2126 | 5085 | # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds | 4831 | # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds |
2128 | 5086 | _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}' | 4832 | _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 | 5087 | _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}' | 4833 | _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 | 5088 | ;; | 4834 | ;; |
2131 | 5089 | *) | 4835 | *) |
2132 | @@ -5166,9 +4912,7 @@ | |||
2133 | 5166 | _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: | 4912 | _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: |
2134 | 5167 | 4913 | ||
2135 | 5168 | case $host_cpu in | 4914 | case $host_cpu in |
2139 | 5169 | hppa*64*|ia64*) | 4915 | hppa*64*|ia64*) ;; |
2137 | 5170 | _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' | ||
2138 | 5171 | ;; | ||
2140 | 5172 | *) | 4916 | *) |
2141 | 5173 | _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' | 4917 | _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' |
2142 | 5174 | ;; | 4918 | ;; |
2143 | @@ -5236,7 +4980,7 @@ | |||
2144 | 5236 | ;; | 4980 | ;; |
2145 | 5237 | esac | 4981 | esac |
2146 | 5238 | ;; | 4982 | ;; |
2148 | 5239 | interix3*) | 4983 | interix[[3-9]]*) |
2149 | 5240 | _LT_AC_TAGVAR(hardcode_direct, $1)=no | 4984 | _LT_AC_TAGVAR(hardcode_direct, $1)=no |
2150 | 5241 | _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no | 4985 | _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no |
2151 | 5242 | _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' | 4986 | _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' |
2152 | @@ -5328,7 +5072,7 @@ | |||
2153 | 5328 | _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' | 5072 | _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' |
2154 | 5329 | _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' | 5073 | _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' |
2155 | 5330 | ;; | 5074 | ;; |
2157 | 5331 | pgCC*) | 5075 | pgCC* | pgcpp*) |
2158 | 5332 | # Portland Group C++ compiler | 5076 | # Portland Group C++ compiler |
2159 | 5333 | _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' | 5077 | _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 | 5334 | _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' | 5078 | _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 | 5356 | # dependencies. | 5100 | # dependencies. |
2163 | 5357 | 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' | 5101 | 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 | 5358 | ;; | 5102 | ;; |
2165 | 5103 | *) | ||
2166 | 5104 | case `$CC -V 2>&1 | sed 5q` in | ||
2167 | 5105 | *Sun\ C*) | ||
2168 | 5106 | # Sun C++ 5.9 | ||
2169 | 5107 | _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' | ||
2170 | 5108 | _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' | ||
2171 | 5109 | _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 | 5110 | _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' | ||
2173 | 5111 | _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 | 5112 | |||
2175 | 5113 | # Not sure whether something based on | ||
2176 | 5114 | # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | ||
2177 | 5115 | # would be better. | ||
2178 | 5116 | output_verbose_link_cmd='echo' | ||
2179 | 5117 | |||
2180 | 5118 | # Archives containing C++ object files must be created using | ||
2181 | 5119 | # "CC -xar", where "CC" is the Sun C++ compiler. This is | ||
2182 | 5120 | # necessary to make sure instantiated templates are included | ||
2183 | 5121 | # in the archive. | ||
2184 | 5122 | _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' | ||
2185 | 5123 | ;; | ||
2186 | 5124 | esac | ||
2187 | 5125 | ;; | ||
2188 | 5359 | esac | 5126 | esac |
2189 | 5360 | ;; | 5127 | ;; |
2190 | 5361 | lynxos*) | 5128 | lynxos*) |
2191 | @@ -5394,16 +5161,20 @@ | |||
2192 | 5394 | _LT_AC_TAGVAR(ld_shlibs, $1)=no | 5161 | _LT_AC_TAGVAR(ld_shlibs, $1)=no |
2193 | 5395 | ;; | 5162 | ;; |
2194 | 5396 | openbsd*) | 5163 | openbsd*) |
2203 | 5397 | _LT_AC_TAGVAR(hardcode_direct, $1)=yes | 5164 | if test -f /usr/libexec/ld.so; then |
2204 | 5398 | _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no | 5165 | _LT_AC_TAGVAR(hardcode_direct, $1)=yes |
2205 | 5399 | _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' | 5166 | _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no |
2206 | 5400 | _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' | 5167 | _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' |
2207 | 5401 | if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then | 5168 | _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' |
2208 | 5402 | _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' | 5169 | if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then |
2209 | 5403 | _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' | 5170 | _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 | 5404 | _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' | 5171 | _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' |
2211 | 5172 | _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' | ||
2212 | 5173 | fi | ||
2213 | 5174 | output_verbose_link_cmd='echo' | ||
2214 | 5175 | else | ||
2215 | 5176 | _LT_AC_TAGVAR(ld_shlibs, $1)=no | ||
2216 | 5405 | fi | 5177 | fi |
2217 | 5406 | output_verbose_link_cmd='echo' | ||
2218 | 5407 | ;; | 5178 | ;; |
2219 | 5408 | osf3*) | 5179 | osf3*) |
2220 | 5409 | case $cc_basename in | 5180 | case $cc_basename in |
2221 | @@ -5565,15 +5336,10 @@ | |||
2222 | 5565 | case $host_os in | 5336 | case $host_os in |
2223 | 5566 | solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; | 5337 | solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; |
2224 | 5567 | *) | 5338 | *) |
2232 | 5568 | # The C++ compiler is used as linker so we must use $wl | 5339 | # The compiler driver will combine and reorder linker options, |
2233 | 5569 | # flag to pass the commands to the underlying system | 5340 | # but understands `-z linker_flag'. |
2227 | 5570 | # linker. We must also pass each convience library through | ||
2228 | 5571 | # to the system linker between allextract/defaultextract. | ||
2229 | 5572 | # The C++ compiler will combine linker options so we | ||
2230 | 5573 | # cannot just pass the convience library names through | ||
2231 | 5574 | # without $wl. | ||
2234 | 5575 | # Supported since Solaris 2.6 (maybe 2.5.1?) | 5341 | # Supported since Solaris 2.6 (maybe 2.5.1?) |
2236 | 5576 | _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' | 5342 | _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' |
2237 | 5577 | ;; | 5343 | ;; |
2238 | 5578 | esac | 5344 | esac |
2239 | 5579 | _LT_AC_TAGVAR(link_all_deplibs, $1)=yes | 5345 | _LT_AC_TAGVAR(link_all_deplibs, $1)=yes |
2240 | @@ -5620,6 +5386,12 @@ | |||
2241 | 5620 | fi | 5386 | fi |
2242 | 5621 | 5387 | ||
2243 | 5622 | _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' | 5388 | _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' |
2244 | 5389 | case $host_os in | ||
2245 | 5390 | solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; | ||
2246 | 5391 | *) | ||
2247 | 5392 | _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' | ||
2248 | 5393 | ;; | ||
2249 | 5394 | esac | ||
2250 | 5623 | fi | 5395 | fi |
2251 | 5624 | ;; | 5396 | ;; |
2252 | 5625 | esac | 5397 | esac |
2253 | @@ -5735,7 +5507,8 @@ | |||
2254 | 5735 | # compiler output when linking a shared library. | 5507 | # compiler output when linking a shared library. |
2255 | 5736 | # Parse the compiler output and extract the necessary | 5508 | # Parse the compiler output and extract the necessary |
2256 | 5737 | # objects, libraries and library flags. | 5509 | # objects, libraries and library flags. |
2258 | 5738 | AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[ | 5510 | AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP], |
2259 | 5511 | [AC_REQUIRE([LT_AC_PROG_SED])dnl | ||
2260 | 5739 | dnl we can't use the lt_simple_compile_test_code here, | 5512 | dnl we can't use the lt_simple_compile_test_code here, |
2261 | 5740 | dnl because it contains code intended for an executable, | 5513 | dnl because it contains code intended for an executable, |
2262 | 5741 | dnl not a library. It's possible we should let each | 5514 | dnl not a library. It's possible we should let each |
2263 | @@ -5860,10 +5633,15 @@ | |||
2264 | 5860 | 5633 | ||
2265 | 5861 | $rm -f confest.$objext | 5634 | $rm -f confest.$objext |
2266 | 5862 | 5635 | ||
2267 | 5636 | _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= | ||
2268 | 5637 | if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then | ||
2269 | 5638 | _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 | 5639 | fi | ||
2271 | 5640 | |||
2272 | 5863 | # PORTME: override above test on systems where it is broken | 5641 | # PORTME: override above test on systems where it is broken |
2273 | 5864 | ifelse([$1],[CXX], | 5642 | ifelse([$1],[CXX], |
2274 | 5865 | [case $host_os in | 5643 | [case $host_os in |
2276 | 5866 | interix3*) | 5644 | interix[[3-9]]*) |
2277 | 5867 | # Interix 3.5 installs completely hosed .la files for C++, so rather than | 5645 | # Interix 3.5 installs completely hosed .la files for C++, so rather than |
2278 | 5868 | # hack all around it, let's just trust "g++" to DTRT. | 5646 | # hack all around it, let's just trust "g++" to DTRT. |
2279 | 5869 | _LT_AC_TAGVAR(predep_objects,$1)= | 5647 | _LT_AC_TAGVAR(predep_objects,$1)= |
2280 | @@ -5871,19 +5649,51 @@ | |||
2281 | 5871 | _LT_AC_TAGVAR(postdeps,$1)= | 5649 | _LT_AC_TAGVAR(postdeps,$1)= |
2282 | 5872 | ;; | 5650 | ;; |
2283 | 5873 | 5651 | ||
2284 | 5652 | linux*) | ||
2285 | 5653 | case `$CC -V 2>&1 | sed 5q` in | ||
2286 | 5654 | *Sun\ C*) | ||
2287 | 5655 | # Sun C++ 5.9 | ||
2288 | 5656 | # | ||
2289 | 5657 | # The more standards-conforming stlport4 library is | ||
2290 | 5658 | # incompatible with the Cstd library. Avoid specifying | ||
2291 | 5659 | # it if it's in CXXFLAGS. Ignore libCrun as | ||
2292 | 5660 | # -library=stlport4 depends on it. | ||
2293 | 5661 | case " $CXX $CXXFLAGS " in | ||
2294 | 5662 | *" -library=stlport4 "*) | ||
2295 | 5663 | solaris_use_stlport4=yes | ||
2296 | 5664 | ;; | ||
2297 | 5665 | esac | ||
2298 | 5666 | if test "$solaris_use_stlport4" != yes; then | ||
2299 | 5667 | _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' | ||
2300 | 5668 | fi | ||
2301 | 5669 | ;; | ||
2302 | 5670 | esac | ||
2303 | 5671 | ;; | ||
2304 | 5672 | |||
2305 | 5874 | solaris*) | 5673 | solaris*) |
2306 | 5875 | case $cc_basename in | 5674 | case $cc_basename in |
2307 | 5876 | CC*) | 5675 | CC*) |
2308 | 5676 | # The more standards-conforming stlport4 library is | ||
2309 | 5677 | # incompatible with the Cstd library. Avoid specifying | ||
2310 | 5678 | # it if it's in CXXFLAGS. Ignore libCrun as | ||
2311 | 5679 | # -library=stlport4 depends on it. | ||
2312 | 5680 | case " $CXX $CXXFLAGS " in | ||
2313 | 5681 | *" -library=stlport4 "*) | ||
2314 | 5682 | solaris_use_stlport4=yes | ||
2315 | 5683 | ;; | ||
2316 | 5684 | esac | ||
2317 | 5685 | |||
2318 | 5877 | # Adding this requires a known-good setup of shared libraries for | 5686 | # Adding this requires a known-good setup of shared libraries for |
2319 | 5878 | # Sun compiler versions before 5.6, else PIC objects from an old | 5687 | # Sun compiler versions before 5.6, else PIC objects from an old |
2320 | 5879 | # archive will be linked into the output, leading to subtle bugs. | 5688 | # archive will be linked into the output, leading to subtle bugs. |
2322 | 5880 | _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun' | 5689 | if test "$solaris_use_stlport4" != yes; then |
2323 | 5690 | _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' | ||
2324 | 5691 | fi | ||
2325 | 5881 | ;; | 5692 | ;; |
2326 | 5882 | esac | 5693 | esac |
2327 | 5883 | ;; | 5694 | ;; |
2328 | 5884 | esac | 5695 | esac |
2329 | 5885 | ]) | 5696 | ]) |
2330 | 5886 | |||
2331 | 5887 | case " $_LT_AC_TAGVAR(postdeps, $1) " in | 5697 | case " $_LT_AC_TAGVAR(postdeps, $1) " in |
2332 | 5888 | *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; | 5698 | *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; |
2333 | 5889 | esac | 5699 | esac |
2334 | @@ -5926,10 +5736,17 @@ | |||
2335 | 5926 | _LT_AC_TAGVAR(objext, $1)=$objext | 5736 | _LT_AC_TAGVAR(objext, $1)=$objext |
2336 | 5927 | 5737 | ||
2337 | 5928 | # Code to be used in simple compile tests | 5738 | # Code to be used in simple compile tests |
2339 | 5929 | lt_simple_compile_test_code=" subroutine t\n return\n end\n" | 5739 | lt_simple_compile_test_code="\ |
2340 | 5740 | subroutine t | ||
2341 | 5741 | return | ||
2342 | 5742 | end | ||
2343 | 5743 | " | ||
2344 | 5930 | 5744 | ||
2345 | 5931 | # Code to be used in simple link tests | 5745 | # Code to be used in simple link tests |
2347 | 5932 | lt_simple_link_test_code=" program t\n end\n" | 5746 | lt_simple_link_test_code="\ |
2348 | 5747 | program t | ||
2349 | 5748 | end | ||
2350 | 5749 | " | ||
2351 | 5933 | 5750 | ||
2352 | 5934 | # ltmain only uses $CC for tagged configurations so make sure $CC is set. | 5751 | # ltmain only uses $CC for tagged configurations so make sure $CC is set. |
2353 | 5935 | _LT_AC_SYS_COMPILER | 5752 | _LT_AC_SYS_COMPILER |
2354 | @@ -5961,7 +5778,7 @@ | |||
2355 | 5961 | postinstall_cmds='$RANLIB $lib' | 5778 | postinstall_cmds='$RANLIB $lib' |
2356 | 5962 | fi | 5779 | fi |
2357 | 5963 | ;; | 5780 | ;; |
2359 | 5964 | aix4* | aix5*) | 5781 | aix[[4-9]]*) |
2360 | 5965 | if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then | 5782 | if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then |
2361 | 5966 | test "$enable_shared" = yes && enable_static=no | 5783 | test "$enable_shared" = yes && enable_static=no |
2362 | 5967 | fi | 5784 | fi |
2363 | @@ -6008,10 +5825,10 @@ | |||
2364 | 6008 | _LT_AC_TAGVAR(objext, $1)=$objext | 5825 | _LT_AC_TAGVAR(objext, $1)=$objext |
2365 | 6009 | 5826 | ||
2366 | 6010 | # Code to be used in simple compile tests | 5827 | # Code to be used in simple compile tests |
2368 | 6011 | lt_simple_compile_test_code="class foo {}\n" | 5828 | lt_simple_compile_test_code="class foo {}" |
2369 | 6012 | 5829 | ||
2370 | 6013 | # Code to be used in simple link tests | 5830 | # Code to be used in simple link tests |
2372 | 6014 | lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n' | 5831 | lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' |
2373 | 6015 | 5832 | ||
2374 | 6016 | # ltmain only uses $CC for tagged configurations so make sure $CC is set. | 5833 | # ltmain only uses $CC for tagged configurations so make sure $CC is set. |
2375 | 6017 | _LT_AC_SYS_COMPILER | 5834 | _LT_AC_SYS_COMPILER |
2376 | @@ -6064,7 +5881,7 @@ | |||
2377 | 6064 | _LT_AC_TAGVAR(objext, $1)=$objext | 5881 | _LT_AC_TAGVAR(objext, $1)=$objext |
2378 | 6065 | 5882 | ||
2379 | 6066 | # Code to be used in simple compile tests | 5883 | # Code to be used in simple compile tests |
2381 | 6067 | lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n' | 5884 | lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' |
2382 | 6068 | 5885 | ||
2383 | 6069 | # Code to be used in simple link tests | 5886 | # Code to be used in simple link tests |
2384 | 6070 | lt_simple_link_test_code="$lt_simple_compile_test_code" | 5887 | lt_simple_link_test_code="$lt_simple_compile_test_code" |
2385 | @@ -6138,6 +5955,7 @@ | |||
2386 | 6138 | _LT_AC_TAGVAR(predeps, $1) \ | 5955 | _LT_AC_TAGVAR(predeps, $1) \ |
2387 | 6139 | _LT_AC_TAGVAR(postdeps, $1) \ | 5956 | _LT_AC_TAGVAR(postdeps, $1) \ |
2388 | 6140 | _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ | 5957 | _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ |
2389 | 5958 | _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \ | ||
2390 | 6141 | _LT_AC_TAGVAR(archive_cmds, $1) \ | 5959 | _LT_AC_TAGVAR(archive_cmds, $1) \ |
2391 | 6142 | _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ | 5960 | _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ |
2392 | 6143 | _LT_AC_TAGVAR(postinstall_cmds, $1) \ | 5961 | _LT_AC_TAGVAR(postinstall_cmds, $1) \ |
2393 | @@ -6153,6 +5971,7 @@ | |||
2394 | 6153 | _LT_AC_TAGVAR(module_cmds, $1) \ | 5971 | _LT_AC_TAGVAR(module_cmds, $1) \ |
2395 | 6154 | _LT_AC_TAGVAR(module_expsym_cmds, $1) \ | 5972 | _LT_AC_TAGVAR(module_expsym_cmds, $1) \ |
2396 | 6155 | _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \ | 5973 | _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \ |
2397 | 5974 | _LT_AC_TAGVAR(fix_srcfile_path, $1) \ | ||
2398 | 6156 | _LT_AC_TAGVAR(exclude_expsyms, $1) \ | 5975 | _LT_AC_TAGVAR(exclude_expsyms, $1) \ |
2399 | 6157 | _LT_AC_TAGVAR(include_expsyms, $1); do | 5976 | _LT_AC_TAGVAR(include_expsyms, $1); do |
2400 | 6158 | 5977 | ||
2401 | @@ -6199,7 +6018,7 @@ | |||
2402 | 6199 | # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) | 6018 | # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) |
2403 | 6200 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | 6019 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
2404 | 6201 | # | 6020 | # |
2406 | 6202 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 | 6021 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 |
2407 | 6203 | # Free Software Foundation, Inc. | 6022 | # Free Software Foundation, Inc. |
2408 | 6204 | # | 6023 | # |
2409 | 6205 | # This file is part of GNU Libtool: | 6024 | # This file is part of GNU Libtool: |
2410 | @@ -6436,6 +6255,10 @@ | |||
2411 | 6436 | # shared library. | 6255 | # shared library. |
2412 | 6437 | postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) | 6256 | postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) |
2413 | 6438 | 6257 | ||
2414 | 6258 | # The directories searched by this compiler when creating a shared | ||
2415 | 6259 | # library | ||
2416 | 6260 | compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1) | ||
2417 | 6261 | |||
2418 | 6439 | # The library search path used internally by the compiler when linking | 6262 | # The library search path used internally by the compiler when linking |
2419 | 6440 | # a shared library. | 6263 | # a shared library. |
2420 | 6441 | compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | 6264 | compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) |
2421 | @@ -6524,7 +6347,7 @@ | |||
2422 | 6524 | sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec | 6347 | sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec |
2423 | 6525 | 6348 | ||
2424 | 6526 | # Fix the shell variable \$srcfile for the compiler. | 6349 | # Fix the shell variable \$srcfile for the compiler. |
2426 | 6527 | fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)" | 6350 | fix_srcfile_path=$lt_fix_srcfile_path |
2427 | 6528 | 6351 | ||
2428 | 6529 | # Set to yes if exported symbols are required. | 6352 | # Set to yes if exported symbols are required. |
2429 | 6530 | always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) | 6353 | always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) |
2430 | @@ -6607,6 +6430,7 @@ | |||
2431 | 6607 | # --------------------------------- | 6430 | # --------------------------------- |
2432 | 6608 | AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], | 6431 | AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], |
2433 | 6609 | [AC_REQUIRE([AC_CANONICAL_HOST]) | 6432 | [AC_REQUIRE([AC_CANONICAL_HOST]) |
2434 | 6433 | AC_REQUIRE([LT_AC_PROG_SED]) | ||
2435 | 6610 | AC_REQUIRE([AC_PROG_NM]) | 6434 | AC_REQUIRE([AC_PROG_NM]) |
2436 | 6611 | AC_REQUIRE([AC_OBJEXT]) | 6435 | AC_REQUIRE([AC_OBJEXT]) |
2437 | 6612 | # Check for command to grab the raw symbol name followed by C symbol from nm. | 6436 | # Check for command to grab the raw symbol name followed by C symbol from nm. |
2438 | @@ -6784,7 +6608,7 @@ | |||
2439 | 6784 | echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD | 6608 | echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD |
2440 | 6785 | cat conftest.$ac_ext >&5 | 6609 | cat conftest.$ac_ext >&5 |
2441 | 6786 | fi | 6610 | fi |
2443 | 6787 | rm -f conftest* conftst* | 6611 | rm -rf conftest* conftst* |
2444 | 6788 | 6612 | ||
2445 | 6789 | # Do not use the global_symbol_pipe unless it works. | 6613 | # Do not use the global_symbol_pipe unless it works. |
2446 | 6790 | if test "$pipe_works" = yes; then | 6614 | if test "$pipe_works" = yes; then |
2447 | @@ -6833,13 +6657,16 @@ | |||
2448 | 6833 | # like `-m68040'. | 6657 | # like `-m68040'. |
2449 | 6834 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' | 6658 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' |
2450 | 6835 | ;; | 6659 | ;; |
2452 | 6836 | beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) | 6660 | beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) |
2453 | 6837 | # PIC is the default for these OSes. | 6661 | # PIC is the default for these OSes. |
2454 | 6838 | ;; | 6662 | ;; |
2456 | 6839 | mingw* | os2* | pw32*) | 6663 | mingw* | cygwin* | os2* | pw32*) |
2457 | 6840 | # This hack is so that the source file can tell whether it is being | 6664 | # This hack is so that the source file can tell whether it is being |
2458 | 6841 | # built for inclusion in a dll (and should export symbols for example). | 6665 | # built for inclusion in a dll (and should export symbols for example). |
2460 | 6842 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' | 6666 | # Although the cygwin gcc ignores -fPIC, still need this for old-style |
2461 | 6667 | # (--disable-auto-import) libraries | ||
2462 | 6668 | m4_if([$1], [GCJ], [], | ||
2463 | 6669 | [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) | ||
2464 | 6843 | ;; | 6670 | ;; |
2465 | 6844 | darwin* | rhapsody*) | 6671 | darwin* | rhapsody*) |
2466 | 6845 | # PIC is the default on this platform | 6672 | # PIC is the default on this platform |
2467 | @@ -6850,7 +6677,7 @@ | |||
2468 | 6850 | # DJGPP does not support shared libraries at all | 6677 | # DJGPP does not support shared libraries at all |
2469 | 6851 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= | 6678 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= |
2470 | 6852 | ;; | 6679 | ;; |
2472 | 6853 | interix3*) | 6680 | interix[[3-9]]*) |
2473 | 6854 | # Interix 3.x gcc -fpic/-fPIC options generate broken code. | 6681 | # Interix 3.x gcc -fpic/-fPIC options generate broken code. |
2474 | 6855 | # Instead, we relocate shared libraries at runtime. | 6682 | # Instead, we relocate shared libraries at runtime. |
2475 | 6856 | ;; | 6683 | ;; |
2476 | @@ -6876,7 +6703,7 @@ | |||
2477 | 6876 | esac | 6703 | esac |
2478 | 6877 | else | 6704 | else |
2479 | 6878 | case $host_os in | 6705 | case $host_os in |
2481 | 6879 | aix4* | aix5*) | 6706 | aix[[4-9]]*) |
2482 | 6880 | # All AIX code is PIC. | 6707 | # All AIX code is PIC. |
2483 | 6881 | if test "$host_cpu" = ia64; then | 6708 | if test "$host_cpu" = ia64; then |
2484 | 6882 | # AIX 5 now supports IA64 processor | 6709 | # AIX 5 now supports IA64 processor |
2485 | @@ -6972,7 +6799,7 @@ | |||
2486 | 6972 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | 6799 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
2487 | 6973 | _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' | 6800 | _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' |
2488 | 6974 | ;; | 6801 | ;; |
2490 | 6975 | pgCC*) | 6802 | pgCC* | pgcpp*) |
2491 | 6976 | # Portland Group C++ compiler. | 6803 | # Portland Group C++ compiler. |
2492 | 6977 | _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | 6804 | _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
2493 | 6978 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' | 6805 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' |
2494 | @@ -6986,6 +6813,14 @@ | |||
2495 | 6986 | _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' | 6813 | _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' |
2496 | 6987 | ;; | 6814 | ;; |
2497 | 6988 | *) | 6815 | *) |
2498 | 6816 | case `$CC -V 2>&1 | sed 5q` in | ||
2499 | 6817 | *Sun\ C*) | ||
2500 | 6818 | # Sun C++ 5.9 | ||
2501 | 6819 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | ||
2502 | 6820 | _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | ||
2503 | 6821 | _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' | ||
2504 | 6822 | ;; | ||
2505 | 6823 | esac | ||
2506 | 6989 | ;; | 6824 | ;; |
2507 | 6990 | esac | 6825 | esac |
2508 | 6991 | ;; | 6826 | ;; |
2509 | @@ -7106,14 +6941,17 @@ | |||
2510 | 7106 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' | 6941 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' |
2511 | 7107 | ;; | 6942 | ;; |
2512 | 7108 | 6943 | ||
2514 | 7109 | beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) | 6944 | beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) |
2515 | 7110 | # PIC is the default for these OSes. | 6945 | # PIC is the default for these OSes. |
2516 | 7111 | ;; | 6946 | ;; |
2517 | 7112 | 6947 | ||
2519 | 7113 | mingw* | pw32* | os2*) | 6948 | mingw* | cygwin* | pw32* | os2*) |
2520 | 7114 | # This hack is so that the source file can tell whether it is being | 6949 | # This hack is so that the source file can tell whether it is being |
2521 | 7115 | # built for inclusion in a dll (and should export symbols for example). | 6950 | # built for inclusion in a dll (and should export symbols for example). |
2523 | 7116 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' | 6951 | # Although the cygwin gcc ignores -fPIC, still need this for old-style |
2524 | 6952 | # (--disable-auto-import) libraries | ||
2525 | 6953 | m4_if([$1], [GCJ], [], | ||
2526 | 6954 | [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) | ||
2527 | 7117 | ;; | 6955 | ;; |
2528 | 7118 | 6956 | ||
2529 | 7119 | darwin* | rhapsody*) | 6957 | darwin* | rhapsody*) |
2530 | @@ -7122,7 +6960,7 @@ | |||
2531 | 7122 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' | 6960 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' |
2532 | 7123 | ;; | 6961 | ;; |
2533 | 7124 | 6962 | ||
2535 | 7125 | interix3*) | 6963 | interix[[3-9]]*) |
2536 | 7126 | # Interix 3.x gcc -fpic/-fPIC options generate broken code. | 6964 | # Interix 3.x gcc -fpic/-fPIC options generate broken code. |
2537 | 7127 | # Instead, we relocate shared libraries at runtime. | 6965 | # Instead, we relocate shared libraries at runtime. |
2538 | 7128 | ;; | 6966 | ;; |
2539 | @@ -7180,10 +7018,11 @@ | |||
2540 | 7180 | esac | 7018 | esac |
2541 | 7181 | ;; | 7019 | ;; |
2542 | 7182 | 7020 | ||
2544 | 7183 | mingw* | pw32* | os2*) | 7021 | mingw* | cygwin* | pw32* | os2*) |
2545 | 7184 | # This hack is so that the source file can tell whether it is being | 7022 | # This hack is so that the source file can tell whether it is being |
2546 | 7185 | # built for inclusion in a dll (and should export symbols for example). | 7023 | # built for inclusion in a dll (and should export symbols for example). |
2548 | 7186 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' | 7024 | m4_if([$1], [GCJ], [], |
2549 | 7025 | [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) | ||
2550 | 7187 | ;; | 7026 | ;; |
2551 | 7188 | 7027 | ||
2552 | 7189 | hpux9* | hpux10* | hpux11*) | 7028 | hpux9* | hpux10* | hpux11*) |
2553 | @@ -7232,6 +7071,22 @@ | |||
2554 | 7232 | # All Alpha code is PIC. | 7071 | # All Alpha code is PIC. |
2555 | 7233 | _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' | 7072 | _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' |
2556 | 7234 | ;; | 7073 | ;; |
2557 | 7074 | *) | ||
2558 | 7075 | case `$CC -V 2>&1 | sed 5q` in | ||
2559 | 7076 | *Sun\ C*) | ||
2560 | 7077 | # Sun C 5.9 | ||
2561 | 7078 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | ||
2562 | 7079 | _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | ||
2563 | 7080 | _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | ||
2564 | 7081 | ;; | ||
2565 | 7082 | *Sun\ F*) | ||
2566 | 7083 | # Sun Fortran 8.3 passes all unrecognized flags to the linker | ||
2567 | 7084 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | ||
2568 | 7085 | _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | ||
2569 | 7086 | _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='' | ||
2570 | 7087 | ;; | ||
2571 | 7088 | esac | ||
2572 | 7089 | ;; | ||
2573 | 7235 | esac | 7090 | esac |
2574 | 7236 | ;; | 7091 | ;; |
2575 | 7237 | 7092 | ||
2576 | @@ -7241,6 +7096,10 @@ | |||
2577 | 7241 | _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' | 7096 | _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' |
2578 | 7242 | ;; | 7097 | ;; |
2579 | 7243 | 7098 | ||
2580 | 7099 | rdos*) | ||
2581 | 7100 | _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' | ||
2582 | 7101 | ;; | ||
2583 | 7102 | |||
2584 | 7244 | solaris*) | 7103 | solaris*) |
2585 | 7245 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | 7104 | _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
2586 | 7246 | _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | 7105 | _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
2587 | @@ -7300,7 +7159,7 @@ | |||
2588 | 7300 | # | 7159 | # |
2589 | 7301 | if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then | 7160 | if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then |
2590 | 7302 | AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], | 7161 | AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], |
2592 | 7303 | _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), | 7162 | _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1), |
2593 | 7304 | [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], | 7163 | [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], |
2594 | 7305 | [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in | 7164 | [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in |
2595 | 7306 | "" | " "*) ;; | 7165 | "" | " "*) ;; |
2596 | @@ -7324,7 +7183,7 @@ | |||
2597 | 7324 | # | 7183 | # |
2598 | 7325 | wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" | 7184 | wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" |
2599 | 7326 | AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], | 7185 | AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], |
2601 | 7327 | _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), | 7186 | _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1), |
2602 | 7328 | $lt_tmp_static_flag, | 7187 | $lt_tmp_static_flag, |
2603 | 7329 | [], | 7188 | [], |
2604 | 7330 | [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) | 7189 | [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) |
2605 | @@ -7335,11 +7194,12 @@ | |||
2606 | 7335 | # ------------------------------------ | 7194 | # ------------------------------------ |
2607 | 7336 | # See if the linker supports building shared libraries. | 7195 | # See if the linker supports building shared libraries. |
2608 | 7337 | AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], | 7196 | AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], |
2610 | 7338 | [AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) | 7197 | [AC_REQUIRE([LT_AC_PROG_SED])dnl |
2611 | 7198 | AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) | ||
2612 | 7339 | ifelse([$1],[CXX],[ | 7199 | ifelse([$1],[CXX],[ |
2613 | 7340 | _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' | 7200 | _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
2614 | 7341 | case $host_os in | 7201 | case $host_os in |
2616 | 7342 | aix4* | aix5*) | 7202 | aix[[4-9]]*) |
2617 | 7343 | # If we're using GNU nm, then we don't want the "-C" option. | 7203 | # If we're using GNU nm, then we don't want the "-C" option. |
2618 | 7344 | # -C means demangle to AIX nm, but means don't demangle with GNU nm | 7204 | # -C means demangle to AIX nm, but means don't demangle with GNU nm |
2619 | 7345 | if $NM -V 2>&1 | grep 'GNU' > /dev/null; then | 7205 | if $NM -V 2>&1 | grep 'GNU' > /dev/null; then |
2620 | @@ -7352,7 +7212,7 @@ | |||
2621 | 7352 | _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" | 7212 | _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" |
2622 | 7353 | ;; | 7213 | ;; |
2623 | 7354 | cygwin* | mingw*) | 7214 | cygwin* | mingw*) |
2625 | 7355 | _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' | 7215 | _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 | 7356 | ;; | 7216 | ;; |
2627 | 7357 | linux* | k*bsd*-gnu) | 7217 | linux* | k*bsd*-gnu) |
2628 | 7358 | _LT_AC_TAGVAR(link_all_deplibs, $1)=no | 7218 | _LT_AC_TAGVAR(link_all_deplibs, $1)=no |
2629 | @@ -7361,6 +7221,7 @@ | |||
2630 | 7361 | _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' | 7221 | _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
2631 | 7362 | ;; | 7222 | ;; |
2632 | 7363 | esac | 7223 | esac |
2633 | 7224 | _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] | ||
2634 | 7364 | ],[ | 7225 | ],[ |
2635 | 7365 | runpath_var= | 7226 | runpath_var= |
2636 | 7366 | _LT_AC_TAGVAR(allow_undefined_flag, $1)= | 7227 | _LT_AC_TAGVAR(allow_undefined_flag, $1)= |
2637 | @@ -7391,12 +7252,14 @@ | |||
2638 | 7391 | # it will be wrapped by ` (' and `)$', so one must not match beginning or | 7252 | # it will be wrapped by ` (' and `)$', so one must not match beginning or |
2639 | 7392 | # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', | 7253 | # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', |
2640 | 7393 | # as well as any symbol that contains `d'. | 7254 | # as well as any symbol that contains `d'. |
2642 | 7394 | _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_" | 7255 | _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] |
2643 | 7395 | # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out | 7256 | # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out |
2644 | 7396 | # platforms (ab)use it in PIC code, but their linkers get confused if | 7257 | # platforms (ab)use it in PIC code, but their linkers get confused if |
2645 | 7397 | # the symbol is explicitly referenced. Since portable code cannot | 7258 | # the symbol is explicitly referenced. Since portable code cannot |
2646 | 7398 | # rely on this symbol name, it's probably fine to never include it in | 7259 | # rely on this symbol name, it's probably fine to never include it in |
2647 | 7399 | # preloaded symbol tables. | 7260 | # preloaded symbol tables. |
2648 | 7261 | # Exclude shared library initialization/finalization symbols. | ||
2649 | 7262 | dnl Note also adjust exclude_expsyms for C++ above. | ||
2650 | 7400 | extract_expsyms_cmds= | 7263 | extract_expsyms_cmds= |
2651 | 7401 | # Just being paranoid about ensuring that cc_basename is set. | 7264 | # Just being paranoid about ensuring that cc_basename is set. |
2652 | 7402 | _LT_CC_BASENAME([$compiler]) | 7265 | _LT_CC_BASENAME([$compiler]) |
2653 | @@ -7446,7 +7309,7 @@ | |||
2654 | 7446 | 7309 | ||
2655 | 7447 | # See if GNU ld supports shared libraries. | 7310 | # See if GNU ld supports shared libraries. |
2656 | 7448 | case $host_os in | 7311 | case $host_os in |
2658 | 7449 | aix3* | aix4* | aix5*) | 7312 | aix[[3-9]]*) |
2659 | 7450 | # On AIX/PPC, the GNU linker is very broken | 7313 | # On AIX/PPC, the GNU linker is very broken |
2660 | 7451 | if test "$host_cpu" != ia64; then | 7314 | if test "$host_cpu" != ia64; then |
2661 | 7452 | _LT_AC_TAGVAR(ld_shlibs, $1)=no | 7315 | _LT_AC_TAGVAR(ld_shlibs, $1)=no |
2662 | @@ -7494,7 +7357,7 @@ | |||
2663 | 7494 | _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported | 7357 | _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported |
2664 | 7495 | _LT_AC_TAGVAR(always_export_symbols, $1)=no | 7358 | _LT_AC_TAGVAR(always_export_symbols, $1)=no |
2665 | 7496 | _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes | 7359 | _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
2667 | 7497 | _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' | 7360 | _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 | 7498 | 7361 | ||
2669 | 7499 | if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then | 7362 | if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then |
2670 | 7500 | _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' | 7363 | _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 | 7512 | fi | 7375 | fi |
2673 | 7513 | ;; | 7376 | ;; |
2674 | 7514 | 7377 | ||
2676 | 7515 | interix3*) | 7378 | interix[[3-9]]*) |
2677 | 7516 | _LT_AC_TAGVAR(hardcode_direct, $1)=no | 7379 | _LT_AC_TAGVAR(hardcode_direct, $1)=no |
2678 | 7517 | _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no | 7380 | _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no |
2679 | 7518 | _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' | 7381 | _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' |
2680 | @@ -7527,7 +7390,7 @@ | |||
2681 | 7527 | _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' | 7390 | _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 | 7528 | ;; | 7391 | ;; |
2683 | 7529 | 7392 | ||
2685 | 7530 | linux* | k*bsd*-gnu) | 7393 | gnu* | linux* | k*bsd*-gnu) |
2686 | 7531 | if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then | 7394 | if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then |
2687 | 7532 | tmp_addflag= | 7395 | tmp_addflag= |
2688 | 7533 | case $cc_basename,$host_cpu in | 7396 | case $cc_basename,$host_cpu in |
2689 | @@ -7545,13 +7408,22 @@ | |||
2690 | 7545 | ifc* | ifort*) # Intel Fortran compiler | 7408 | ifc* | ifort*) # Intel Fortran compiler |
2691 | 7546 | tmp_addflag=' -nofor_main' ;; | 7409 | tmp_addflag=' -nofor_main' ;; |
2692 | 7547 | esac | 7410 | esac |
2694 | 7548 | _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | 7411 | case `$CC -V 2>&1 | sed 5q` in |
2695 | 7412 | *Sun\ C*) # Sun C 5.9 | ||
2696 | 7413 | _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 | 7414 | tmp_sharedflag='-G' ;; | ||
2698 | 7415 | *Sun\ F*) # Sun Fortran 8.3 | ||
2699 | 7416 | tmp_sharedflag='-G' ;; | ||
2700 | 7417 | *) | ||
2701 | 7418 | tmp_sharedflag='-shared' ;; | ||
2702 | 7419 | esac | ||
2703 | 7420 | _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
2704 | 7549 | 7421 | ||
2705 | 7550 | if test $supports_anon_versioning = yes; then | 7422 | if test $supports_anon_versioning = yes; then |
2706 | 7551 | _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ | 7423 | _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ |
2707 | 7552 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ | 7424 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
2708 | 7553 | $echo "local: *; };" >> $output_objdir/$libname.ver~ | 7425 | $echo "local: *; };" >> $output_objdir/$libname.ver~ |
2710 | 7554 | $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' | 7426 | $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' |
2711 | 7555 | fi | 7427 | fi |
2712 | 7556 | _LT_AC_TAGVAR(link_all_deplibs, $1)=no | 7428 | _LT_AC_TAGVAR(link_all_deplibs, $1)=no |
2713 | 7557 | else | 7429 | else |
2714 | @@ -7592,7 +7464,7 @@ | |||
2715 | 7592 | 7464 | ||
2716 | 7593 | sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) | 7465 | sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) |
2717 | 7594 | case `$LD -v 2>&1` in | 7466 | case `$LD -v 2>&1` in |
2719 | 7595 | *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) | 7467 | *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) |
2720 | 7596 | _LT_AC_TAGVAR(ld_shlibs, $1)=no | 7468 | _LT_AC_TAGVAR(ld_shlibs, $1)=no |
2721 | 7597 | cat <<_LT_EOF 1>&2 | 7469 | cat <<_LT_EOF 1>&2 |
2722 | 7598 | 7470 | ||
2723 | @@ -7657,7 +7529,7 @@ | |||
2724 | 7657 | fi | 7529 | fi |
2725 | 7658 | ;; | 7530 | ;; |
2726 | 7659 | 7531 | ||
2728 | 7660 | aix4* | aix5*) | 7532 | aix[[4-9]]*) |
2729 | 7661 | if test "$host_cpu" = ia64; then | 7533 | if test "$host_cpu" = ia64; then |
2730 | 7662 | # On IA64, the linker does run time linking by default, so we don't | 7534 | # On IA64, the linker does run time linking by default, so we don't |
2731 | 7663 | # have to do anything special. | 7535 | # have to do anything special. |
2732 | @@ -7677,7 +7549,7 @@ | |||
2733 | 7677 | # Test if we are trying to use run time linking or normal | 7549 | # Test if we are trying to use run time linking or normal |
2734 | 7678 | # AIX style linking. If -brtl is somewhere in LDFLAGS, we | 7550 | # AIX style linking. If -brtl is somewhere in LDFLAGS, we |
2735 | 7679 | # need to do runtime linking. | 7551 | # need to do runtime linking. |
2737 | 7680 | case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) | 7552 | case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) |
2738 | 7681 | for ld_flag in $LDFLAGS; do | 7553 | for ld_flag in $LDFLAGS; do |
2739 | 7682 | if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then | 7554 | if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then |
2740 | 7683 | aix_use_runtimelinking=yes | 7555 | aix_use_runtimelinking=yes |
2741 | @@ -7711,7 +7583,7 @@ | |||
2742 | 7711 | strings "$collect2name" | grep resolve_lib_name >/dev/null | 7583 | strings "$collect2name" | grep resolve_lib_name >/dev/null |
2743 | 7712 | then | 7584 | then |
2744 | 7713 | # We have reworked collect2 | 7585 | # We have reworked collect2 |
2746 | 7714 | _LT_AC_TAGVAR(hardcode_direct, $1)=yes | 7586 | : |
2747 | 7715 | else | 7587 | else |
2748 | 7716 | # We have old collect2 | 7588 | # We have old collect2 |
2749 | 7717 | _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported | 7589 | _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported |
2750 | @@ -7804,7 +7676,7 @@ | |||
2751 | 7804 | # The linker will automatically build a .lib file if we build a DLL. | 7676 | # The linker will automatically build a .lib file if we build a DLL. |
2752 | 7805 | _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' | 7677 | _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' |
2753 | 7806 | # FIXME: Should let the user specify the lib program. | 7678 | # FIXME: Should let the user specify the lib program. |
2755 | 7807 | _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs' | 7679 | _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' |
2756 | 7808 | _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' | 7680 | _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' |
2757 | 7809 | _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes | 7681 | _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
2758 | 7810 | ;; | 7682 | ;; |
2759 | @@ -7837,19 +7709,18 @@ | |||
2760 | 7837 | _LT_AC_TAGVAR(link_all_deplibs, $1)=yes | 7709 | _LT_AC_TAGVAR(link_all_deplibs, $1)=yes |
2761 | 7838 | if test "$GCC" = yes ; then | 7710 | if test "$GCC" = yes ; then |
2762 | 7839 | output_verbose_link_cmd='echo' | 7711 | output_verbose_link_cmd='echo' |
2768 | 7840 | _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' | 7712 | _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 | 7841 | _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' | 7713 | _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" |
2770 | 7842 | # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds | 7714 | _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 | 7843 | _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}' | 7715 | _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}" |
2767 | 7844 | _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}' | ||
2772 | 7845 | else | 7716 | else |
2773 | 7846 | case $cc_basename in | 7717 | case $cc_basename in |
2774 | 7847 | xlc*) | 7718 | xlc*) |
2775 | 7848 | output_verbose_link_cmd='echo' | 7719 | output_verbose_link_cmd='echo' |
2777 | 7849 | _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' | 7720 | _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 | 7850 | _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' | 7721 | _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' |
2779 | 7851 | # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds | 7722 | # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds |
2781 | 7852 | _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}' | 7723 | _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 | 7853 | _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}' | 7724 | _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 | 7854 | ;; | 7725 | ;; |
2784 | 7855 | *) | 7726 | *) |
2785 | @@ -8011,24 +7882,28 @@ | |||
2786 | 8011 | ;; | 7882 | ;; |
2787 | 8012 | 7883 | ||
2788 | 8013 | openbsd*) | 7884 | openbsd*) |
2796 | 8014 | _LT_AC_TAGVAR(hardcode_direct, $1)=yes | 7885 | if test -f /usr/libexec/ld.so; then |
2797 | 8015 | _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no | 7886 | _LT_AC_TAGVAR(hardcode_direct, $1)=yes |
2798 | 8016 | if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then | 7887 | _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no |
2799 | 8017 | _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | 7888 | if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then |
2800 | 8018 | _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' | 7889 | _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
2801 | 8019 | _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' | 7890 | _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' |
2802 | 8020 | _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' | 7891 | _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' |
2803 | 7892 | _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' | ||
2804 | 7893 | else | ||
2805 | 7894 | case $host_os in | ||
2806 | 7895 | openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) | ||
2807 | 7896 | _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' | ||
2808 | 7897 | _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' | ||
2809 | 7898 | ;; | ||
2810 | 7899 | *) | ||
2811 | 7900 | _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | ||
2812 | 7901 | _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' | ||
2813 | 7902 | ;; | ||
2814 | 7903 | esac | ||
2815 | 7904 | fi | ||
2816 | 8021 | else | 7905 | else |
2827 | 8022 | case $host_os in | 7906 | _LT_AC_TAGVAR(ld_shlibs, $1)=no |
2818 | 8023 | openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) | ||
2819 | 8024 | _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' | ||
2820 | 8025 | _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' | ||
2821 | 8026 | ;; | ||
2822 | 8027 | *) | ||
2823 | 8028 | _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | ||
2824 | 8029 | _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' | ||
2825 | 8030 | ;; | ||
2826 | 8031 | esac | ||
2828 | 8032 | fi | 7907 | fi |
2829 | 8033 | ;; | 7908 | ;; |
2830 | 8034 | 7909 | ||
2831 | @@ -8087,17 +7962,16 @@ | |||
2832 | 8087 | case $host_os in | 7962 | case $host_os in |
2833 | 8088 | solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; | 7963 | solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; |
2834 | 8089 | *) | 7964 | *) |
2839 | 8090 | # The compiler driver will combine linker options so we | 7965 | # The compiler driver will combine and reorder linker options, |
2840 | 8091 | # cannot just pass the convience library names through | 7966 | # but understands `-z linker_flag'. GCC discards it without `$wl', |
2841 | 8092 | # without $wl, iff we do not link with $LD. | 7967 | # but is careful enough not to reorder. |
2838 | 8093 | # Luckily, gcc supports the same syntax we need for Sun Studio. | ||
2842 | 8094 | # Supported since Solaris 2.6 (maybe 2.5.1?) | 7968 | # Supported since Solaris 2.6 (maybe 2.5.1?) |
2849 | 8095 | case $wlarc in | 7969 | if test "$GCC" = yes; then |
2850 | 8096 | '') | 7970 | _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' |
2851 | 8097 | _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; | 7971 | else |
2852 | 8098 | *) | 7972 | _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' |
2853 | 8099 | _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' ;; | 7973 | fi |
2854 | 8100 | esac ;; | 7974 | ;; |
2855 | 8101 | esac | 7975 | esac |
2856 | 8102 | _LT_AC_TAGVAR(link_all_deplibs, $1)=yes | 7976 | _LT_AC_TAGVAR(link_all_deplibs, $1)=yes |
2857 | 8103 | ;; | 7977 | ;; |
2858 | @@ -8154,7 +8028,7 @@ | |||
2859 | 8154 | fi | 8028 | fi |
2860 | 8155 | ;; | 8029 | ;; |
2861 | 8156 | 8030 | ||
2863 | 8157 | sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*) | 8031 | sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) |
2864 | 8158 | _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' | 8032 | _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' |
2865 | 8159 | _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no | 8033 | _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no |
2866 | 8160 | _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no | 8034 | _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no |
2867 | @@ -8229,7 +8103,7 @@ | |||
2868 | 8229 | # to ld, don't add -lc before -lgcc. | 8103 | # to ld, don't add -lc before -lgcc. |
2869 | 8230 | AC_MSG_CHECKING([whether -lc should be explicitly linked in]) | 8104 | AC_MSG_CHECKING([whether -lc should be explicitly linked in]) |
2870 | 8231 | $rm conftest* | 8105 | $rm conftest* |
2872 | 8232 | printf "$lt_simple_compile_test_code" > conftest.$ac_ext | 8106 | echo "$lt_simple_compile_test_code" > conftest.$ac_ext |
2873 | 8233 | 8107 | ||
2874 | 8234 | if AC_TRY_EVAL(ac_compile) 2>conftest.err; then | 8108 | if AC_TRY_EVAL(ac_compile) 2>conftest.err; then |
2875 | 8235 | soname=conftest | 8109 | soname=conftest |
2876 | @@ -8332,6 +8206,30 @@ | |||
2877 | 8332 | [AC_CHECK_TOOL(RC, windres, no) | 8206 | [AC_CHECK_TOOL(RC, windres, no) |
2878 | 8333 | ]) | 8207 | ]) |
2879 | 8334 | 8208 | ||
2880 | 8209 | |||
2881 | 8210 | # Cheap backport of AS_EXECUTABLE_P and required macros | ||
2882 | 8211 | # from Autoconf 2.59; we should not use $as_executable_p directly. | ||
2883 | 8212 | |||
2884 | 8213 | # _AS_TEST_PREPARE | ||
2885 | 8214 | # ---------------- | ||
2886 | 8215 | m4_ifndef([_AS_TEST_PREPARE], | ||
2887 | 8216 | [m4_defun([_AS_TEST_PREPARE], | ||
2888 | 8217 | [if test -x / >/dev/null 2>&1; then | ||
2889 | 8218 | as_executable_p='test -x' | ||
2890 | 8219 | else | ||
2891 | 8220 | as_executable_p='test -f' | ||
2892 | 8221 | fi | ||
2893 | 8222 | ])])# _AS_TEST_PREPARE | ||
2894 | 8223 | |||
2895 | 8224 | # AS_EXECUTABLE_P | ||
2896 | 8225 | # --------------- | ||
2897 | 8226 | # Check whether a file is executable. | ||
2898 | 8227 | m4_ifndef([AS_EXECUTABLE_P], | ||
2899 | 8228 | [m4_defun([AS_EXECUTABLE_P], | ||
2900 | 8229 | [AS_REQUIRE([_AS_TEST_PREPARE])dnl | ||
2901 | 8230 | $as_executable_p $1[]dnl | ||
2902 | 8231 | ])])# AS_EXECUTABLE_P | ||
2903 | 8232 | |||
2904 | 8335 | # NOTE: This macro has been submitted for inclusion into # | 8233 | # NOTE: This macro has been submitted for inclusion into # |
2905 | 8336 | # GNU Autoconf as AC_PROG_SED. When it is available in # | 8234 | # GNU Autoconf as AC_PROG_SED. When it is available in # |
2906 | 8337 | # a released version of Autoconf we should remove this # | 8235 | # a released version of Autoconf we should remove this # |
2907 | @@ -8352,12 +8250,13 @@ | |||
2908 | 8352 | test -z "$as_dir" && as_dir=. | 8250 | test -z "$as_dir" && as_dir=. |
2909 | 8353 | for lt_ac_prog in sed gsed; do | 8251 | for lt_ac_prog in sed gsed; do |
2910 | 8354 | for ac_exec_ext in '' $ac_executable_extensions; do | 8252 | for ac_exec_ext in '' $ac_executable_extensions; do |
2912 | 8355 | if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then | 8253 | if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then |
2913 | 8356 | lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" | 8254 | lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" |
2914 | 8357 | fi | 8255 | fi |
2915 | 8358 | done | 8256 | done |
2916 | 8359 | done | 8257 | done |
2917 | 8360 | done | 8258 | done |
2918 | 8259 | IFS=$as_save_IFS | ||
2919 | 8361 | lt_ac_max=0 | 8260 | lt_ac_max=0 |
2920 | 8362 | lt_ac_count=0 | 8261 | lt_ac_count=0 |
2921 | 8363 | # Add /usr/xpg4/bin/sed as it is typically found on Solaris | 8262 | # Add /usr/xpg4/bin/sed as it is typically found on Solaris |
2922 | @@ -8390,402 +8289,10 @@ | |||
2923 | 8390 | done | 8289 | done |
2924 | 8391 | ]) | 8290 | ]) |
2925 | 8392 | SED=$lt_cv_path_SED | 8291 | SED=$lt_cv_path_SED |
2926 | 8292 | AC_SUBST([SED]) | ||
2927 | 8393 | AC_MSG_RESULT([$SED]) | 8293 | AC_MSG_RESULT([$SED]) |
2928 | 8394 | ]) | 8294 | ]) |
2929 | 8395 | 8295 | ||
2930 | 8396 | # lock.m4 serial 6 (gettext-0.16) | ||
2931 | 8397 | dnl Copyright (C) 2005-2006 Free Software Foundation, Inc. | ||
2932 | 8398 | dnl This file is free software; the Free Software Foundation | ||
2933 | 8399 | dnl gives unlimited permission to copy and/or distribute it, | ||
2934 | 8400 | dnl with or without modifications, as long as this notice is preserved. | ||
2935 | 8401 | |||
2936 | 8402 | dnl From Bruno Haible. | ||
2937 | 8403 | |||
2938 | 8404 | dnl Tests for a multithreading library to be used. | ||
2939 | 8405 | dnl Defines at most one of the macros USE_POSIX_THREADS, USE_SOLARIS_THREADS, | ||
2940 | 8406 | dnl USE_PTH_THREADS, USE_WIN32_THREADS | ||
2941 | 8407 | dnl Sets the variables LIBTHREAD and LTLIBTHREAD to the linker options for use | ||
2942 | 8408 | dnl in a Makefile (LIBTHREAD for use without libtool, LTLIBTHREAD for use with | ||
2943 | 8409 | dnl libtool). | ||
2944 | 8410 | dnl Sets the variables LIBMULTITHREAD and LTLIBMULTITHREAD similarly, for | ||
2945 | 8411 | dnl programs that really need multithread functionality. The difference | ||
2946 | 8412 | dnl between LIBTHREAD and LIBMULTITHREAD is that on platforms supporting weak | ||
2947 | 8413 | dnl symbols, typically LIBTHREAD="" whereas LIBMULTITHREAD="-lpthread". | ||
2948 | 8414 | dnl Adds to CPPFLAGS the flag -D_REENTRANT or -D_THREAD_SAFE if needed for | ||
2949 | 8415 | dnl multithread-safe programs. | ||
2950 | 8416 | |||
2951 | 8417 | AC_DEFUN([gl_LOCK_EARLY], | ||
2952 | 8418 | [ | ||
2953 | 8419 | AC_REQUIRE([gl_LOCK_EARLY_BODY]) | ||
2954 | 8420 | ]) | ||
2955 | 8421 | |||
2956 | 8422 | dnl The guts of gl_LOCK_EARLY. Needs to be expanded only once. | ||
2957 | 8423 | |||
2958 | 8424 | AC_DEFUN([gl_LOCK_EARLY_BODY], | ||
2959 | 8425 | [ | ||
2960 | 8426 | dnl Ordering constraints: This macro modifies CPPFLAGS in a way that | ||
2961 | 8427 | dnl influences the result of the autoconf tests that test for *_unlocked | ||
2962 | 8428 | dnl declarations, on AIX 5 at least. Therefore it must come early. | ||
2963 | 8429 | AC_BEFORE([$0], [gl_FUNC_GLIBC_UNLOCKED_IO])dnl | ||
2964 | 8430 | AC_BEFORE([$0], [gl_ARGP])dnl | ||
2965 | 8431 | |||
2966 | 8432 | AC_REQUIRE([AC_CANONICAL_HOST]) | ||
2967 | 8433 | AC_REQUIRE([AC_GNU_SOURCE]) dnl needed for pthread_rwlock_t on glibc systems | ||
2968 | 8434 | dnl Check for multithreading. | ||
2969 | 8435 | AC_ARG_ENABLE(threads, | ||
2970 | 8436 | AC_HELP_STRING([--enable-threads={posix|solaris|pth|win32}], [specify multithreading API]) | ||
2971 | 8437 | AC_HELP_STRING([--disable-threads], [build without multithread safety]), | ||
2972 | 8438 | [gl_use_threads=$enableval], | ||
2973 | 8439 | [case "$host_os" in | ||
2974 | 8440 | dnl Disable multithreading by default on OSF/1, because it interferes | ||
2975 | 8441 | dnl with fork()/exec(): When msgexec is linked with -lpthread, its child | ||
2976 | 8442 | dnl process gets an endless segmentation fault inside execvp(). | ||
2977 | 8443 | osf*) gl_use_threads=no ;; | ||
2978 | 8444 | *) gl_use_threads=yes ;; | ||
2979 | 8445 | esac | ||
2980 | 8446 | ]) | ||
2981 | 8447 | if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then | ||
2982 | 8448 | # For using <pthread.h>: | ||
2983 | 8449 | case "$host_os" in | ||
2984 | 8450 | osf*) | ||
2985 | 8451 | # On OSF/1, the compiler needs the flag -D_REENTRANT so that it | ||
2986 | 8452 | # groks <pthread.h>. cc also understands the flag -pthread, but | ||
2987 | 8453 | # we don't use it because 1. gcc-2.95 doesn't understand -pthread, | ||
2988 | 8454 | # 2. putting a flag into CPPFLAGS that has an effect on the linker | ||
2989 | 8455 | # causes the AC_TRY_LINK test below to succeed unexpectedly, | ||
2990 | 8456 | # leading to wrong values of LIBTHREAD and LTLIBTHREAD. | ||
2991 | 8457 | CPPFLAGS="$CPPFLAGS -D_REENTRANT" | ||
2992 | 8458 | ;; | ||
2993 | 8459 | esac | ||
2994 | 8460 | # Some systems optimize for single-threaded programs by default, and | ||
2995 | 8461 | # need special flags to disable these optimizations. For example, the | ||
2996 | 8462 | # definition of 'errno' in <errno.h>. | ||
2997 | 8463 | case "$host_os" in | ||
2998 | 8464 | aix* | freebsd*) CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" ;; | ||
2999 | 8465 | solaris*) CPPFLAGS="$CPPFLAGS -D_REENTRANT" ;; | ||
3000 | 8466 | esac | ||
3001 | 8467 | fi | ||
3002 | 8468 | ]) | ||
3003 | 8469 | |||
3004 | 8470 | dnl The guts of gl_LOCK. Needs to be expanded only once. | ||
3005 | 8471 | |||
3006 | 8472 | AC_DEFUN([gl_LOCK_BODY], | ||
3007 | 8473 | [ | ||
3008 | 8474 | AC_REQUIRE([gl_LOCK_EARLY_BODY]) | ||
3009 | 8475 | gl_threads_api=none | ||
3010 | 8476 | LIBTHREAD= | ||
3011 | 8477 | LTLIBTHREAD= | ||
3012 | 8478 | LIBMULTITHREAD= | ||
3013 | 8479 | LTLIBMULTITHREAD= | ||
3014 | 8480 | if test "$gl_use_threads" != no; then | ||
3015 | 8481 | dnl Check whether the compiler and linker support weak declarations. | ||
3016 | 8482 | AC_MSG_CHECKING([whether imported symbols can be declared weak]) | ||
3017 | 8483 | gl_have_weak=no | ||
3018 | 8484 | AC_TRY_LINK([extern void xyzzy (); | ||
3019 | 8485 | #pragma weak xyzzy], [xyzzy();], [gl_have_weak=yes]) | ||
3020 | 8486 | AC_MSG_RESULT([$gl_have_weak]) | ||
3021 | 8487 | if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then | ||
3022 | 8488 | # On OSF/1, the compiler needs the flag -pthread or -D_REENTRANT so that | ||
3023 | 8489 | # it groks <pthread.h>. It's added above, in gl_LOCK_EARLY_BODY. | ||
3024 | 8490 | AC_CHECK_HEADER(pthread.h, gl_have_pthread_h=yes, gl_have_pthread_h=no) | ||
3025 | 8491 | if test "$gl_have_pthread_h" = yes; then | ||
3026 | 8492 | # Other possible tests: | ||
3027 | 8493 | # -lpthreads (FSU threads, PCthreads) | ||
3028 | 8494 | # -lgthreads | ||
3029 | 8495 | gl_have_pthread= | ||
3030 | 8496 | # Test whether both pthread_mutex_lock and pthread_mutexattr_init exist | ||
3031 | 8497 | # in libc. IRIX 6.5 has the first one in both libc and libpthread, but | ||
3032 | 8498 | # the second one only in libpthread, and lock.c needs it. | ||
3033 | 8499 | AC_TRY_LINK([#include <pthread.h>], | ||
3034 | 8500 | [pthread_mutex_lock((pthread_mutex_t*)0); | ||
3035 | 8501 | pthread_mutexattr_init((pthread_mutexattr_t*)0);], | ||
3036 | 8502 | [gl_have_pthread=yes]) | ||
3037 | 8503 | # Test for libpthread by looking for pthread_kill. (Not pthread_self, | ||
3038 | 8504 | # since it is defined as a macro on OSF/1.) | ||
3039 | 8505 | if test -n "$gl_have_pthread"; then | ||
3040 | 8506 | # The program links fine without libpthread. But it may actually | ||
3041 | 8507 | # need to link with libpthread in order to create multiple threads. | ||
3042 | 8508 | AC_CHECK_LIB(pthread, pthread_kill, | ||
3043 | 8509 | [LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread | ||
3044 | 8510 | # On Solaris and HP-UX, most pthread functions exist also in libc. | ||
3045 | 8511 | # Therefore pthread_in_use() needs to actually try to create a | ||
3046 | 8512 | # thread: pthread_create from libc will fail, whereas | ||
3047 | 8513 | # pthread_create will actually create a thread. | ||
3048 | 8514 | case "$host_os" in | ||
3049 | 8515 | solaris* | hpux*) | ||
3050 | 8516 | AC_DEFINE([PTHREAD_IN_USE_DETECTION_HARD], 1, | ||
3051 | 8517 | [Define if the pthread_in_use() detection is hard.]) | ||
3052 | 8518 | esac | ||
3053 | 8519 | ]) | ||
3054 | 8520 | else | ||
3055 | 8521 | # Some library is needed. Try libpthread and libc_r. | ||
3056 | 8522 | AC_CHECK_LIB(pthread, pthread_kill, | ||
3057 | 8523 | [gl_have_pthread=yes | ||
3058 | 8524 | LIBTHREAD=-lpthread LTLIBTHREAD=-lpthread | ||
3059 | 8525 | LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread]) | ||
3060 | 8526 | if test -z "$gl_have_pthread"; then | ||
3061 | 8527 | # For FreeBSD 4. | ||
3062 | 8528 | AC_CHECK_LIB(c_r, pthread_kill, | ||
3063 | 8529 | [gl_have_pthread=yes | ||
3064 | 8530 | LIBTHREAD=-lc_r LTLIBTHREAD=-lc_r | ||
3065 | 8531 | LIBMULTITHREAD=-lc_r LTLIBMULTITHREAD=-lc_r]) | ||
3066 | 8532 | fi | ||
3067 | 8533 | fi | ||
3068 | 8534 | if test -n "$gl_have_pthread"; then | ||
3069 | 8535 | gl_threads_api=posix | ||
3070 | 8536 | AC_DEFINE([USE_POSIX_THREADS], 1, | ||
3071 | 8537 | [Define if the POSIX multithreading library can be used.]) | ||
3072 | 8538 | if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then | ||
3073 | 8539 | if test $gl_have_weak = yes; then | ||
3074 | 8540 | AC_DEFINE([USE_POSIX_THREADS_WEAK], 1, | ||
3075 | 8541 | [Define if references to the POSIX multithreading library should be made weak.]) | ||
3076 | 8542 | LIBTHREAD= | ||
3077 | 8543 | LTLIBTHREAD= | ||
3078 | 8544 | fi | ||
3079 | 8545 | fi | ||
3080 | 8546 | # OSF/1 4.0 and MacOS X 10.1 lack the pthread_rwlock_t type and the | ||
3081 | 8547 | # pthread_rwlock_* functions. | ||
3082 | 8548 | AC_CHECK_TYPE([pthread_rwlock_t], | ||
3083 | 8549 | [AC_DEFINE([HAVE_PTHREAD_RWLOCK], 1, | ||
3084 | 8550 | [Define if the POSIX multithreading library has read/write locks.])], | ||
3085 | 8551 | [], | ||
3086 | 8552 | [#include <pthread.h>]) | ||
3087 | 8553 | # glibc defines PTHREAD_MUTEX_RECURSIVE as enum, not as a macro. | ||
3088 | 8554 | AC_TRY_COMPILE([#include <pthread.h>], | ||
3089 | 8555 | [#if __FreeBSD__ == 4 | ||
3090 | 8556 | error "No, in FreeBSD 4.0 recursive mutexes actually don't work." | ||
3091 | 8557 | #else | ||
3092 | 8558 | int x = (int)PTHREAD_MUTEX_RECURSIVE; | ||
3093 | 8559 | return !x; | ||
3094 | 8560 | #endif], | ||
3095 | 8561 | [AC_DEFINE([HAVE_PTHREAD_MUTEX_RECURSIVE], 1, | ||
3096 | 8562 | [Define if the <pthread.h> defines PTHREAD_MUTEX_RECURSIVE.])]) | ||
3097 | 8563 | fi | ||
3098 | 8564 | fi | ||
3099 | 8565 | fi | ||
3100 | 8566 | if test -z "$gl_have_pthread"; then | ||
3101 | 8567 | if test "$gl_use_threads" = yes || test "$gl_use_threads" = solaris; then | ||
3102 | 8568 | gl_have_solaristhread= | ||
3103 | 8569 | gl_save_LIBS="$LIBS" | ||
3104 | 8570 | LIBS="$LIBS -lthread" | ||
3105 | 8571 | AC_TRY_LINK([#include <thread.h> | ||
3106 | 8572 | #include <synch.h>], | ||
3107 | 8573 | [thr_self();], | ||
3108 | 8574 | [gl_have_solaristhread=yes]) | ||
3109 | 8575 | LIBS="$gl_save_LIBS" | ||
3110 | 8576 | if test -n "$gl_have_solaristhread"; then | ||
3111 | 8577 | gl_threads_api=solaris | ||
3112 | 8578 | LIBTHREAD=-lthread | ||
3113 | 8579 | LTLIBTHREAD=-lthread | ||
3114 | 8580 | LIBMULTITHREAD="$LIBTHREAD" | ||
3115 | 8581 | LTLIBMULTITHREAD="$LTLIBTHREAD" | ||
3116 | 8582 | AC_DEFINE([USE_SOLARIS_THREADS], 1, | ||
3117 | 8583 | [Define if the old Solaris multithreading library can be used.]) | ||
3118 | 8584 | if test $gl_have_weak = yes; then | ||
3119 | 8585 | AC_DEFINE([USE_SOLARIS_THREADS_WEAK], 1, | ||
3120 | 8586 | [Define if references to the old Solaris multithreading library should be made weak.]) | ||
3121 | 8587 | LIBTHREAD= | ||
3122 | 8588 | LTLIBTHREAD= | ||
3123 | 8589 | fi | ||
3124 | 8590 | fi | ||
3125 | 8591 | fi | ||
3126 | 8592 | fi | ||
3127 | 8593 | if test "$gl_use_threads" = pth; then | ||
3128 | 8594 | gl_save_CPPFLAGS="$CPPFLAGS" | ||
3129 | 8595 | AC_LIB_LINKFLAGS(pth) | ||
3130 | 8596 | gl_have_pth= | ||
3131 | 8597 | gl_save_LIBS="$LIBS" | ||
3132 | 8598 | LIBS="$LIBS -lpth" | ||
3133 | 8599 | AC_TRY_LINK([#include <pth.h>], [pth_self();], gl_have_pth=yes) | ||
3134 | 8600 | LIBS="$gl_save_LIBS" | ||
3135 | 8601 | if test -n "$gl_have_pth"; then | ||
3136 | 8602 | gl_threads_api=pth | ||
3137 | 8603 | LIBTHREAD="$LIBPTH" | ||
3138 | 8604 | LTLIBTHREAD="$LTLIBPTH" | ||
3139 | 8605 | LIBMULTITHREAD="$LIBTHREAD" | ||
3140 | 8606 | LTLIBMULTITHREAD="$LTLIBTHREAD" | ||
3141 | 8607 | AC_DEFINE([USE_PTH_THREADS], 1, | ||
3142 | 8608 | [Define if the GNU Pth multithreading library can be used.]) | ||
3143 | 8609 | if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then | ||
3144 | 8610 | if test $gl_have_weak = yes; then | ||
3145 | 8611 | AC_DEFINE([USE_PTH_THREADS_WEAK], 1, | ||
3146 | 8612 | [Define if references to the GNU Pth multithreading library should be made weak.]) | ||
3147 | 8613 | LIBTHREAD= | ||
3148 | 8614 | LTLIBTHREAD= | ||
3149 | 8615 | fi | ||
3150 | 8616 | fi | ||
3151 | 8617 | else | ||
3152 | 8618 | CPPFLAGS="$gl_save_CPPFLAGS" | ||
3153 | 8619 | fi | ||
3154 | 8620 | fi | ||
3155 | 8621 | if test -z "$gl_have_pthread"; then | ||
3156 | 8622 | if test "$gl_use_threads" = yes || test "$gl_use_threads" = win32; then | ||
3157 | 8623 | if { case "$host_os" in | ||
3158 | 8624 | mingw*) true;; | ||
3159 | 8625 | *) false;; | ||
3160 | 8626 | esac | ||
3161 | 8627 | }; then | ||
3162 | 8628 | gl_threads_api=win32 | ||
3163 | 8629 | AC_DEFINE([USE_WIN32_THREADS], 1, | ||
3164 | 8630 | [Define if the Win32 multithreading API can be used.]) | ||
3165 | 8631 | fi | ||
3166 | 8632 | fi | ||
3167 | 8633 | fi | ||
3168 | 8634 | fi | ||
3169 | 8635 | AC_MSG_CHECKING([for multithread API to use]) | ||
3170 | 8636 | AC_MSG_RESULT([$gl_threads_api]) | ||
3171 | 8637 | AC_SUBST(LIBTHREAD) | ||
3172 | 8638 | AC_SUBST(LTLIBTHREAD) | ||
3173 | 8639 | AC_SUBST(LIBMULTITHREAD) | ||
3174 | 8640 | AC_SUBST(LTLIBMULTITHREAD) | ||
3175 | 8641 | ]) | ||
3176 | 8642 | |||
3177 | 8643 | AC_DEFUN([gl_LOCK], | ||
3178 | 8644 | [ | ||
3179 | 8645 | AC_REQUIRE([gl_LOCK_EARLY]) | ||
3180 | 8646 | AC_REQUIRE([gl_LOCK_BODY]) | ||
3181 | 8647 | gl_PREREQ_LOCK | ||
3182 | 8648 | ]) | ||
3183 | 8649 | |||
3184 | 8650 | # Prerequisites of lib/lock.c. | ||
3185 | 8651 | AC_DEFUN([gl_PREREQ_LOCK], [ | ||
3186 | 8652 | AC_REQUIRE([AC_C_INLINE]) | ||
3187 | 8653 | ]) | ||
3188 | 8654 | |||
3189 | 8655 | dnl Survey of platforms: | ||
3190 | 8656 | dnl | ||
3191 | 8657 | dnl Platform Available Compiler Supports test-lock | ||
3192 | 8658 | dnl flavours option weak result | ||
3193 | 8659 | dnl --------------- --------- --------- -------- --------- | ||
3194 | 8660 | dnl Linux 2.4/glibc posix -lpthread Y OK | ||
3195 | 8661 | dnl | ||
3196 | 8662 | dnl GNU Hurd/glibc posix | ||
3197 | 8663 | dnl | ||
3198 | 8664 | dnl FreeBSD 5.3 posix -lc_r Y | ||
3199 | 8665 | dnl posix -lkse ? Y | ||
3200 | 8666 | dnl posix -lpthread ? Y | ||
3201 | 8667 | dnl posix -lthr Y | ||
3202 | 8668 | dnl | ||
3203 | 8669 | dnl FreeBSD 5.2 posix -lc_r Y | ||
3204 | 8670 | dnl posix -lkse Y | ||
3205 | 8671 | dnl posix -lthr Y | ||
3206 | 8672 | dnl | ||
3207 | 8673 | dnl FreeBSD 4.0,4.10 posix -lc_r Y OK | ||
3208 | 8674 | dnl | ||
3209 | 8675 | dnl NetBSD 1.6 -- | ||
3210 | 8676 | dnl | ||
3211 | 8677 | dnl OpenBSD 3.4 posix -lpthread Y OK | ||
3212 | 8678 | dnl | ||
3213 | 8679 | dnl MacOS X 10.[123] posix -lpthread Y OK | ||
3214 | 8680 | dnl | ||
3215 | 8681 | dnl Solaris 7,8,9 posix -lpthread Y Sol 7,8: 0.0; Sol 9: OK | ||
3216 | 8682 | dnl solaris -lthread Y Sol 7,8: 0.0; Sol 9: OK | ||
3217 | 8683 | dnl | ||
3218 | 8684 | dnl HP-UX 11 posix -lpthread N (cc) OK | ||
3219 | 8685 | dnl Y (gcc) | ||
3220 | 8686 | dnl | ||
3221 | 8687 | dnl IRIX 6.5 posix -lpthread Y 0.5 | ||
3222 | 8688 | dnl | ||
3223 | 8689 | dnl AIX 4.3,5.1 posix -lpthread N AIX 4: 0.5; AIX 5: OK | ||
3224 | 8690 | dnl | ||
3225 | 8691 | dnl OSF/1 4.0,5.1 posix -pthread (cc) N OK | ||
3226 | 8692 | dnl -lpthread (gcc) Y | ||
3227 | 8693 | dnl | ||
3228 | 8694 | dnl Cygwin posix -lpthread Y OK | ||
3229 | 8695 | dnl | ||
3230 | 8696 | dnl Any of the above pth -lpth 0.0 | ||
3231 | 8697 | dnl | ||
3232 | 8698 | dnl Mingw win32 N OK | ||
3233 | 8699 | dnl | ||
3234 | 8700 | dnl BeOS 5 -- | ||
3235 | 8701 | dnl | ||
3236 | 8702 | dnl The test-lock result shows what happens if in test-lock.c EXPLICIT_YIELD is | ||
3237 | 8703 | dnl turned off: | ||
3238 | 8704 | dnl OK if all three tests terminate OK, | ||
3239 | 8705 | dnl 0.5 if the first test terminates OK but the second one loops endlessly, | ||
3240 | 8706 | dnl 0.0 if the first test already loops endlessly. | ||
3241 | 8707 | |||
3242 | 8708 | # longdouble.m4 serial 2 (gettext-0.15) | ||
3243 | 8709 | dnl Copyright (C) 2002-2003, 2006 Free Software Foundation, Inc. | ||
3244 | 8710 | dnl This file is free software; the Free Software Foundation | ||
3245 | 8711 | dnl gives unlimited permission to copy and/or distribute it, | ||
3246 | 8712 | dnl with or without modifications, as long as this notice is preserved. | ||
3247 | 8713 | |||
3248 | 8714 | dnl From Bruno Haible. | ||
3249 | 8715 | dnl Test whether the compiler supports the 'long double' type. | ||
3250 | 8716 | dnl Prerequisite: AC_PROG_CC | ||
3251 | 8717 | |||
3252 | 8718 | dnl This file is only needed in autoconf <= 2.59. Newer versions of autoconf | ||
3253 | 8719 | dnl have a macro AC_TYPE_LONG_DOUBLE with identical semantics. | ||
3254 | 8720 | |||
3255 | 8721 | AC_DEFUN([gt_TYPE_LONGDOUBLE], | ||
3256 | 8722 | [ | ||
3257 | 8723 | AC_CACHE_CHECK([for long double], gt_cv_c_long_double, | ||
3258 | 8724 | [if test "$GCC" = yes; then | ||
3259 | 8725 | gt_cv_c_long_double=yes | ||
3260 | 8726 | else | ||
3261 | 8727 | AC_TRY_COMPILE([ | ||
3262 | 8728 | /* The Stardent Vistra knows sizeof(long double), but does not support it. */ | ||
3263 | 8729 | long double foo = 0.0; | ||
3264 | 8730 | /* On Ultrix 4.3 cc, long double is 4 and double is 8. */ | ||
3265 | 8731 | int array [2*(sizeof(long double) >= sizeof(double)) - 1]; | ||
3266 | 8732 | ], , | ||
3267 | 8733 | gt_cv_c_long_double=yes, gt_cv_c_long_double=no) | ||
3268 | 8734 | fi]) | ||
3269 | 8735 | if test $gt_cv_c_long_double = yes; then | ||
3270 | 8736 | AC_DEFINE(HAVE_LONG_DOUBLE, 1, [Define if you have the 'long double' type.]) | ||
3271 | 8737 | fi | ||
3272 | 8738 | ]) | ||
3273 | 8739 | |||
3274 | 8740 | # longlong.m4 serial 8 | ||
3275 | 8741 | dnl Copyright (C) 1999-2006 Free Software Foundation, Inc. | ||
3276 | 8742 | dnl This file is free software; the Free Software Foundation | ||
3277 | 8743 | dnl gives unlimited permission to copy and/or distribute it, | ||
3278 | 8744 | dnl with or without modifications, as long as this notice is preserved. | ||
3279 | 8745 | |||
3280 | 8746 | dnl From Paul Eggert. | ||
3281 | 8747 | |||
3282 | 8748 | # Define HAVE_LONG_LONG_INT if 'long long int' works. | ||
3283 | 8749 | # This fixes a bug in Autoconf 2.60, but can be removed once we | ||
3284 | 8750 | # assume 2.61 everywhere. | ||
3285 | 8751 | |||
3286 | 8752 | # Note: If the type 'long long int' exists but is only 32 bits large | ||
3287 | 8753 | # (as on some very old compilers), AC_TYPE_LONG_LONG_INT will not be | ||
3288 | 8754 | # defined. In this case you can treat 'long long int' like 'long int'. | ||
3289 | 8755 | |||
3290 | 8756 | AC_DEFUN([AC_TYPE_LONG_LONG_INT], | ||
3291 | 8757 | [ | ||
3292 | 8758 | AC_CACHE_CHECK([for long long int], [ac_cv_type_long_long_int], | ||
3293 | 8759 | [AC_LINK_IFELSE( | ||
3294 | 8760 | [AC_LANG_PROGRAM( | ||
3295 | 8761 | [[long long int ll = 9223372036854775807ll; | ||
3296 | 8762 | long long int nll = -9223372036854775807LL; | ||
3297 | 8763 | typedef int a[((-9223372036854775807LL < 0 | ||
3298 | 8764 | && 0 < 9223372036854775807ll) | ||
3299 | 8765 | ? 1 : -1)]; | ||
3300 | 8766 | int i = 63;]], | ||
3301 | 8767 | [[long long int llmax = 9223372036854775807ll; | ||
3302 | 8768 | return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i) | ||
3303 | 8769 | | (llmax / ll) | (llmax % ll));]])], | ||
3304 | 8770 | [ac_cv_type_long_long_int=yes], | ||
3305 | 8771 | [ac_cv_type_long_long_int=no])]) | ||
3306 | 8772 | if test $ac_cv_type_long_long_int = yes; then | ||
3307 | 8773 | AC_DEFINE([HAVE_LONG_LONG_INT], 1, | ||
3308 | 8774 | [Define to 1 if the system has the type `long long int'.]) | ||
3309 | 8775 | fi | ||
3310 | 8776 | ]) | ||
3311 | 8777 | |||
3312 | 8778 | # This macro is obsolescent and should go away soon. | ||
3313 | 8779 | AC_DEFUN([gl_AC_TYPE_LONG_LONG], | ||
3314 | 8780 | [ | ||
3315 | 8781 | AC_REQUIRE([AC_TYPE_LONG_LONG_INT]) | ||
3316 | 8782 | ac_cv_type_long_long=$ac_cv_type_long_long_int | ||
3317 | 8783 | if test $ac_cv_type_long_long = yes; then | ||
3318 | 8784 | AC_DEFINE(HAVE_LONG_LONG, 1, | ||
3319 | 8785 | [Define if you have the 'long long' type.]) | ||
3320 | 8786 | fi | ||
3321 | 8787 | ]) | ||
3322 | 8788 | |||
3323 | 8789 | # nls.m4 serial 3 (gettext-0.15) | 8296 | # nls.m4 serial 3 (gettext-0.15) |
3324 | 8790 | dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. | 8297 | dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. |
3325 | 8791 | dnl This file is free software; the Free Software Foundation | 8298 | dnl This file is free software; the Free Software Foundation |
3326 | @@ -8966,7 +8473,7 @@ | |||
3327 | 8966 | 8473 | ||
3328 | 8967 | _PKG_TEXT | 8474 | _PKG_TEXT |
3329 | 8968 | 8475 | ||
3331 | 8969 | To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])], | 8476 | To get pkg-config, see <http://pkg-config.freedesktop.org/>.])], |
3332 | 8970 | [$4]) | 8477 | [$4]) |
3333 | 8971 | else | 8478 | else |
3334 | 8972 | $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS | 8479 | $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS |
3335 | @@ -8976,8 +8483,8 @@ | |||
3336 | 8976 | fi[]dnl | 8483 | fi[]dnl |
3337 | 8977 | ])# PKG_CHECK_MODULES | 8484 | ])# PKG_CHECK_MODULES |
3338 | 8978 | 8485 | ||
3341 | 8979 | # po.m4 serial 13 (gettext-0.15) | 8486 | # po.m4 serial 15 (gettext-0.17) |
3342 | 8980 | dnl Copyright (C) 1995-2006 Free Software Foundation, Inc. | 8487 | dnl Copyright (C) 1995-2007 Free Software Foundation, Inc. |
3343 | 8981 | dnl This file is free software; the Free Software Foundation | 8488 | dnl This file is free software; the Free Software Foundation |
3344 | 8982 | dnl gives unlimited permission to copy and/or distribute it, | 8489 | dnl gives unlimited permission to copy and/or distribute it, |
3345 | 8983 | dnl with or without modifications, as long as this notice is preserved. | 8490 | dnl with or without modifications, as long as this notice is preserved. |
3346 | @@ -9005,6 +8512,10 @@ | |||
3347 | 9005 | AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake | 8512 | AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake |
3348 | 9006 | AC_REQUIRE([AM_NLS])dnl | 8513 | AC_REQUIRE([AM_NLS])dnl |
3349 | 9007 | 8514 | ||
3350 | 8515 | dnl Release version of the gettext macros. This is used to ensure that | ||
3351 | 8516 | dnl the gettext macros and po/Makefile.in.in are in sync. | ||
3352 | 8517 | AC_SUBST([GETTEXT_MACRO_VERSION], [0.17]) | ||
3353 | 8518 | |||
3354 | 9008 | dnl Perform the following tests also if --disable-nls has been given, | 8519 | dnl Perform the following tests also if --disable-nls has been given, |
3355 | 9009 | dnl because they are needed for "make dist" to work. | 8520 | dnl because they are needed for "make dist" to work. |
3356 | 9010 | 8521 | ||
3357 | @@ -9062,6 +8573,10 @@ | |||
3358 | 9062 | test -n "$localedir" || localedir='${datadir}/locale' | 8573 | test -n "$localedir" || localedir='${datadir}/locale' |
3359 | 9063 | AC_SUBST([localedir]) | 8574 | AC_SUBST([localedir]) |
3360 | 9064 | 8575 | ||
3361 | 8576 | dnl Support for AM_XGETTEXT_OPTION. | ||
3362 | 8577 | test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS= | ||
3363 | 8578 | AC_SUBST([XGETTEXT_EXTRA_OPTIONS]) | ||
3364 | 8579 | |||
3365 | 9065 | AC_CONFIG_COMMANDS([po-directories], [[ | 8580 | AC_CONFIG_COMMANDS([po-directories], [[ |
3366 | 9066 | for ac_file in $CONFIG_FILES; do | 8581 | for ac_file in $CONFIG_FILES; do |
3367 | 9067 | # Support "outfile[:infile[:infile...]]" | 8582 | # Support "outfile[:infile[:infile...]]" |
3368 | @@ -9405,49 +8920,17 @@ | |||
3369 | 9405 | mv "$ac_file.tmp" "$ac_file" | 8920 | mv "$ac_file.tmp" "$ac_file" |
3370 | 9406 | ]) | 8921 | ]) |
3371 | 9407 | 8922 | ||
3415 | 9408 | # printf-posix.m4 serial 2 (gettext-0.13.1) | 8923 | dnl Initializes the accumulator used by AM_XGETTEXT_OPTION. |
3416 | 9409 | dnl Copyright (C) 2003 Free Software Foundation, Inc. | 8924 | AC_DEFUN([AM_XGETTEXT_OPTION_INIT], |
3417 | 9410 | dnl This file is free software; the Free Software Foundation | 8925 | [ |
3418 | 9411 | dnl gives unlimited permission to copy and/or distribute it, | 8926 | XGETTEXT_EXTRA_OPTIONS= |
3419 | 9412 | dnl with or without modifications, as long as this notice is preserved. | 8927 | ]) |
3420 | 9413 | 8928 | ||
3421 | 9414 | dnl From Bruno Haible. | 8929 | dnl Registers an option to be passed to xgettext in the po subdirectory. |
3422 | 9415 | dnl Test whether the printf() function supports POSIX/XSI format strings with | 8930 | AC_DEFUN([AM_XGETTEXT_OPTION], |
3423 | 9416 | dnl positions. | 8931 | [ |
3424 | 9417 | 8932 | AC_REQUIRE([AM_XGETTEXT_OPTION_INIT]) | |
3425 | 9418 | AC_DEFUN([gt_PRINTF_POSIX], | 8933 | XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1" |
3383 | 9419 | [ | ||
3384 | 9420 | AC_REQUIRE([AC_PROG_CC]) | ||
3385 | 9421 | AC_CACHE_CHECK([whether printf() supports POSIX/XSI format strings], | ||
3386 | 9422 | gt_cv_func_printf_posix, | ||
3387 | 9423 | [ | ||
3388 | 9424 | AC_TRY_RUN([ | ||
3389 | 9425 | #include <stdio.h> | ||
3390 | 9426 | #include <string.h> | ||
3391 | 9427 | /* The string "%2$d %1$d", with dollar characters protected from the shell's | ||
3392 | 9428 | dollar expansion (possibly an autoconf bug). */ | ||
3393 | 9429 | static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' }; | ||
3394 | 9430 | static char buf[100]; | ||
3395 | 9431 | int main () | ||
3396 | 9432 | { | ||
3397 | 9433 | sprintf (buf, format, 33, 55); | ||
3398 | 9434 | return (strcmp (buf, "55 33") != 0); | ||
3399 | 9435 | }], gt_cv_func_printf_posix=yes, gt_cv_func_printf_posix=no, | ||
3400 | 9436 | [ | ||
3401 | 9437 | AC_EGREP_CPP(notposix, [ | ||
3402 | 9438 | #if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__ | ||
3403 | 9439 | notposix | ||
3404 | 9440 | #endif | ||
3405 | 9441 | ], gt_cv_func_printf_posix="guessing no", | ||
3406 | 9442 | gt_cv_func_printf_posix="guessing yes") | ||
3407 | 9443 | ]) | ||
3408 | 9444 | ]) | ||
3409 | 9445 | case $gt_cv_func_printf_posix in | ||
3410 | 9446 | *yes) | ||
3411 | 9447 | AC_DEFINE(HAVE_POSIX_PRINTF, 1, | ||
3412 | 9448 | [Define if your printf() function supports format strings with positions.]) | ||
3413 | 9449 | ;; | ||
3414 | 9450 | esac | ||
3426 | 9451 | ]) | 8934 | ]) |
3427 | 9452 | 8935 | ||
3428 | 9453 | # progtest.m4 serial 4 (gettext-0.14.2) | 8936 | # progtest.m4 serial 4 (gettext-0.14.2) |
3429 | @@ -9543,286 +9026,7 @@ | |||
3430 | 9543 | AC_SUBST($1)dnl | 9026 | AC_SUBST($1)dnl |
3431 | 9544 | ]) | 9027 | ]) |
3432 | 9545 | 9028 | ||
3713 | 9546 | # size_max.m4 serial 5 | 9029 | # Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. |
3434 | 9547 | dnl Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc. | ||
3435 | 9548 | dnl This file is free software; the Free Software Foundation | ||
3436 | 9549 | dnl gives unlimited permission to copy and/or distribute it, | ||
3437 | 9550 | dnl with or without modifications, as long as this notice is preserved. | ||
3438 | 9551 | |||
3439 | 9552 | dnl From Bruno Haible. | ||
3440 | 9553 | |||
3441 | 9554 | AC_DEFUN([gl_SIZE_MAX], | ||
3442 | 9555 | [ | ||
3443 | 9556 | AC_CHECK_HEADERS(stdint.h) | ||
3444 | 9557 | dnl First test whether the system already has SIZE_MAX. | ||
3445 | 9558 | AC_MSG_CHECKING([for SIZE_MAX]) | ||
3446 | 9559 | AC_CACHE_VAL([gl_cv_size_max], [ | ||
3447 | 9560 | gl_cv_size_max= | ||
3448 | 9561 | AC_EGREP_CPP([Found it], [ | ||
3449 | 9562 | #include <limits.h> | ||
3450 | 9563 | #if HAVE_STDINT_H | ||
3451 | 9564 | #include <stdint.h> | ||
3452 | 9565 | #endif | ||
3453 | 9566 | #ifdef SIZE_MAX | ||
3454 | 9567 | Found it | ||
3455 | 9568 | #endif | ||
3456 | 9569 | ], gl_cv_size_max=yes) | ||
3457 | 9570 | if test -z "$gl_cv_size_max"; then | ||
3458 | 9571 | dnl Define it ourselves. Here we assume that the type 'size_t' is not wider | ||
3459 | 9572 | dnl than the type 'unsigned long'. Try hard to find a definition that can | ||
3460 | 9573 | dnl be used in a preprocessor #if, i.e. doesn't contain a cast. | ||
3461 | 9574 | _AC_COMPUTE_INT([sizeof (size_t) * CHAR_BIT - 1], size_t_bits_minus_1, | ||
3462 | 9575 | [#include <stddef.h> | ||
3463 | 9576 | #include <limits.h>], size_t_bits_minus_1=) | ||
3464 | 9577 | _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint, | ||
3465 | 9578 | [#include <stddef.h>], fits_in_uint=) | ||
3466 | 9579 | if test -n "$size_t_bits_minus_1" && test -n "$fits_in_uint"; then | ||
3467 | 9580 | if test $fits_in_uint = 1; then | ||
3468 | 9581 | dnl Even though SIZE_MAX fits in an unsigned int, it must be of type | ||
3469 | 9582 | dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'. | ||
3470 | 9583 | AC_TRY_COMPILE([#include <stddef.h> | ||
3471 | 9584 | extern size_t foo; | ||
3472 | 9585 | extern unsigned long foo; | ||
3473 | 9586 | ], [], fits_in_uint=0) | ||
3474 | 9587 | fi | ||
3475 | 9588 | dnl We cannot use 'expr' to simplify this expression, because 'expr' | ||
3476 | 9589 | dnl works only with 'long' integers in the host environment, while we | ||
3477 | 9590 | dnl might be cross-compiling from a 32-bit platform to a 64-bit platform. | ||
3478 | 9591 | if test $fits_in_uint = 1; then | ||
3479 | 9592 | gl_cv_size_max="(((1U << $size_t_bits_minus_1) - 1) * 2 + 1)" | ||
3480 | 9593 | else | ||
3481 | 9594 | gl_cv_size_max="(((1UL << $size_t_bits_minus_1) - 1) * 2 + 1)" | ||
3482 | 9595 | fi | ||
3483 | 9596 | else | ||
3484 | 9597 | dnl Shouldn't happen, but who knows... | ||
3485 | 9598 | gl_cv_size_max='((size_t)~(size_t)0)' | ||
3486 | 9599 | fi | ||
3487 | 9600 | fi | ||
3488 | 9601 | ]) | ||
3489 | 9602 | AC_MSG_RESULT([$gl_cv_size_max]) | ||
3490 | 9603 | if test "$gl_cv_size_max" != yes; then | ||
3491 | 9604 | AC_DEFINE_UNQUOTED([SIZE_MAX], [$gl_cv_size_max], | ||
3492 | 9605 | [Define as the maximum value of type 'size_t', if the system doesn't define it.]) | ||
3493 | 9606 | fi | ||
3494 | 9607 | ]) | ||
3495 | 9608 | |||
3496 | 9609 | # stdint_h.m4 serial 6 | ||
3497 | 9610 | dnl Copyright (C) 1997-2004, 2006 Free Software Foundation, Inc. | ||
3498 | 9611 | dnl This file is free software; the Free Software Foundation | ||
3499 | 9612 | dnl gives unlimited permission to copy and/or distribute it, | ||
3500 | 9613 | dnl with or without modifications, as long as this notice is preserved. | ||
3501 | 9614 | |||
3502 | 9615 | dnl From Paul Eggert. | ||
3503 | 9616 | |||
3504 | 9617 | # Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists, | ||
3505 | 9618 | # doesn't clash with <sys/types.h>, and declares uintmax_t. | ||
3506 | 9619 | |||
3507 | 9620 | AC_DEFUN([gl_AC_HEADER_STDINT_H], | ||
3508 | 9621 | [ | ||
3509 | 9622 | AC_CACHE_CHECK([for stdint.h], gl_cv_header_stdint_h, | ||
3510 | 9623 | [AC_TRY_COMPILE( | ||
3511 | 9624 | [#include <sys/types.h> | ||
3512 | 9625 | #include <stdint.h>], | ||
3513 | 9626 | [uintmax_t i = (uintmax_t) -1; return !i;], | ||
3514 | 9627 | gl_cv_header_stdint_h=yes, | ||
3515 | 9628 | gl_cv_header_stdint_h=no)]) | ||
3516 | 9629 | if test $gl_cv_header_stdint_h = yes; then | ||
3517 | 9630 | AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1, | ||
3518 | 9631 | [Define if <stdint.h> exists, doesn't clash with <sys/types.h>, | ||
3519 | 9632 | and declares uintmax_t. ]) | ||
3520 | 9633 | fi | ||
3521 | 9634 | ]) | ||
3522 | 9635 | |||
3523 | 9636 | # uintmax_t.m4 serial 9 | ||
3524 | 9637 | dnl Copyright (C) 1997-2004 Free Software Foundation, Inc. | ||
3525 | 9638 | dnl This file is free software; the Free Software Foundation | ||
3526 | 9639 | dnl gives unlimited permission to copy and/or distribute it, | ||
3527 | 9640 | dnl with or without modifications, as long as this notice is preserved. | ||
3528 | 9641 | |||
3529 | 9642 | dnl From Paul Eggert. | ||
3530 | 9643 | |||
3531 | 9644 | AC_PREREQ(2.13) | ||
3532 | 9645 | |||
3533 | 9646 | # Define uintmax_t to 'unsigned long' or 'unsigned long long' | ||
3534 | 9647 | # if it is not already defined in <stdint.h> or <inttypes.h>. | ||
3535 | 9648 | |||
3536 | 9649 | AC_DEFUN([gl_AC_TYPE_UINTMAX_T], | ||
3537 | 9650 | [ | ||
3538 | 9651 | AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) | ||
3539 | 9652 | AC_REQUIRE([gl_AC_HEADER_STDINT_H]) | ||
3540 | 9653 | if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then | ||
3541 | 9654 | AC_REQUIRE([gl_AC_TYPE_UNSIGNED_LONG_LONG]) | ||
3542 | 9655 | test $ac_cv_type_unsigned_long_long = yes \ | ||
3543 | 9656 | && ac_type='unsigned long long' \ | ||
3544 | 9657 | || ac_type='unsigned long' | ||
3545 | 9658 | AC_DEFINE_UNQUOTED(uintmax_t, $ac_type, | ||
3546 | 9659 | [Define to unsigned long or unsigned long long | ||
3547 | 9660 | if <stdint.h> and <inttypes.h> don't define.]) | ||
3548 | 9661 | else | ||
3549 | 9662 | AC_DEFINE(HAVE_UINTMAX_T, 1, | ||
3550 | 9663 | [Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>.]) | ||
3551 | 9664 | fi | ||
3552 | 9665 | ]) | ||
3553 | 9666 | |||
3554 | 9667 | # ulonglong.m4 serial 6 | ||
3555 | 9668 | dnl Copyright (C) 1999-2006 Free Software Foundation, Inc. | ||
3556 | 9669 | dnl This file is free software; the Free Software Foundation | ||
3557 | 9670 | dnl gives unlimited permission to copy and/or distribute it, | ||
3558 | 9671 | dnl with or without modifications, as long as this notice is preserved. | ||
3559 | 9672 | |||
3560 | 9673 | dnl From Paul Eggert. | ||
3561 | 9674 | |||
3562 | 9675 | # Define HAVE_UNSIGNED_LONG_LONG_INT if 'unsigned long long int' works. | ||
3563 | 9676 | # This fixes a bug in Autoconf 2.60, but can be removed once we | ||
3564 | 9677 | # assume 2.61 everywhere. | ||
3565 | 9678 | |||
3566 | 9679 | # Note: If the type 'unsigned long long int' exists but is only 32 bits | ||
3567 | 9680 | # large (as on some very old compilers), AC_TYPE_UNSIGNED_LONG_LONG_INT | ||
3568 | 9681 | # will not be defined. In this case you can treat 'unsigned long long int' | ||
3569 | 9682 | # like 'unsigned long int'. | ||
3570 | 9683 | |||
3571 | 9684 | AC_DEFUN([AC_TYPE_UNSIGNED_LONG_LONG_INT], | ||
3572 | 9685 | [ | ||
3573 | 9686 | AC_CACHE_CHECK([for unsigned long long int], | ||
3574 | 9687 | [ac_cv_type_unsigned_long_long_int], | ||
3575 | 9688 | [AC_LINK_IFELSE( | ||
3576 | 9689 | [AC_LANG_PROGRAM( | ||
3577 | 9690 | [[unsigned long long int ull = 18446744073709551615ULL; | ||
3578 | 9691 | typedef int a[(18446744073709551615ULL <= (unsigned long long int) -1 | ||
3579 | 9692 | ? 1 : -1)]; | ||
3580 | 9693 | int i = 63;]], | ||
3581 | 9694 | [[unsigned long long int ullmax = 18446744073709551615ull; | ||
3582 | 9695 | return (ull << 63 | ull >> 63 | ull << i | ull >> i | ||
3583 | 9696 | | ullmax / ull | ullmax % ull);]])], | ||
3584 | 9697 | [ac_cv_type_unsigned_long_long_int=yes], | ||
3585 | 9698 | [ac_cv_type_unsigned_long_long_int=no])]) | ||
3586 | 9699 | if test $ac_cv_type_unsigned_long_long_int = yes; then | ||
3587 | 9700 | AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], 1, | ||
3588 | 9701 | [Define to 1 if the system has the type `unsigned long long int'.]) | ||
3589 | 9702 | fi | ||
3590 | 9703 | ]) | ||
3591 | 9704 | |||
3592 | 9705 | # This macro is obsolescent and should go away soon. | ||
3593 | 9706 | AC_DEFUN([gl_AC_TYPE_UNSIGNED_LONG_LONG], | ||
3594 | 9707 | [ | ||
3595 | 9708 | AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT]) | ||
3596 | 9709 | ac_cv_type_unsigned_long_long=$ac_cv_type_unsigned_long_long_int | ||
3597 | 9710 | if test $ac_cv_type_unsigned_long_long = yes; then | ||
3598 | 9711 | AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1, | ||
3599 | 9712 | [Define if you have the 'unsigned long long' type.]) | ||
3600 | 9713 | fi | ||
3601 | 9714 | ]) | ||
3602 | 9715 | |||
3603 | 9716 | # visibility.m4 serial 1 (gettext-0.15) | ||
3604 | 9717 | dnl Copyright (C) 2005 Free Software Foundation, Inc. | ||
3605 | 9718 | dnl This file is free software; the Free Software Foundation | ||
3606 | 9719 | dnl gives unlimited permission to copy and/or distribute it, | ||
3607 | 9720 | dnl with or without modifications, as long as this notice is preserved. | ||
3608 | 9721 | |||
3609 | 9722 | dnl From Bruno Haible. | ||
3610 | 9723 | |||
3611 | 9724 | dnl Tests whether the compiler supports the command-line option | ||
3612 | 9725 | dnl -fvisibility=hidden and the function and variable attributes | ||
3613 | 9726 | dnl __attribute__((__visibility__("hidden"))) and | ||
3614 | 9727 | dnl __attribute__((__visibility__("default"))). | ||
3615 | 9728 | dnl Does *not* test for __visibility__("protected") - which has tricky | ||
3616 | 9729 | dnl semantics (see the 'vismain' test in glibc) and does not exist e.g. on | ||
3617 | 9730 | dnl MacOS X. | ||
3618 | 9731 | dnl Does *not* test for __visibility__("internal") - which has processor | ||
3619 | 9732 | dnl dependent semantics. | ||
3620 | 9733 | dnl Does *not* test for #pragma GCC visibility push(hidden) - which is | ||
3621 | 9734 | dnl "really only recommended for legacy code". | ||
3622 | 9735 | dnl Set the variable CFLAG_VISIBILITY. | ||
3623 | 9736 | dnl Defines and sets the variable HAVE_VISIBILITY. | ||
3624 | 9737 | |||
3625 | 9738 | AC_DEFUN([gl_VISIBILITY], | ||
3626 | 9739 | [ | ||
3627 | 9740 | AC_REQUIRE([AC_PROG_CC]) | ||
3628 | 9741 | CFLAG_VISIBILITY= | ||
3629 | 9742 | HAVE_VISIBILITY=0 | ||
3630 | 9743 | if test -n "$GCC"; then | ||
3631 | 9744 | AC_MSG_CHECKING([for simple visibility declarations]) | ||
3632 | 9745 | AC_CACHE_VAL(gl_cv_cc_visibility, [ | ||
3633 | 9746 | gl_save_CFLAGS="$CFLAGS" | ||
3634 | 9747 | CFLAGS="$CFLAGS -fvisibility=hidden" | ||
3635 | 9748 | AC_TRY_COMPILE( | ||
3636 | 9749 | [extern __attribute__((__visibility__("hidden"))) int hiddenvar; | ||
3637 | 9750 | extern __attribute__((__visibility__("default"))) int exportedvar; | ||
3638 | 9751 | extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void); | ||
3639 | 9752 | extern __attribute__((__visibility__("default"))) int exportedfunc (void);], | ||
3640 | 9753 | [], | ||
3641 | 9754 | gl_cv_cc_visibility=yes, | ||
3642 | 9755 | gl_cv_cc_visibility=no) | ||
3643 | 9756 | CFLAGS="$gl_save_CFLAGS"]) | ||
3644 | 9757 | AC_MSG_RESULT([$gl_cv_cc_visibility]) | ||
3645 | 9758 | if test $gl_cv_cc_visibility = yes; then | ||
3646 | 9759 | CFLAG_VISIBILITY="-fvisibility=hidden" | ||
3647 | 9760 | HAVE_VISIBILITY=1 | ||
3648 | 9761 | fi | ||
3649 | 9762 | fi | ||
3650 | 9763 | AC_SUBST([CFLAG_VISIBILITY]) | ||
3651 | 9764 | AC_SUBST([HAVE_VISIBILITY]) | ||
3652 | 9765 | AC_DEFINE_UNQUOTED([HAVE_VISIBILITY], [$HAVE_VISIBILITY], | ||
3653 | 9766 | [Define to 1 or 0, depending whether the compiler supports simple visibility declarations.]) | ||
3654 | 9767 | ]) | ||
3655 | 9768 | |||
3656 | 9769 | # wchar_t.m4 serial 1 (gettext-0.12) | ||
3657 | 9770 | dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. | ||
3658 | 9771 | dnl This file is free software; the Free Software Foundation | ||
3659 | 9772 | dnl gives unlimited permission to copy and/or distribute it, | ||
3660 | 9773 | dnl with or without modifications, as long as this notice is preserved. | ||
3661 | 9774 | |||
3662 | 9775 | dnl From Bruno Haible. | ||
3663 | 9776 | dnl Test whether <stddef.h> has the 'wchar_t' type. | ||
3664 | 9777 | dnl Prerequisite: AC_PROG_CC | ||
3665 | 9778 | |||
3666 | 9779 | AC_DEFUN([gt_TYPE_WCHAR_T], | ||
3667 | 9780 | [ | ||
3668 | 9781 | AC_CACHE_CHECK([for wchar_t], gt_cv_c_wchar_t, | ||
3669 | 9782 | [AC_TRY_COMPILE([#include <stddef.h> | ||
3670 | 9783 | wchar_t foo = (wchar_t)'\0';], , | ||
3671 | 9784 | gt_cv_c_wchar_t=yes, gt_cv_c_wchar_t=no)]) | ||
3672 | 9785 | if test $gt_cv_c_wchar_t = yes; then | ||
3673 | 9786 | AC_DEFINE(HAVE_WCHAR_T, 1, [Define if you have the 'wchar_t' type.]) | ||
3674 | 9787 | fi | ||
3675 | 9788 | ]) | ||
3676 | 9789 | |||
3677 | 9790 | # wint_t.m4 serial 1 (gettext-0.12) | ||
3678 | 9791 | dnl Copyright (C) 2003 Free Software Foundation, Inc. | ||
3679 | 9792 | dnl This file is free software; the Free Software Foundation | ||
3680 | 9793 | dnl gives unlimited permission to copy and/or distribute it, | ||
3681 | 9794 | dnl with or without modifications, as long as this notice is preserved. | ||
3682 | 9795 | |||
3683 | 9796 | dnl From Bruno Haible. | ||
3684 | 9797 | dnl Test whether <wchar.h> has the 'wint_t' type. | ||
3685 | 9798 | dnl Prerequisite: AC_PROG_CC | ||
3686 | 9799 | |||
3687 | 9800 | AC_DEFUN([gt_TYPE_WINT_T], | ||
3688 | 9801 | [ | ||
3689 | 9802 | AC_CACHE_CHECK([for wint_t], gt_cv_c_wint_t, | ||
3690 | 9803 | [AC_TRY_COMPILE([#include <wchar.h> | ||
3691 | 9804 | wint_t foo = (wchar_t)'\0';], , | ||
3692 | 9805 | gt_cv_c_wint_t=yes, gt_cv_c_wint_t=no)]) | ||
3693 | 9806 | if test $gt_cv_c_wint_t = yes; then | ||
3694 | 9807 | AC_DEFINE(HAVE_WINT_T, 1, [Define if you have the 'wint_t' type.]) | ||
3695 | 9808 | fi | ||
3696 | 9809 | ]) | ||
3697 | 9810 | |||
3698 | 9811 | # xsize.m4 serial 3 | ||
3699 | 9812 | dnl Copyright (C) 2003-2004 Free Software Foundation, Inc. | ||
3700 | 9813 | dnl This file is free software; the Free Software Foundation | ||
3701 | 9814 | dnl gives unlimited permission to copy and/or distribute it, | ||
3702 | 9815 | dnl with or without modifications, as long as this notice is preserved. | ||
3703 | 9816 | |||
3704 | 9817 | AC_DEFUN([gl_XSIZE], | ||
3705 | 9818 | [ | ||
3706 | 9819 | dnl Prerequisites of lib/xsize.h. | ||
3707 | 9820 | AC_REQUIRE([gl_SIZE_MAX]) | ||
3708 | 9821 | AC_REQUIRE([AC_C_INLINE]) | ||
3709 | 9822 | AC_CHECK_HEADERS(stdint.h) | ||
3710 | 9823 | ]) | ||
3711 | 9824 | |||
3712 | 9825 | # Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. | ||
3714 | 9826 | # | 9030 | # |
3715 | 9827 | # This file is free software; the Free Software Foundation | 9031 | # This file is free software; the Free Software Foundation |
3716 | 9828 | # gives unlimited permission to copy and/or distribute it, | 9032 | # gives unlimited permission to copy and/or distribute it, |
3717 | @@ -9837,7 +9041,7 @@ | |||
3718 | 9837 | [am__api_version='1.10' | 9041 | [am__api_version='1.10' |
3719 | 9838 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to | 9042 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
3720 | 9839 | dnl require some minimum version. Point them to the right macro. | 9043 | dnl require some minimum version. Point them to the right macro. |
3722 | 9840 | m4_if([$1], [1.10], [], | 9044 | m4_if([$1], [1.10.1], [], |
3723 | 9841 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl | 9045 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
3724 | 9842 | ]) | 9046 | ]) |
3725 | 9843 | 9047 | ||
3726 | @@ -9853,8 +9057,10 @@ | |||
3727 | 9853 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. | 9057 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
3728 | 9854 | # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. | 9058 | # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. |
3729 | 9855 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], | 9059 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
3732 | 9856 | [AM_AUTOMAKE_VERSION([1.10])dnl | 9060 | [AM_AUTOMAKE_VERSION([1.10.1])dnl |
3733 | 9857 | _AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) | 9061 | m4_ifndef([AC_AUTOCONF_VERSION], |
3734 | 9062 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl | ||
3735 | 9063 | _AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) | ||
3736 | 9858 | 9064 | ||
3737 | 9859 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- | 9065 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- |
3738 | 9860 | 9066 | ||
3739 | @@ -10126,7 +9332,7 @@ | |||
3740 | 10126 | # each Makefile.in and add a new line on top of each file to say so. | 9332 | # each Makefile.in and add a new line on top of each file to say so. |
3741 | 10127 | # Grep'ing the whole file is not good either: AIX grep has a line | 9333 | # Grep'ing the whole file is not good either: AIX grep has a line |
3742 | 10128 | # limit of 2048, but all sed's we know have understand at least 4000. | 9334 | # limit of 2048, but all sed's we know have understand at least 4000. |
3744 | 10129 | if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then | 9335 | if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then |
3745 | 10130 | dirpart=`AS_DIRNAME("$mf")` | 9336 | dirpart=`AS_DIRNAME("$mf")` |
3746 | 10131 | else | 9337 | else |
3747 | 10132 | continue | 9338 | continue |
3748 | @@ -10174,13 +9380,13 @@ | |||
3749 | 10174 | # Do all the work for Automake. -*- Autoconf -*- | 9380 | # Do all the work for Automake. -*- Autoconf -*- |
3750 | 10175 | 9381 | ||
3751 | 10176 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, | 9382 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
3753 | 10177 | # 2005, 2006 Free Software Foundation, Inc. | 9383 | # 2005, 2006, 2008 Free Software Foundation, Inc. |
3754 | 10178 | # | 9384 | # |
3755 | 10179 | # This file is free software; the Free Software Foundation | 9385 | # This file is free software; the Free Software Foundation |
3756 | 10180 | # gives unlimited permission to copy and/or distribute it, | 9386 | # gives unlimited permission to copy and/or distribute it, |
3757 | 10181 | # with or without modifications, as long as this notice is preserved. | 9387 | # with or without modifications, as long as this notice is preserved. |
3758 | 10182 | 9388 | ||
3760 | 10183 | # serial 12 | 9389 | # serial 13 |
3761 | 10184 | 9390 | ||
3762 | 10185 | # This macro actually does too much. Some checks are only needed if | 9391 | # This macro actually does too much. Some checks are only needed if |
3763 | 10186 | # your package does certain things. But this isn't really a big deal. | 9392 | # your package does certain things. But this isn't really a big deal. |
3764 | @@ -10285,16 +9491,17 @@ | |||
3765 | 10285 | # our stamp files there. | 9491 | # our stamp files there. |
3766 | 10286 | AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], | 9492 | AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], |
3767 | 10287 | [# Compute $1's index in $config_headers. | 9493 | [# Compute $1's index in $config_headers. |
3768 | 9494 | _am_arg=$1 | ||
3769 | 10288 | _am_stamp_count=1 | 9495 | _am_stamp_count=1 |
3770 | 10289 | for _am_header in $config_headers :; do | 9496 | for _am_header in $config_headers :; do |
3771 | 10290 | case $_am_header in | 9497 | case $_am_header in |
3773 | 10291 | $1 | $1:* ) | 9498 | $_am_arg | $_am_arg:* ) |
3774 | 10292 | break ;; | 9499 | break ;; |
3775 | 10293 | * ) | 9500 | * ) |
3776 | 10294 | _am_stamp_count=`expr $_am_stamp_count + 1` ;; | 9501 | _am_stamp_count=`expr $_am_stamp_count + 1` ;; |
3777 | 10295 | esac | 9502 | esac |
3778 | 10296 | done | 9503 | done |
3780 | 10297 | echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) | 9504 | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) |
3781 | 10298 | 9505 | ||
3782 | 10299 | # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. | 9506 | # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. |
3783 | 10300 | # | 9507 | # |
3784 | @@ -10595,7 +9802,7 @@ | |||
3785 | 10595 | 9802 | ||
3786 | 10596 | # _AM_SUBST_NOTMAKE(VARIABLE) | 9803 | # _AM_SUBST_NOTMAKE(VARIABLE) |
3787 | 10597 | # --------------------------- | 9804 | # --------------------------- |
3789 | 10598 | # Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. | 9805 | # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. |
3790 | 10599 | # This macro is traced by Automake. | 9806 | # This macro is traced by Automake. |
3791 | 10600 | AC_DEFUN([_AM_SUBST_NOTMAKE]) | 9807 | AC_DEFUN([_AM_SUBST_NOTMAKE]) |
3792 | 10601 | 9808 | ||
3793 | 10602 | 9809 | ||
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 | 1 | Name: libticables2 | ||
3800 | 2 | Epoch: 1 | ||
3801 | 3 | Version: 1.2.0 | ||
3802 | 4 | Release: 2 | ||
3803 | 5 | Vendor: LPG (http://lpg.ticalc.org) | ||
3804 | 6 | Packager: Kevin Kofler <Kevin@tigcc.ticalc.org> | ||
3805 | 7 | Source: %{name}-%{version}.tar.bz2 | ||
3806 | 8 | Group: System Environment/Libraries | ||
3807 | 9 | License: GPLv2+ | ||
3808 | 10 | BuildRequires: libusb-devel, glib2-devel >= 2.4.0, tfdocgen | ||
3809 | 11 | BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) | ||
3810 | 12 | Summary: Library for handling TI link cables | ||
3811 | 13 | %description | ||
3812 | 14 | Library for handling TI link cables | ||
3813 | 15 | |||
3814 | 16 | %package devel | ||
3815 | 17 | Summary: Development files for %{name} | ||
3816 | 18 | Group: Development/Libraries | ||
3817 | 19 | Requires: %{name} = %{epoch}:%{version}-%{release} | ||
3818 | 20 | Requires: pkgconfig | ||
3819 | 21 | Requires: glib2-devel >= 2.4.0 | ||
3820 | 22 | %description devel | ||
3821 | 23 | This package contains the files necessary to develop applications using the | ||
3822 | 24 | %{name} library. | ||
3823 | 25 | |||
3824 | 26 | %package apidocs | ||
3825 | 27 | Summary: API documentation for %{name} | ||
3826 | 28 | Group: Development/Documentation | ||
3827 | 29 | Requires: %{name} = %{epoch}:%{version}-%{release} | ||
3828 | 30 | %description apidocs | ||
3829 | 31 | This package contains the API documentation for the %{name} library in | ||
3830 | 32 | HTML format. | ||
3831 | 33 | |||
3832 | 34 | %prep | ||
3833 | 35 | %setup | ||
3834 | 36 | |||
3835 | 37 | %build | ||
3836 | 38 | CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} --libdir=%{_libdir} --disable-nls | ||
3837 | 39 | make | ||
3838 | 40 | |||
3839 | 41 | %install | ||
3840 | 42 | if [ -d $RPM_BUILD_ROOT ]; then rm -rf $RPM_BUILD_ROOT; fi | ||
3841 | 43 | mkdir -p $RPM_BUILD_ROOT | ||
3842 | 44 | make install DESTDIR=$RPM_BUILD_ROOT | ||
3843 | 45 | rm -f $RPM_BUILD_ROOT%{_libdir}/libticables2.la | ||
3844 | 46 | mkdir -p $RPM_BUILD_ROOT/etc/udev/rules.d | ||
3845 | 47 | cat >$RPM_BUILD_ROOT/etc/udev/rules.d/60-libticables.rules <<EOF1 | ||
3846 | 48 | # This file was installed by the libticables2 Fedora package. | ||
3847 | 49 | |||
3848 | 50 | # SilverLink | ||
3849 | 51 | ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="0451", ATTR{idProduct}=="e001", SYMLINK+="ticable-%%k" | ||
3850 | 52 | # TI-84+ DirectLink | ||
3851 | 53 | ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="0451", ATTR{idProduct}=="e003", SYMLINK+="ticable-%%k" | ||
3852 | 54 | # TI-89 Titanium DirectLink | ||
3853 | 55 | ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="0451", ATTR{idProduct}=="e004", SYMLINK+="ticable-%%k" | ||
3854 | 56 | # TI-84+ SE DirectLink | ||
3855 | 57 | ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="0451", ATTR{idProduct}=="e008", SYMLINK+="ticable-%%k" | ||
3856 | 58 | # TI-Nspire DirectLink | ||
3857 | 59 | ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="0451", ATTR{idProduct}=="e012", SYMLINK+="ticable-%%k" | ||
3858 | 60 | EOF1 | ||
3859 | 61 | mkdir -p $RPM_BUILD_ROOT/etc/security/console.perms.d | ||
3860 | 62 | cat >$RPM_BUILD_ROOT/etc/security/console.perms.d/60-libticables.perms <<EOF2 | ||
3861 | 63 | # This file was installed by the libticables2 Fedora package. | ||
3862 | 64 | |||
3863 | 65 | # device classes -- these are shell-style globs | ||
3864 | 66 | <ticable>=/dev/ticable* /dev/usb/ticable* | ||
3865 | 67 | <serport>=/dev/ttyS* | ||
3866 | 68 | <parport>=/dev/parport* | ||
3867 | 69 | |||
3868 | 70 | # permission definitions | ||
3869 | 71 | <console> 0600 <ticable> 0600 root | ||
3870 | 72 | <console> 0660 <serport> 0660 root.uucp | ||
3871 | 73 | <console> 0660 <parport> 0660 root.lp | ||
3872 | 74 | EOF2 | ||
3873 | 75 | |||
3874 | 76 | %post -p /sbin/ldconfig | ||
3875 | 77 | |||
3876 | 78 | %postun -p /sbin/ldconfig | ||
3877 | 79 | |||
3878 | 80 | %clean | ||
3879 | 81 | rm -rf $RPM_BUILD_ROOT | ||
3880 | 82 | |||
3881 | 83 | %files | ||
3882 | 84 | %defattr(-, root, root) | ||
3883 | 85 | %{_libdir}/libticables2.so.* | ||
3884 | 86 | %{_sysconfdir}/udev/rules.d/60-libticables.rules | ||
3885 | 87 | %{_sysconfdir}/security/console.perms.d/60-libticables.perms | ||
3886 | 88 | %dir %{_datadir}/doc/%{name} | ||
3887 | 89 | %{_datadir}/doc/%{name}/AUTHORS | ||
3888 | 90 | %{_datadir}/doc/%{name}/COPYING | ||
3889 | 91 | %{_datadir}/doc/%{name}/ChangeLog | ||
3890 | 92 | %{_datadir}/doc/%{name}/README | ||
3891 | 93 | |||
3892 | 94 | %files devel | ||
3893 | 95 | %defattr(-, root, root) | ||
3894 | 96 | %{_includedir}/tilp2 | ||
3895 | 97 | %{_libdir}/libticables2.so | ||
3896 | 98 | %{_libdir}/pkgconfig/ticables2.pc | ||
3897 | 99 | |||
3898 | 100 | %files apidocs | ||
3899 | 101 | %defattr(-, root, root) | ||
3900 | 102 | %{_datadir}/doc/%{name}/html | ||
3901 | 103 | |||
3902 | 104 | %changelog | ||
3903 | 105 | * Mon Jan 14 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 1:1.2.0-2 | ||
3904 | 106 | Add the USB ID for the TI-Nspire in 60-libticables.rules. | ||
3905 | 107 | |||
3906 | 108 | * Sun Jan 13 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 1:1.2.0-1 | ||
3907 | 109 | Update to 1.2.0. | ||
3908 | 110 | Drop obsolete backported patch. | ||
3909 | 111 | Specify GPL version in License tag. | ||
3910 | 112 | |||
3911 | 113 | * Sun Oct 14 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 1:1.1.0-2 | ||
3912 | 114 | Backport improved device node accessibility check from SVN. | ||
3913 | 115 | |||
3914 | 116 | * Sat Oct 13 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 1:1.1.0-1 | ||
3915 | 117 | Update to 1.1.0. | ||
3916 | 118 | |||
3917 | 119 | * Sat Sep 8 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 1:1.0.9-1 | ||
3918 | 120 | Update to 1.0.9. | ||
3919 | 121 | Change usb_device back to usb (required with current kernel and udev). | ||
3920 | 122 | |||
3921 | 123 | * Fri Jul 27 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 1:1.0.6-3 | ||
3922 | 124 | Revert usb_device->usb change (update kernel has CONFIG_USB_DEVICE_CLASS on) | ||
3923 | 125 | |||
3924 | 126 | * Tue Jul 24 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 1:1.0.6-2 | ||
3925 | 127 | Update udev rules for new kernel and udev. | ||
3926 | 128 | |||
3927 | 129 | * Thu May 31 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 1:1.0.6-1 | ||
3928 | 130 | Update to 1.0.6. | ||
3929 | 131 | |||
3930 | 132 | * Wed May 16 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> | ||
3931 | 133 | Drop -n libticables, the tarball uses name-version format now. | ||
3932 | 134 | Add BR tfdocgen and apidocs subpackage. | ||
3933 | 135 | Package non-API documentation files in main package. | ||
3934 | 136 | |||
3935 | 137 | * Thu May 3 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> | ||
3936 | 138 | Give access to serial and parallel ports in the pam_console configuration. | ||
3937 | 139 | |||
3938 | 140 | * Mon Apr 16 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 1:1.0.5-1 | ||
3939 | 141 | Bump Epoch. | ||
3940 | 142 | Use real version number instead of date. | ||
3941 | 143 | |||
3942 | 144 | * Mon Apr 16 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> | ||
3943 | 145 | Remove redundant explicit Requires. | ||
3944 | 146 | Don't BuildRequire newer versions than actually needed. | ||
3945 | 147 | |||
3946 | 148 | * Sun Oct 15 2006 Kevin Kofler <Kevin@tigcc.ticalc.org> | ||
3947 | 149 | Add non-SE TI-84+ to the pam_console configuration. | ||
3948 | 150 | |||
3949 | 151 | * Mon Sep 25 2006 Kevin Kofler <Kevin@tigcc.ticalc.org> | ||
3950 | 152 | Split out -devel into separate subpackage. | ||
3951 | 153 | Own /usr/include/tilp2 in -devel. | ||
3952 | 154 | Use more efficient method to call ldconfig in post/postun. | ||
3953 | 155 | |||
3954 | 156 | * Sun Jul 23 2006 Kevin Kofler <Kevin@tigcc.ticalc.org> | ||
3955 | 157 | Fix incorrect escaping in console.perms.d file. | ||
3956 | 158 | |||
3957 | 159 | * Thu Jul 20 2006 Kevin Kofler <Kevin@tigcc.ticalc.org> | ||
3958 | 160 | Libdir fixes for lib64 platforms. | ||
3959 | 161 | Add Provides for future -devel subpackage. | ||
3960 | 162 | |||
3961 | 163 | * Fri Jun 16 2006 Kevin Kofler <Kevin@tigcc.ticalc.org> | ||
3962 | 164 | Remove redundant %%defattr at the end of %%files. | ||
3963 | 165 | |||
3964 | 166 | * Wed Jun 7 2006 Kevin Kofler <Kevin@tigcc.ticalc.org> | ||
3965 | 167 | Update file list (stdints.h now numbered to avoid conflicts). | ||
3966 | 168 | Use /etc/security/console.perms.d for the pam_console setup instead of | ||
3967 | 169 | hand-written script hack. | ||
3968 | 170 | |||
3969 | 171 | * Wed May 24 2006 Kevin Kofler <Kevin@tigcc.ticalc.org> | ||
3970 | 172 | Don't package .la file (not needed under Fedora). | ||
3971 | 173 | Make sure permissions are set correctly when building as non-root. | ||
3972 | 174 | |||
3973 | 175 | * Mon May 22 2006 Kevin Kofler <Kevin@tigcc.ticalc.org> | ||
3974 | 176 | Build debuginfo RPM. | ||
3975 | 177 | Use the system-wide default RPM_OPT_FLAGS instead of my own. | ||
3976 | 178 | Use BuildRoot recommended by the Fedora packaging guidelines. | ||
3977 | 179 | |||
3978 | 180 | * Sun May 7 2006 Kevin Kofler <Kevin@tigcc.ticalc.org> | ||
3979 | 181 | License now GPL (with exception for TilEm). | ||
3980 | 182 | Add missing glib2 BuildRequires/Requires. | ||
3981 | 183 | Now requires libticonv. | ||
3982 | 184 | Convert hotplug rules to udev rules and add DirectLink DeviceIDs. | ||
3983 | 185 | |||
3984 | 186 | * Sat Feb 11 2006 Kevin Kofler <Kevin@tigcc.ticalc.org> | ||
3985 | 187 | Update setup -n to use the new directory name (libticables, not libticables2). | ||
3986 | 188 | |||
3987 | 189 | * Sun Jan 29 2006 Kevin Kofler <Kevin@tigcc.ticalc.org> | ||
3988 | 190 | Strip library because -s gets ignored somehow. | ||
3989 | 191 | |||
3990 | 192 | * Wed Jan 4 2006 Kevin Kofler <Kevin@tigcc.ticalc.org> | ||
3991 | 193 | Change Vendor to LPG. | ||
3992 | 194 | |||
3993 | 195 | * Wed Sep 14 2005 Kevin Kofler <Kevin@tigcc.ticalc.org> | ||
3994 | 196 | Update to libticables-2: new package name, updated file list. | ||
3995 | 197 | |||
3996 | 198 | * Wed Jun 22 2005 Kevin Kofler <Kevin@tigcc.ticalc.org> | ||
3997 | 199 | SilverLink support (based on Julien Blache's Debian packages and Nalin | ||
3998 | 200 | Dahyabhai's usbcam script) | ||
3999 | 201 | |||
4000 | 202 | * Sun Jun 19 2005 Kevin Kofler <Kevin@tigcc.ticalc.org> | ||
4001 | 203 | Change Copyright to License. | ||
4002 | 204 | Don't list cabl_def.h twice. | ||
4003 | 205 | |||
4004 | 206 | * Mon May 2 2005 Kevin Kofler <Kevin@tigcc.ticalc.org> | ||
4005 | 207 | First Fedora RPM. | ||
4006 | 208 | 0 | ||
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 @@ | |||
4012 | 1 | # Makefile.in generated by automake 1.10 from Makefile.am. | 1 | # Makefile.in generated by automake 1.10.1 from Makefile.am. |
4013 | 2 | # build/mingw/Makefile. Generated from Makefile.in by configure. | 2 | # build/mingw/Makefile. Generated from Makefile.in by configure. |
4014 | 3 | 3 | ||
4015 | 4 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | 4 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
4017 | 5 | # 2003, 2004, 2005, 2006 Free Software Foundation, Inc. | 5 | # 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
4018 | 6 | # This Makefile.in is free software; the Free Software Foundation | 6 | # This Makefile.in is free software; the Free Software Foundation |
4019 | 7 | # gives unlimited permission to copy and/or distribute it, | 7 | # gives unlimited permission to copy and/or distribute it, |
4020 | 8 | # with or without modifications, as long as this notice is preserved. | 8 | # with or without modifications, as long as this notice is preserved. |
4021 | @@ -30,8 +30,8 @@ | |||
4022 | 30 | NORMAL_UNINSTALL = : | 30 | NORMAL_UNINSTALL = : |
4023 | 31 | PRE_UNINSTALL = : | 31 | PRE_UNINSTALL = : |
4024 | 32 | POST_UNINSTALL = : | 32 | POST_UNINSTALL = : |
4027 | 33 | build_triplet = x86_64-unknown-linux-gnu | 33 | build_triplet = i686-pc-linux-gnu |
4028 | 34 | host_triplet = x86_64-unknown-linux-gnu | 34 | host_triplet = i686-pc-linux-gnu |
4029 | 35 | subdir = build/mingw | 35 | subdir = build/mingw |
4030 | 36 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in | 36 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in |
4031 | 37 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | 37 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
4032 | @@ -45,32 +45,28 @@ | |||
4033 | 45 | DIST_SOURCES = | 45 | DIST_SOURCES = |
4034 | 46 | DATA = $(noinst_DATA) | 46 | DATA = $(noinst_DATA) |
4035 | 47 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | 47 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
4039 | 48 | ACLOCAL = ${SHELL} /tmp/libticables2-1.2.0/missing --run aclocal-1.10 | 48 | ACLOCAL = ${SHELL} /tmp/ticables2/missing --run aclocal-1.10 |
4040 | 49 | ALLOCA = | 49 | AMTAR = ${SHELL} /tmp/ticables2/missing --run tar |
4038 | 50 | AMTAR = ${SHELL} /tmp/libticables2-1.2.0/missing --run tar | ||
4041 | 51 | AR = ar | 50 | AR = ar |
4042 | 52 | AS = as | 51 | AS = as |
4046 | 53 | AUTOCONF = ${SHELL} /tmp/libticables2-1.2.0/missing --run autoconf | 52 | AUTOCONF = ${SHELL} /tmp/ticables2/missing --run autoconf |
4047 | 54 | AUTOHEADER = ${SHELL} /tmp/libticables2-1.2.0/missing --run autoheader | 53 | AUTOHEADER = ${SHELL} /tmp/ticables2/missing --run autoheader |
4048 | 55 | AUTOMAKE = ${SHELL} /tmp/libticables2-1.2.0/missing --run automake-1.10 | 54 | AUTOMAKE = ${SHELL} /tmp/ticables2/missing --run automake-1.10 |
4049 | 56 | AWK = mawk | 55 | AWK = mawk |
4050 | 57 | BUILD_INCLUDED_LIBINTL = no | ||
4051 | 58 | CATOBJEXT = .gmo | ||
4052 | 59 | CC = gcc | 56 | CC = gcc |
4053 | 60 | CCDEPMODE = depmode=gcc3 | 57 | CCDEPMODE = depmode=gcc3 |
4056 | 61 | CFLAGS = -g -O2 -D__LINUX__ -fvisibility=hidden | 58 | CFLAGS = -g -O2 -D__I386__ -D__LINUX__ -fvisibility=hidden |
4055 | 62 | CFLAG_VISIBILITY = -fvisibility=hidden | ||
4057 | 63 | CPP = gcc -E | 59 | CPP = gcc -E |
4058 | 64 | CPPFLAGS = | 60 | CPPFLAGS = |
4059 | 65 | CXX = g++ | 61 | CXX = g++ |
4063 | 66 | CXXCPP = | 62 | CXXCPP = g++ -E |
4064 | 67 | CXXDEPMODE = depmode=none | 63 | CXXDEPMODE = depmode=gcc3 |
4065 | 68 | CXXFLAGS = | 64 | CXXFLAGS = -g -O2 |
4066 | 69 | CYGPATH_W = echo | 65 | CYGPATH_W = echo |
4067 | 70 | DATADIRNAME = share | ||
4068 | 71 | DEFS = -DHAVE_CONFIG_H | 66 | DEFS = -DHAVE_CONFIG_H |
4069 | 72 | DEPDIR = .deps | 67 | DEPDIR = .deps |
4070 | 73 | DLLTOOL = dlltool | 68 | DLLTOOL = dlltool |
4071 | 69 | DSYMUTIL = | ||
4072 | 74 | ECHO = echo | 70 | ECHO = echo |
4073 | 75 | ECHO_C = | 71 | ECHO_C = |
4074 | 76 | ECHO_N = -n | 72 | ECHO_N = -n |
4075 | @@ -79,85 +75,68 @@ | |||
4076 | 79 | EXEEXT = | 75 | EXEEXT = |
4077 | 80 | F77 = | 76 | F77 = |
4078 | 81 | FFLAGS = | 77 | FFLAGS = |
4082 | 82 | GENCAT = gencat | 78 | GETTEXT_MACRO_VERSION = 0.17 |
4080 | 83 | GLIBC2 = yes | ||
4081 | 84 | GLIBC21 = yes | ||
4083 | 85 | GLIB_CFLAGS = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include | 79 | GLIB_CFLAGS = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include |
4084 | 86 | GLIB_LIBS = -lglib-2.0 | 80 | GLIB_LIBS = -lglib-2.0 |
4085 | 87 | GMSGFMT = /usr/bin/msgfmt | 81 | GMSGFMT = /usr/bin/msgfmt |
4086 | 88 | GMSGFMT_015 = /usr/bin/msgfmt | 82 | GMSGFMT_015 = /usr/bin/msgfmt |
4087 | 89 | GREP = /bin/grep | 83 | GREP = /bin/grep |
4088 | 90 | HAVE_ASPRINTF = 1 | ||
4089 | 91 | HAVE_POSIX_PRINTF = 1 | ||
4090 | 92 | HAVE_SNPRINTF = 1 | ||
4091 | 93 | HAVE_VISIBILITY = 1 | ||
4092 | 94 | HAVE_WPRINTF = 0 | ||
4093 | 95 | INSTALL = /usr/bin/install -c | 84 | INSTALL = /usr/bin/install -c |
4094 | 96 | INSTALL_DATA = ${INSTALL} -m 644 | 85 | INSTALL_DATA = ${INSTALL} -m 644 |
4095 | 97 | INSTALL_PROGRAM = ${INSTALL} | 86 | INSTALL_PROGRAM = ${INSTALL} |
4096 | 98 | INSTALL_SCRIPT = ${INSTALL} | 87 | INSTALL_SCRIPT = ${INSTALL} |
4097 | 99 | INSTALL_STRIP_PROGRAM = $(install_sh) -c -s | 88 | INSTALL_STRIP_PROGRAM = $(install_sh) -c -s |
4098 | 100 | INSTOBJEXT = .mo | ||
4099 | 101 | INTLBISON = bison | ||
4100 | 102 | INTLLIBS = | 89 | INTLLIBS = |
4101 | 103 | INTLOBJS = | ||
4102 | 104 | INTL_LIBTOOL_SUFFIX_PREFIX = | ||
4103 | 105 | INTL_MACOSX_LIBS = | 90 | INTL_MACOSX_LIBS = |
4104 | 106 | LDFLAGS = | 91 | LDFLAGS = |
4106 | 107 | LIBICONV = | 92 | LIBICONV = -liconv |
4107 | 108 | LIBINTL = | 93 | LIBINTL = |
4108 | 109 | LIBMULTITHREAD = -lpthread | ||
4109 | 110 | LIBOBJS = | 94 | LIBOBJS = |
4110 | 111 | LIBPTH = | ||
4111 | 112 | LIBS = | 95 | LIBS = |
4112 | 113 | LIBTHREAD = | ||
4113 | 114 | LIBTOOL = $(SHELL) $(top_builddir)/libtool | 96 | LIBTOOL = $(SHELL) $(top_builddir)/libtool |
4114 | 115 | LIBUSB_CFLAGS = | 97 | LIBUSB_CFLAGS = |
4115 | 116 | LIBUSB_LIBS = -lusb | 98 | LIBUSB_LIBS = -lusb |
4116 | 117 | LN_S = ln -s | 99 | LN_S = ln -s |
4118 | 118 | LTLIBICONV = | 100 | LTLIBICONV = -liconv |
4119 | 119 | LTLIBINTL = | 101 | LTLIBINTL = |
4120 | 120 | LTLIBMULTITHREAD = -lpthread | ||
4121 | 121 | LTLIBOBJS = | 102 | LTLIBOBJS = |
4125 | 122 | LTLIBPTH = | 103 | LT_LIBVERSION = 2:0:0 |
4123 | 123 | LTLIBTHREAD = | ||
4124 | 124 | LT_LIBVERSION = 1:16:0 | ||
4126 | 125 | MAINT = # | 104 | MAINT = # |
4128 | 126 | MAKEINFO = ${SHELL} /tmp/libticables2-1.2.0/missing --run makeinfo | 105 | MAKEINFO = ${SHELL} /tmp/ticables2/missing --run makeinfo |
4129 | 127 | MKDIR_P = /bin/mkdir -p | 106 | MKDIR_P = /bin/mkdir -p |
4130 | 128 | MSGFMT = /usr/bin/msgfmt | 107 | MSGFMT = /usr/bin/msgfmt |
4131 | 129 | MSGFMT_015 = /usr/bin/msgfmt | 108 | MSGFMT_015 = /usr/bin/msgfmt |
4132 | 130 | MSGMERGE = /usr/bin/msgmerge | 109 | MSGMERGE = /usr/bin/msgmerge |
4133 | 110 | NMEDIT = | ||
4134 | 131 | OBJDUMP = objdump | 111 | OBJDUMP = objdump |
4135 | 132 | OBJEXT = o | 112 | OBJEXT = o |
4136 | 133 | PACKAGE = libticables2 | 113 | PACKAGE = libticables2 |
4137 | 134 | PACKAGE_BUGREPORT = tilp-users@lists.sourceforge.net | 114 | PACKAGE_BUGREPORT = tilp-users@lists.sourceforge.net |
4138 | 135 | PACKAGE_NAME = libticables2 | 115 | PACKAGE_NAME = libticables2 |
4140 | 136 | PACKAGE_STRING = libticables2 1.2.0 | 116 | PACKAGE_STRING = libticables2 1.3.0 |
4141 | 137 | PACKAGE_TARNAME = libticables2 | 117 | PACKAGE_TARNAME = libticables2 |
4143 | 138 | PACKAGE_VERSION = 1.2.0 | 118 | PACKAGE_VERSION = 1.3.0 |
4144 | 139 | PATH_SEPARATOR = : | 119 | PATH_SEPARATOR = : |
4145 | 140 | PKG_CONFIG = /usr/bin/pkg-config | 120 | PKG_CONFIG = /usr/bin/pkg-config |
4146 | 141 | POSUB = po | 121 | POSUB = po |
4147 | 142 | PRI_MACROS_BROKEN = 0 | ||
4148 | 143 | RANLIB = ranlib | 122 | RANLIB = ranlib |
4149 | 144 | RC = windres | 123 | RC = windres |
4150 | 124 | SED = /bin/sed | ||
4151 | 145 | SET_MAKE = | 125 | SET_MAKE = |
4152 | 146 | SHELL = /bin/sh | 126 | SHELL = /bin/sh |
4153 | 147 | STRIP = strip | 127 | STRIP = strip |
4154 | 148 | TFDOCGEN = yes | 128 | TFDOCGEN = yes |
4155 | 149 | USE_INCLUDED_LIBINTL = no | ||
4156 | 150 | USE_NLS = yes | 129 | USE_NLS = yes |
4159 | 151 | VERSION = 1.2.0 | 130 | VERSION = 1.3.0 |
4158 | 152 | WOE32DLL = no | ||
4160 | 153 | XGETTEXT = /usr/bin/xgettext | 131 | XGETTEXT = /usr/bin/xgettext |
4161 | 154 | XGETTEXT_015 = /usr/bin/xgettext | 132 | XGETTEXT_015 = /usr/bin/xgettext |
4166 | 155 | abs_builddir = /tmp/libticables2-1.2.0/build/mingw | 133 | XGETTEXT_EXTRA_OPTIONS = |
4167 | 156 | abs_srcdir = /tmp/libticables2-1.2.0/build/mingw | 134 | abs_builddir = /tmp/ticables2/build/mingw |
4168 | 157 | abs_top_builddir = /tmp/libticables2-1.2.0 | 135 | abs_srcdir = /tmp/ticables2/build/mingw |
4169 | 158 | abs_top_srcdir = /tmp/libticables2-1.2.0 | 136 | abs_top_builddir = /tmp/ticables2 |
4170 | 137 | abs_top_srcdir = /tmp/ticables2 | ||
4171 | 159 | ac_ct_CC = gcc | 138 | ac_ct_CC = gcc |
4173 | 160 | ac_ct_CXX = | 139 | ac_ct_CXX = g++ |
4174 | 161 | ac_ct_F77 = | 140 | ac_ct_F77 = |
4175 | 162 | am__include = include | 141 | am__include = include |
4176 | 163 | am__leading_dot = . | 142 | am__leading_dot = . |
4177 | @@ -165,26 +144,26 @@ | |||
4178 | 165 | am__tar = ${AMTAR} chof - "$$tardir" | 144 | am__tar = ${AMTAR} chof - "$$tardir" |
4179 | 166 | am__untar = ${AMTAR} xf - | 145 | am__untar = ${AMTAR} xf - |
4180 | 167 | bindir = ${exec_prefix}/bin | 146 | bindir = ${exec_prefix}/bin |
4182 | 168 | build = x86_64-unknown-linux-gnu | 147 | build = i686-pc-linux-gnu |
4183 | 169 | build_alias = | 148 | build_alias = |
4185 | 170 | build_cpu = x86_64 | 149 | build_cpu = i686 |
4186 | 171 | build_os = linux-gnu | 150 | build_os = linux-gnu |
4188 | 172 | build_vendor = unknown | 151 | build_vendor = pc |
4189 | 173 | builddir = . | 152 | builddir = . |
4190 | 174 | datadir = ${datarootdir} | 153 | datadir = ${datarootdir} |
4191 | 175 | datarootdir = ${prefix}/share | 154 | datarootdir = ${prefix}/share |
4192 | 176 | docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} | 155 | docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} |
4193 | 177 | dvidir = ${docdir} | 156 | dvidir = ${docdir} |
4194 | 178 | exec_prefix = ${prefix} | 157 | exec_prefix = ${prefix} |
4196 | 179 | host = x86_64-unknown-linux-gnu | 158 | host = i686-pc-linux-gnu |
4197 | 180 | host_alias = | 159 | host_alias = |
4199 | 181 | host_cpu = x86_64 | 160 | host_cpu = i686 |
4200 | 182 | host_os = linux-gnu | 161 | host_os = linux-gnu |
4202 | 183 | host_vendor = unknown | 162 | host_vendor = pc |
4203 | 184 | htmldir = ${docdir} | 163 | htmldir = ${docdir} |
4204 | 185 | includedir = ${prefix}/include | 164 | includedir = ${prefix}/include |
4205 | 186 | infodir = ${datarootdir}/info | 165 | infodir = ${datarootdir}/info |
4207 | 187 | install_sh = $(SHELL) /tmp/libticables2-1.2.0/install-sh | 166 | install_sh = $(SHELL) /tmp/ticables2/install-sh |
4208 | 188 | libdir = ${exec_prefix}/lib | 167 | libdir = ${exec_prefix}/lib |
4209 | 189 | libexecdir = ${exec_prefix}/libexec | 168 | libexecdir = ${exec_prefix}/libexec |
4210 | 190 | localedir = ${datarootdir}/locale | 169 | localedir = ${datarootdir}/locale |
4211 | 191 | 170 | ||
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 @@ | |||
4217 | 1 | # Makefile.in generated by automake 1.10 from Makefile.am. | 1 | # Makefile.in generated by automake 1.10.1 from Makefile.am. |
4218 | 2 | # @configure_input@ | 2 | # @configure_input@ |
4219 | 3 | 3 | ||
4220 | 4 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | 4 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
4222 | 5 | # 2003, 2004, 2005, 2006 Free Software Foundation, Inc. | 5 | # 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
4223 | 6 | # This Makefile.in is free software; the Free Software Foundation | 6 | # This Makefile.in is free software; the Free Software Foundation |
4224 | 7 | # gives unlimited permission to copy and/or distribute it, | 7 | # gives unlimited permission to copy and/or distribute it, |
4225 | 8 | # with or without modifications, as long as this notice is preserved. | 8 | # with or without modifications, as long as this notice is preserved. |
4226 | @@ -46,7 +46,6 @@ | |||
4227 | 46 | DATA = $(noinst_DATA) | 46 | DATA = $(noinst_DATA) |
4228 | 47 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | 47 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
4229 | 48 | ACLOCAL = @ACLOCAL@ | 48 | ACLOCAL = @ACLOCAL@ |
4230 | 49 | ALLOCA = @ALLOCA@ | ||
4231 | 50 | AMTAR = @AMTAR@ | 49 | AMTAR = @AMTAR@ |
4232 | 51 | AR = @AR@ | 50 | AR = @AR@ |
4233 | 52 | AS = @AS@ | 51 | AS = @AS@ |
4234 | @@ -54,12 +53,9 @@ | |||
4235 | 54 | AUTOHEADER = @AUTOHEADER@ | 53 | AUTOHEADER = @AUTOHEADER@ |
4236 | 55 | AUTOMAKE = @AUTOMAKE@ | 54 | AUTOMAKE = @AUTOMAKE@ |
4237 | 56 | AWK = @AWK@ | 55 | AWK = @AWK@ |
4238 | 57 | BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ | ||
4239 | 58 | CATOBJEXT = @CATOBJEXT@ | ||
4240 | 59 | CC = @CC@ | 56 | CC = @CC@ |
4241 | 60 | CCDEPMODE = @CCDEPMODE@ | 57 | CCDEPMODE = @CCDEPMODE@ |
4242 | 61 | CFLAGS = @CFLAGS@ | 58 | CFLAGS = @CFLAGS@ |
4243 | 62 | CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ | ||
4244 | 63 | CPP = @CPP@ | 59 | CPP = @CPP@ |
4245 | 64 | CPPFLAGS = @CPPFLAGS@ | 60 | CPPFLAGS = @CPPFLAGS@ |
4246 | 65 | CXX = @CXX@ | 61 | CXX = @CXX@ |
4247 | @@ -67,10 +63,10 @@ | |||
4248 | 67 | CXXDEPMODE = @CXXDEPMODE@ | 63 | CXXDEPMODE = @CXXDEPMODE@ |
4249 | 68 | CXXFLAGS = @CXXFLAGS@ | 64 | CXXFLAGS = @CXXFLAGS@ |
4250 | 69 | CYGPATH_W = @CYGPATH_W@ | 65 | CYGPATH_W = @CYGPATH_W@ |
4251 | 70 | DATADIRNAME = @DATADIRNAME@ | ||
4252 | 71 | DEFS = @DEFS@ | 66 | DEFS = @DEFS@ |
4253 | 72 | DEPDIR = @DEPDIR@ | 67 | DEPDIR = @DEPDIR@ |
4254 | 73 | DLLTOOL = @DLLTOOL@ | 68 | DLLTOOL = @DLLTOOL@ |
4255 | 69 | DSYMUTIL = @DSYMUTIL@ | ||
4256 | 74 | ECHO = @ECHO@ | 70 | ECHO = @ECHO@ |
4257 | 75 | ECHO_C = @ECHO_C@ | 71 | ECHO_C = @ECHO_C@ |
4258 | 76 | ECHO_N = @ECHO_N@ | 72 | ECHO_N = @ECHO_N@ |
4259 | @@ -79,48 +75,31 @@ | |||
4260 | 79 | EXEEXT = @EXEEXT@ | 75 | EXEEXT = @EXEEXT@ |
4261 | 80 | F77 = @F77@ | 76 | F77 = @F77@ |
4262 | 81 | FFLAGS = @FFLAGS@ | 77 | FFLAGS = @FFLAGS@ |
4266 | 82 | GENCAT = @GENCAT@ | 78 | GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ |
4264 | 83 | GLIBC2 = @GLIBC2@ | ||
4265 | 84 | GLIBC21 = @GLIBC21@ | ||
4267 | 85 | GLIB_CFLAGS = @GLIB_CFLAGS@ | 79 | GLIB_CFLAGS = @GLIB_CFLAGS@ |
4268 | 86 | GLIB_LIBS = @GLIB_LIBS@ | 80 | GLIB_LIBS = @GLIB_LIBS@ |
4269 | 87 | GMSGFMT = @GMSGFMT@ | 81 | GMSGFMT = @GMSGFMT@ |
4270 | 88 | GMSGFMT_015 = @GMSGFMT_015@ | 82 | GMSGFMT_015 = @GMSGFMT_015@ |
4271 | 89 | GREP = @GREP@ | 83 | GREP = @GREP@ |
4272 | 90 | HAVE_ASPRINTF = @HAVE_ASPRINTF@ | ||
4273 | 91 | HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ | ||
4274 | 92 | HAVE_SNPRINTF = @HAVE_SNPRINTF@ | ||
4275 | 93 | HAVE_VISIBILITY = @HAVE_VISIBILITY@ | ||
4276 | 94 | HAVE_WPRINTF = @HAVE_WPRINTF@ | ||
4277 | 95 | INSTALL = @INSTALL@ | 84 | INSTALL = @INSTALL@ |
4278 | 96 | INSTALL_DATA = @INSTALL_DATA@ | 85 | INSTALL_DATA = @INSTALL_DATA@ |
4279 | 97 | INSTALL_PROGRAM = @INSTALL_PROGRAM@ | 86 | INSTALL_PROGRAM = @INSTALL_PROGRAM@ |
4280 | 98 | INSTALL_SCRIPT = @INSTALL_SCRIPT@ | 87 | INSTALL_SCRIPT = @INSTALL_SCRIPT@ |
4281 | 99 | INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ | 88 | INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ |
4282 | 100 | INSTOBJEXT = @INSTOBJEXT@ | ||
4283 | 101 | INTLBISON = @INTLBISON@ | ||
4284 | 102 | INTLLIBS = @INTLLIBS@ | 89 | INTLLIBS = @INTLLIBS@ |
4285 | 103 | INTLOBJS = @INTLOBJS@ | ||
4286 | 104 | INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ | ||
4287 | 105 | INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ | 90 | INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ |
4288 | 106 | LDFLAGS = @LDFLAGS@ | 91 | LDFLAGS = @LDFLAGS@ |
4289 | 107 | LIBICONV = @LIBICONV@ | 92 | LIBICONV = @LIBICONV@ |
4290 | 108 | LIBINTL = @LIBINTL@ | 93 | LIBINTL = @LIBINTL@ |
4291 | 109 | LIBMULTITHREAD = @LIBMULTITHREAD@ | ||
4292 | 110 | LIBOBJS = @LIBOBJS@ | 94 | LIBOBJS = @LIBOBJS@ |
4293 | 111 | LIBPTH = @LIBPTH@ | ||
4294 | 112 | LIBS = @LIBS@ | 95 | LIBS = @LIBS@ |
4295 | 113 | LIBTHREAD = @LIBTHREAD@ | ||
4296 | 114 | LIBTOOL = @LIBTOOL@ | 96 | LIBTOOL = @LIBTOOL@ |
4297 | 115 | LIBUSB_CFLAGS = @LIBUSB_CFLAGS@ | 97 | LIBUSB_CFLAGS = @LIBUSB_CFLAGS@ |
4298 | 116 | LIBUSB_LIBS = @LIBUSB_LIBS@ | 98 | LIBUSB_LIBS = @LIBUSB_LIBS@ |
4299 | 117 | LN_S = @LN_S@ | 99 | LN_S = @LN_S@ |
4300 | 118 | LTLIBICONV = @LTLIBICONV@ | 100 | LTLIBICONV = @LTLIBICONV@ |
4301 | 119 | LTLIBINTL = @LTLIBINTL@ | 101 | LTLIBINTL = @LTLIBINTL@ |
4302 | 120 | LTLIBMULTITHREAD = @LTLIBMULTITHREAD@ | ||
4303 | 121 | LTLIBOBJS = @LTLIBOBJS@ | 102 | LTLIBOBJS = @LTLIBOBJS@ |
4304 | 122 | LTLIBPTH = @LTLIBPTH@ | ||
4305 | 123 | LTLIBTHREAD = @LTLIBTHREAD@ | ||
4306 | 124 | LT_LIBVERSION = @LT_LIBVERSION@ | 103 | LT_LIBVERSION = @LT_LIBVERSION@ |
4307 | 125 | MAINT = @MAINT@ | 104 | MAINT = @MAINT@ |
4308 | 126 | MAKEINFO = @MAKEINFO@ | 105 | MAKEINFO = @MAKEINFO@ |
4309 | @@ -128,6 +107,7 @@ | |||
4310 | 128 | MSGFMT = @MSGFMT@ | 107 | MSGFMT = @MSGFMT@ |
4311 | 129 | MSGFMT_015 = @MSGFMT_015@ | 108 | MSGFMT_015 = @MSGFMT_015@ |
4312 | 130 | MSGMERGE = @MSGMERGE@ | 109 | MSGMERGE = @MSGMERGE@ |
4313 | 110 | NMEDIT = @NMEDIT@ | ||
4314 | 131 | OBJDUMP = @OBJDUMP@ | 111 | OBJDUMP = @OBJDUMP@ |
4315 | 132 | OBJEXT = @OBJEXT@ | 112 | OBJEXT = @OBJEXT@ |
4316 | 133 | PACKAGE = @PACKAGE@ | 113 | PACKAGE = @PACKAGE@ |
4317 | @@ -139,19 +119,18 @@ | |||
4318 | 139 | PATH_SEPARATOR = @PATH_SEPARATOR@ | 119 | PATH_SEPARATOR = @PATH_SEPARATOR@ |
4319 | 140 | PKG_CONFIG = @PKG_CONFIG@ | 120 | PKG_CONFIG = @PKG_CONFIG@ |
4320 | 141 | POSUB = @POSUB@ | 121 | POSUB = @POSUB@ |
4321 | 142 | PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ | ||
4322 | 143 | RANLIB = @RANLIB@ | 122 | RANLIB = @RANLIB@ |
4323 | 144 | RC = @RC@ | 123 | RC = @RC@ |
4324 | 124 | SED = @SED@ | ||
4325 | 145 | SET_MAKE = @SET_MAKE@ | 125 | SET_MAKE = @SET_MAKE@ |
4326 | 146 | SHELL = @SHELL@ | 126 | SHELL = @SHELL@ |
4327 | 147 | STRIP = @STRIP@ | 127 | STRIP = @STRIP@ |
4328 | 148 | TFDOCGEN = @TFDOCGEN@ | 128 | TFDOCGEN = @TFDOCGEN@ |
4329 | 149 | USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ | ||
4330 | 150 | USE_NLS = @USE_NLS@ | 129 | USE_NLS = @USE_NLS@ |
4331 | 151 | VERSION = @VERSION@ | 130 | VERSION = @VERSION@ |
4332 | 152 | WOE32DLL = @WOE32DLL@ | ||
4333 | 153 | XGETTEXT = @XGETTEXT@ | 131 | XGETTEXT = @XGETTEXT@ |
4334 | 154 | XGETTEXT_015 = @XGETTEXT_015@ | 132 | XGETTEXT_015 = @XGETTEXT_015@ |
4335 | 133 | XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ | ||
4336 | 155 | abs_builddir = @abs_builddir@ | 134 | abs_builddir = @abs_builddir@ |
4337 | 156 | abs_srcdir = @abs_srcdir@ | 135 | abs_srcdir = @abs_srcdir@ |
4338 | 157 | abs_top_builddir = @abs_top_builddir@ | 136 | abs_top_builddir = @abs_top_builddir@ |
4339 | 158 | 137 | ||
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 | 4 | // | 4 | // |
4345 | 5 | 5 | ||
4346 | 6 | 1 VERSIONINFO | 6 | 1 VERSIONINFO |
4349 | 7 | FILEVERSION 1,2,0,0 | 7 | FILEVERSION 1,3,0,0 |
4350 | 8 | PRODUCTVERSION 1,2,0,0 | 8 | PRODUCTVERSION 1,3,0,0 |
4351 | 9 | FILEFLAGSMASK 0x3fL | 9 | FILEFLAGSMASK 0x3fL |
4352 | 10 | #ifdef _DEBUG | 10 | #ifdef _DEBUG |
4353 | 11 | FILEFLAGS 0x21L | 11 | FILEFLAGS 0x21L |
4354 | @@ -23,14 +23,14 @@ | |||
4355 | 23 | VALUE "Comments", "This lib is placed under GPL license. The license can be found on www.gnu.org\0" | 23 | VALUE "Comments", "This lib is placed under GPL license. The license can be found on www.gnu.org\0" |
4356 | 24 | VALUE "CompanyName", "The TiLP Team\0" | 24 | VALUE "CompanyName", "The TiLP Team\0" |
4357 | 25 | VALUE "FileDescription", "TI cables library\0" | 25 | VALUE "FileDescription", "TI cables library\0" |
4359 | 26 | VALUE "FileVersion", "1.2.0\0" | 26 | VALUE "FileVersion", "1.3.0\0" |
4360 | 27 | VALUE "InternalName", "libticables2\0" | 27 | VALUE "InternalName", "libticables2\0" |
4362 | 28 | VALUE "LegalCopyright", "Copyright © 1999-2007, Romain Liévin\0" | 28 | VALUE "LegalCopyright", "Copyright © 1999-2009, Romain Liévin\0" |
4363 | 29 | VALUE "LegalTrademarks", "\0" | 29 | VALUE "LegalTrademarks", "\0" |
4364 | 30 | VALUE "OriginalFilename", "libticables2-1.dll\0" | 30 | VALUE "OriginalFilename", "libticables2-1.dll\0" |
4365 | 31 | VALUE "PrivateBuild", "\0" | 31 | VALUE "PrivateBuild", "\0" |
4366 | 32 | VALUE "ProductName", "TI cables library\0" | 32 | VALUE "ProductName", "TI cables library\0" |
4368 | 33 | VALUE "ProductVersion", "1.2.0\0" | 33 | VALUE "ProductVersion", "1.3.0\0" |
4369 | 34 | VALUE "SpecialBuild", "Windows 9x/Me, NT4/2000/XP version\0" | 34 | VALUE "SpecialBuild", "Windows 9x/Me, NT4/2000/XP version\0" |
4370 | 35 | END | 35 | END |
4371 | 36 | END | 36 | END |
4372 | 37 | 37 | ||
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 | 49 | # ADD BASE BSC32 /nologo | 49 | # ADD BASE BSC32 /nologo |
4378 | 50 | # ADD BSC32 /nologo | 50 | # ADD BSC32 /nologo |
4379 | 51 | LINK32=link.exe | 51 | LINK32=link.exe |
4382 | 52 | # 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 | 52 | # 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 | 53 | # 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" | 53 | # 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 | 54 | 54 | ||
4385 | 55 | !ELSEIF "$(CFG)" == "test_ticables2 - Win32 Debug" | 55 | !ELSEIF "$(CFG)" == "test_ticables2 - Win32 Debug" |
4386 | 56 | 56 | ||
4387 | @@ -73,8 +73,8 @@ | |||
4388 | 73 | # ADD BASE BSC32 /nologo | 73 | # ADD BASE BSC32 /nologo |
4389 | 74 | # ADD BSC32 /nologo | 74 | # ADD BSC32 /nologo |
4390 | 75 | LINK32=link.exe | 75 | LINK32=link.exe |
4393 | 76 | # 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 | 76 | # 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 | 77 | # 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 | 77 | # 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 | 78 | 78 | ||
4396 | 79 | !ENDIF | 79 | !ENDIF |
4397 | 80 | 80 | ||
4398 | 81 | 81 | ||
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 | 39 | # PROP Use_MFC 0 | 39 | # PROP Use_MFC 0 |
4404 | 40 | # PROP Use_Debug_Libraries 0 | 40 | # PROP Use_Debug_Libraries 0 |
4405 | 41 | # PROP Output_Dir "" | 41 | # PROP Output_Dir "" |
4407 | 42 | # PROP Intermediate_Dir "C:\msvc\Output\ticables2" | 42 | # PROP Intermediate_Dir "C:\lpg\msvc\Output\ticables2" |
4408 | 43 | # PROP Ignore_Export_Lib 0 | 43 | # PROP Ignore_Export_Lib 0 |
4409 | 44 | # PROP Target_Dir "" | 44 | # PROP Target_Dir "" |
4410 | 45 | # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c | 45 | # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c |
4412 | 46 | # 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 | 46 | # 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 | 47 | # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" | 47 | # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" |
4414 | 48 | # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" | 48 | # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" |
4415 | 49 | # ADD BASE RSC /l 0x40c /d "NDEBUG" | 49 | # ADD BASE RSC /l 0x40c /d "NDEBUG" |
4416 | @@ -52,8 +52,8 @@ | |||
4417 | 52 | # ADD BASE BSC32 /nologo | 52 | # ADD BASE BSC32 /nologo |
4418 | 53 | # ADD BSC32 /nologo | 53 | # ADD BSC32 /nologo |
4419 | 54 | LINK32=link.exe | 54 | LINK32=link.exe |
4422 | 55 | # 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 | 55 | # 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 | 56 | # 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" | 56 | # 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 | 57 | 57 | ||
4425 | 58 | !ELSEIF "$(CFG)" == "ticables2 - Win32 Debug" | 58 | !ELSEIF "$(CFG)" == "ticables2 - Win32 Debug" |
4426 | 59 | 59 | ||
4427 | @@ -64,12 +64,12 @@ | |||
4428 | 64 | # PROP BASE Target_Dir "" | 64 | # PROP BASE Target_Dir "" |
4429 | 65 | # PROP Use_MFC 0 | 65 | # PROP Use_MFC 0 |
4430 | 66 | # PROP Use_Debug_Libraries 1 | 66 | # PROP Use_Debug_Libraries 1 |
4433 | 67 | # PROP Output_Dir "C:\msvc\tilp2" | 67 | # PROP Output_Dir "c:\lpg\msvc" |
4434 | 68 | # PROP Intermediate_Dir "C:\msvc\Output\ticables2" | 68 | # PROP Intermediate_Dir "C:\lpg\msvc\Output\ticables2" |
4435 | 69 | # PROP Ignore_Export_Lib 0 | 69 | # PROP Ignore_Export_Lib 0 |
4436 | 70 | # PROP Target_Dir "" | 70 | # PROP Target_Dir "" |
4437 | 71 | # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c | 71 | # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c |
4439 | 72 | # 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 | 72 | # 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 | 73 | # SUBTRACT CPP /Fr /YX | 73 | # SUBTRACT CPP /Fr /YX |
4441 | 74 | # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" | 74 | # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" |
4442 | 75 | # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" | 75 | # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" |
4443 | @@ -79,8 +79,8 @@ | |||
4444 | 79 | # ADD BASE BSC32 /nologo | 79 | # ADD BASE BSC32 /nologo |
4445 | 80 | # SUBTRACT BSC32 /nologo | 80 | # SUBTRACT BSC32 /nologo |
4446 | 81 | LINK32=link.exe | 81 | LINK32=link.exe |
4449 | 82 | # 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 | 82 | # 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 | 83 | # 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 | 83 | # 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 | 84 | # SUBTRACT LINK32 /map | 84 | # SUBTRACT LINK32 /map |
4452 | 85 | 85 | ||
4453 | 86 | !ENDIF | 86 | !ENDIF |
4454 | @@ -243,15 +243,15 @@ | |||
4455 | 243 | # End Source File | 243 | # End Source File |
4456 | 244 | # Begin Source File | 244 | # Begin Source File |
4457 | 245 | 245 | ||
4467 | 246 | SOURCE="..\..\..\..\..\GTK2DEV\lib\glib-2.0.lib" | 246 | SOURCE="C:\LPG\GTK\lib\glib-2.0.lib" |
4468 | 247 | # End Source File | 247 | # End Source File |
4469 | 248 | # Begin Source File | 248 | # Begin Source File |
4470 | 249 | 249 | ||
4471 | 250 | SOURCE=..\..\..\..\..\GTK2DEV\lib\intl.lib | 250 | SOURCE=C:\LPG\GTK\lib\intl.lib |
4472 | 251 | # End Source File | 251 | # End Source File |
4473 | 252 | # Begin Source File | 252 | # Begin Source File |
4474 | 253 | 253 | ||
4475 | 254 | SOURCE="..\..\..\libusb-win32\lib\msvc\libusb.lib" | 254 | SOURCE="C:\lpg\libusb-win32\lib\msvc\libusb.lib" |
4476 | 255 | # End Source File | 255 | # End Source File |
4477 | 256 | # End Target | 256 | # End Target |
4478 | 257 | # End Project | 257 | # End Project |
4479 | 258 | 258 | ||
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 | 1 | #! /bin/sh | 1 | #! /bin/sh |
4485 | 2 | # Attempt to guess a canonical system name. | 2 | # Attempt to guess a canonical system name. |
4486 | 3 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, | 3 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
4489 | 4 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, | 4 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 |
4490 | 5 | # Inc. | 5 | # Free Software Foundation, Inc. |
4491 | 6 | 6 | ||
4493 | 7 | timestamp='2006-07-02' | 7 | timestamp='2008-01-23' |
4494 | 8 | 8 | ||
4495 | 9 | # This file is free software; you can redistribute it and/or modify it | 9 | # This file is free software; you can redistribute it and/or modify it |
4496 | 10 | # under the terms of the GNU General Public License as published by | 10 | # under the terms of the GNU General Public License as published by |
4497 | @@ -56,8 +56,8 @@ | |||
4498 | 56 | GNU config.guess ($timestamp) | 56 | GNU config.guess ($timestamp) |
4499 | 57 | 57 | ||
4500 | 58 | Originally written by Per Bothner. | 58 | Originally written by Per Bothner. |
4503 | 59 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 | 59 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, |
4504 | 60 | Free Software Foundation, Inc. | 60 | 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
4505 | 61 | 61 | ||
4506 | 62 | This is free software; see the source for copying conditions. There is NO | 62 | This is free software; see the source for copying conditions. There is NO |
4507 | 63 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." | 63 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
4508 | @@ -161,6 +161,7 @@ | |||
4509 | 161 | arm*) machine=arm-unknown ;; | 161 | arm*) machine=arm-unknown ;; |
4510 | 162 | sh3el) machine=shl-unknown ;; | 162 | sh3el) machine=shl-unknown ;; |
4511 | 163 | sh3eb) machine=sh-unknown ;; | 163 | sh3eb) machine=sh-unknown ;; |
4512 | 164 | sh5el) machine=sh5le-unknown ;; | ||
4513 | 164 | *) machine=${UNAME_MACHINE_ARCH}-unknown ;; | 165 | *) machine=${UNAME_MACHINE_ARCH}-unknown ;; |
4514 | 165 | esac | 166 | esac |
4515 | 166 | # The Operating System including object format, if it has switched | 167 | # The Operating System including object format, if it has switched |
4516 | @@ -329,7 +330,7 @@ | |||
4517 | 329 | sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) | 330 | sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) |
4518 | 330 | echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` | 331 | echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
4519 | 331 | exit ;; | 332 | exit ;; |
4521 | 332 | i86pc:SunOS:5.*:*) | 333 | i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) |
4522 | 333 | echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` | 334 | echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
4523 | 334 | exit ;; | 335 | exit ;; |
4524 | 335 | sun4*:SunOS:6*:*) | 336 | sun4*:SunOS:6*:*) |
4525 | @@ -531,7 +532,7 @@ | |||
4526 | 531 | echo rs6000-ibm-aix3.2 | 532 | echo rs6000-ibm-aix3.2 |
4527 | 532 | fi | 533 | fi |
4528 | 533 | exit ;; | 534 | exit ;; |
4530 | 534 | *:AIX:*:[45]) | 535 | *:AIX:*:[456]) |
4531 | 535 | IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` | 536 | IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` |
4532 | 536 | if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then | 537 | if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then |
4533 | 537 | IBM_ARCH=rs6000 | 538 | IBM_ARCH=rs6000 |
4534 | @@ -780,7 +781,7 @@ | |||
4535 | 780 | i*:CYGWIN*:*) | 781 | i*:CYGWIN*:*) |
4536 | 781 | echo ${UNAME_MACHINE}-pc-cygwin | 782 | echo ${UNAME_MACHINE}-pc-cygwin |
4537 | 782 | exit ;; | 783 | exit ;; |
4539 | 783 | i*:MINGW*:*) | 784 | *:MINGW*:*) |
4540 | 784 | echo ${UNAME_MACHINE}-pc-mingw32 | 785 | echo ${UNAME_MACHINE}-pc-mingw32 |
4541 | 785 | exit ;; | 786 | exit ;; |
4542 | 786 | i*:windows32*:*) | 787 | i*:windows32*:*) |
4543 | @@ -790,12 +791,18 @@ | |||
4544 | 790 | i*:PW*:*) | 791 | i*:PW*:*) |
4545 | 791 | echo ${UNAME_MACHINE}-pc-pw32 | 792 | echo ${UNAME_MACHINE}-pc-pw32 |
4546 | 792 | exit ;; | 793 | exit ;; |
4553 | 793 | x86:Interix*:[3456]*) | 794 | *:Interix*:[3456]*) |
4554 | 794 | echo i586-pc-interix${UNAME_RELEASE} | 795 | case ${UNAME_MACHINE} in |
4555 | 795 | exit ;; | 796 | x86) |
4556 | 796 | EM64T:Interix*:[3456]*) | 797 | echo i586-pc-interix${UNAME_RELEASE} |
4557 | 797 | echo x86_64-unknown-interix${UNAME_RELEASE} | 798 | exit ;; |
4558 | 798 | exit ;; | 799 | EM64T | authenticamd) |
4559 | 800 | echo x86_64-unknown-interix${UNAME_RELEASE} | ||
4560 | 801 | exit ;; | ||
4561 | 802 | IA64) | ||
4562 | 803 | echo ia64-unknown-interix${UNAME_RELEASE} | ||
4563 | 804 | exit ;; | ||
4564 | 805 | esac ;; | ||
4565 | 799 | [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) | 806 | [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) |
4566 | 800 | echo i${UNAME_MACHINE}-pc-mks | 807 | echo i${UNAME_MACHINE}-pc-mks |
4567 | 801 | exit ;; | 808 | exit ;; |
4568 | @@ -829,7 +836,14 @@ | |||
4569 | 829 | echo ${UNAME_MACHINE}-pc-minix | 836 | echo ${UNAME_MACHINE}-pc-minix |
4570 | 830 | exit ;; | 837 | exit ;; |
4571 | 831 | arm*:Linux:*:*) | 838 | arm*:Linux:*:*) |
4573 | 832 | echo ${UNAME_MACHINE}-unknown-linux-gnu | 839 | eval $set_cc_for_build |
4574 | 840 | if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | ||
4575 | 841 | | grep -q __ARM_EABI__ | ||
4576 | 842 | then | ||
4577 | 843 | echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
4578 | 844 | else | ||
4579 | 845 | echo ${UNAME_MACHINE}-unknown-linux-gnueabi | ||
4580 | 846 | fi | ||
4581 | 833 | exit ;; | 847 | exit ;; |
4582 | 834 | avr32*:Linux:*:*) | 848 | avr32*:Linux:*:*) |
4583 | 835 | echo ${UNAME_MACHINE}-unknown-linux-gnu | 849 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
4584 | @@ -950,6 +964,9 @@ | |||
4585 | 950 | x86_64:Linux:*:*) | 964 | x86_64:Linux:*:*) |
4586 | 951 | echo x86_64-unknown-linux-gnu | 965 | echo x86_64-unknown-linux-gnu |
4587 | 952 | exit ;; | 966 | exit ;; |
4588 | 967 | xtensa*:Linux:*:*) | ||
4589 | 968 | echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
4590 | 969 | exit ;; | ||
4591 | 953 | i*86:Linux:*:*) | 970 | i*86:Linux:*:*) |
4592 | 954 | # The BFD linker knows what the default object file format is, so | 971 | # The BFD linker knows what the default object file format is, so |
4593 | 955 | # first see if it will tell us. cd to the root directory to prevent | 972 | # first see if it will tell us. cd to the root directory to prevent |
4594 | @@ -1208,6 +1225,15 @@ | |||
4595 | 1208 | SX-6:SUPER-UX:*:*) | 1225 | SX-6:SUPER-UX:*:*) |
4596 | 1209 | echo sx6-nec-superux${UNAME_RELEASE} | 1226 | echo sx6-nec-superux${UNAME_RELEASE} |
4597 | 1210 | exit ;; | 1227 | exit ;; |
4598 | 1228 | SX-7:SUPER-UX:*:*) | ||
4599 | 1229 | echo sx7-nec-superux${UNAME_RELEASE} | ||
4600 | 1230 | exit ;; | ||
4601 | 1231 | SX-8:SUPER-UX:*:*) | ||
4602 | 1232 | echo sx8-nec-superux${UNAME_RELEASE} | ||
4603 | 1233 | exit ;; | ||
4604 | 1234 | SX-8R:SUPER-UX:*:*) | ||
4605 | 1235 | echo sx8r-nec-superux${UNAME_RELEASE} | ||
4606 | 1236 | exit ;; | ||
4607 | 1211 | Power*:Rhapsody:*:*) | 1237 | Power*:Rhapsody:*:*) |
4608 | 1212 | echo powerpc-apple-rhapsody${UNAME_RELEASE} | 1238 | echo powerpc-apple-rhapsody${UNAME_RELEASE} |
4609 | 1213 | exit ;; | 1239 | exit ;; |
4610 | @@ -1458,9 +1484,9 @@ | |||
4611 | 1458 | the operating system you are using. It is advised that you | 1484 | the operating system you are using. It is advised that you |
4612 | 1459 | download the most up to date version of the config scripts from | 1485 | download the most up to date version of the config scripts from |
4613 | 1460 | 1486 | ||
4615 | 1461 | http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess | 1487 | http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD |
4616 | 1462 | and | 1488 | and |
4618 | 1463 | http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub | 1489 | http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD |
4619 | 1464 | 1490 | ||
4620 | 1465 | If the version you run ($0) is already up to date, please | 1491 | If the version you run ($0) is already up to date, please |
4621 | 1466 | send the following data and any information you think might be | 1492 | send the following data and any information you think might be |
4622 | 1467 | 1493 | ||
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 | 1 | #! /bin/sh | 1 | #! /bin/sh |
4628 | 2 | # Configuration validation subroutine script. | 2 | # Configuration validation subroutine script. |
4629 | 3 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, | 3 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
4632 | 4 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, | 4 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 |
4633 | 5 | # Inc. | 5 | # Free Software Foundation, Inc. |
4634 | 6 | 6 | ||
4636 | 7 | timestamp='2006-07-02' | 7 | timestamp='2008-01-16' |
4637 | 8 | 8 | ||
4638 | 9 | # This file is (in principle) common to ALL GNU software. | 9 | # This file is (in principle) common to ALL GNU software. |
4639 | 10 | # The presence of a machine in this file suggests that SOME GNU software | 10 | # The presence of a machine in this file suggests that SOME GNU software |
4640 | @@ -72,8 +72,8 @@ | |||
4641 | 72 | version="\ | 72 | version="\ |
4642 | 73 | GNU config.sub ($timestamp) | 73 | GNU config.sub ($timestamp) |
4643 | 74 | 74 | ||
4646 | 75 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 | 75 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, |
4647 | 76 | Free Software Foundation, Inc. | 76 | 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
4648 | 77 | 77 | ||
4649 | 78 | This is free software; see the source for copying conditions. There is NO | 78 | This is free software; see the source for copying conditions. There is NO |
4650 | 79 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." | 79 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
4651 | @@ -245,12 +245,12 @@ | |||
4652 | 245 | | bfin \ | 245 | | bfin \ |
4653 | 246 | | c4x | clipper \ | 246 | | c4x | clipper \ |
4654 | 247 | | d10v | d30v | dlx | dsp16xx \ | 247 | | d10v | d30v | dlx | dsp16xx \ |
4656 | 248 | | fr30 | frv \ | 248 | | fido | fr30 | frv \ |
4657 | 249 | | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | 249 | | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ |
4658 | 250 | | i370 | i860 | i960 | ia64 \ | 250 | | i370 | i860 | i960 | ia64 \ |
4659 | 251 | | ip2k | iq2000 \ | 251 | | ip2k | iq2000 \ |
4660 | 252 | | m32c | m32r | m32rle | m68000 | m68k | m88k \ | 252 | | m32c | m32r | m32rle | m68000 | m68k | m88k \ |
4662 | 253 | | maxq | mb | microblaze | mcore \ | 253 | | maxq | mb | microblaze | mcore | mep \ |
4663 | 254 | | mips | mipsbe | mipseb | mipsel | mipsle \ | 254 | | mips | mipsbe | mipseb | mipsel | mipsle \ |
4664 | 255 | | mips16 \ | 255 | | mips16 \ |
4665 | 256 | | mips64 | mips64el \ | 256 | | mips64 | mips64el \ |
4666 | @@ -276,6 +276,7 @@ | |||
4667 | 276 | | pdp10 | pdp11 | pj | pjl \ | 276 | | pdp10 | pdp11 | pj | pjl \ |
4668 | 277 | | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | 277 | | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ |
4669 | 278 | | pyramid \ | 278 | | pyramid \ |
4670 | 279 | | score \ | ||
4671 | 279 | | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | 280 | | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ |
4672 | 280 | | sh64 | sh64le \ | 281 | | sh64 | sh64le \ |
4673 | 281 | | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | 282 | | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ |
4674 | @@ -284,7 +285,7 @@ | |||
4675 | 284 | | tahoe | thumb | tic4x | tic80 | tron \ | 285 | | tahoe | thumb | tic4x | tic80 | tron \ |
4676 | 285 | | v850 | v850e \ | 286 | | v850 | v850e \ |
4677 | 286 | | we32k \ | 287 | | we32k \ |
4679 | 287 | | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ | 288 | | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ |
4680 | 288 | | z8k) | 289 | | z8k) |
4681 | 289 | basic_machine=$basic_machine-unknown | 290 | basic_machine=$basic_machine-unknown |
4682 | 290 | ;; | 291 | ;; |
4683 | @@ -323,7 +324,7 @@ | |||
4684 | 323 | | clipper-* | craynv-* | cydra-* \ | 324 | | clipper-* | craynv-* | cydra-* \ |
4685 | 324 | | d10v-* | d30v-* | dlx-* \ | 325 | | d10v-* | d30v-* | dlx-* \ |
4686 | 325 | | elxsi-* \ | 326 | | elxsi-* \ |
4688 | 326 | | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ | 327 | | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ |
4689 | 327 | | h8300-* | h8500-* \ | 328 | | h8300-* | h8500-* \ |
4690 | 328 | | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | 329 | | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ |
4691 | 329 | | i*86-* | i860-* | i960-* | ia64-* \ | 330 | | i*86-* | i860-* | i960-* | ia64-* \ |
4692 | @@ -367,11 +368,15 @@ | |||
4693 | 367 | | tron-* \ | 368 | | tron-* \ |
4694 | 368 | | v850-* | v850e-* | vax-* \ | 369 | | v850-* | v850e-* | vax-* \ |
4695 | 369 | | we32k-* \ | 370 | | we32k-* \ |
4698 | 370 | | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ | 371 | | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ |
4699 | 371 | | xstormy16-* | xtensa-* \ | 372 | | xstormy16-* | xtensa*-* \ |
4700 | 372 | | ymp-* \ | 373 | | ymp-* \ |
4701 | 373 | | z8k-*) | 374 | | z8k-*) |
4702 | 374 | ;; | 375 | ;; |
4703 | 376 | # Recognize the basic CPU types without company name, with glob match. | ||
4704 | 377 | xtensa*) | ||
4705 | 378 | basic_machine=$basic_machine-unknown | ||
4706 | 379 | ;; | ||
4707 | 375 | # Recognize the various machine names and aliases which stand | 380 | # Recognize the various machine names and aliases which stand |
4708 | 376 | # for a CPU type and a company and sometimes even an OS. | 381 | # for a CPU type and a company and sometimes even an OS. |
4709 | 377 | 386bsd) | 382 | 386bsd) |
4710 | @@ -442,6 +447,14 @@ | |||
4711 | 442 | basic_machine=ns32k-sequent | 447 | basic_machine=ns32k-sequent |
4712 | 443 | os=-dynix | 448 | os=-dynix |
4713 | 444 | ;; | 449 | ;; |
4714 | 450 | blackfin) | ||
4715 | 451 | basic_machine=bfin-unknown | ||
4716 | 452 | os=-linux | ||
4717 | 453 | ;; | ||
4718 | 454 | blackfin-*) | ||
4719 | 455 | basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` | ||
4720 | 456 | os=-linux | ||
4721 | 457 | ;; | ||
4722 | 445 | c90) | 458 | c90) |
4723 | 446 | basic_machine=c90-cray | 459 | basic_machine=c90-cray |
4724 | 447 | os=-unicos | 460 | os=-unicos |
4725 | @@ -474,8 +487,8 @@ | |||
4726 | 474 | basic_machine=craynv-cray | 487 | basic_machine=craynv-cray |
4727 | 475 | os=-unicosmp | 488 | os=-unicosmp |
4728 | 476 | ;; | 489 | ;; |
4731 | 477 | cr16c) | 490 | cr16) |
4732 | 478 | basic_machine=cr16c-unknown | 491 | basic_machine=cr16-unknown |
4733 | 479 | os=-elf | 492 | os=-elf |
4734 | 480 | ;; | 493 | ;; |
4735 | 481 | crds | unos) | 494 | crds | unos) |
4736 | @@ -667,6 +680,14 @@ | |||
4737 | 667 | basic_machine=m68k-isi | 680 | basic_machine=m68k-isi |
4738 | 668 | os=-sysv | 681 | os=-sysv |
4739 | 669 | ;; | 682 | ;; |
4740 | 683 | m68knommu) | ||
4741 | 684 | basic_machine=m68k-unknown | ||
4742 | 685 | os=-linux | ||
4743 | 686 | ;; | ||
4744 | 687 | m68knommu-*) | ||
4745 | 688 | basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` | ||
4746 | 689 | os=-linux | ||
4747 | 690 | ;; | ||
4748 | 670 | m88k-omron*) | 691 | m88k-omron*) |
4749 | 671 | basic_machine=m88k-omron | 692 | basic_machine=m88k-omron |
4750 | 672 | ;; | 693 | ;; |
4751 | @@ -682,6 +703,10 @@ | |||
4752 | 682 | basic_machine=i386-pc | 703 | basic_machine=i386-pc |
4753 | 683 | os=-mingw32 | 704 | os=-mingw32 |
4754 | 684 | ;; | 705 | ;; |
4755 | 706 | mingw32ce) | ||
4756 | 707 | basic_machine=arm-unknown | ||
4757 | 708 | os=-mingw32ce | ||
4758 | 709 | ;; | ||
4759 | 685 | miniframe) | 710 | miniframe) |
4760 | 686 | basic_machine=m68000-convergent | 711 | basic_machine=m68000-convergent |
4761 | 687 | ;; | 712 | ;; |
4762 | @@ -808,6 +833,14 @@ | |||
4763 | 808 | basic_machine=i860-intel | 833 | basic_machine=i860-intel |
4764 | 809 | os=-osf | 834 | os=-osf |
4765 | 810 | ;; | 835 | ;; |
4766 | 836 | parisc) | ||
4767 | 837 | basic_machine=hppa-unknown | ||
4768 | 838 | os=-linux | ||
4769 | 839 | ;; | ||
4770 | 840 | parisc-*) | ||
4771 | 841 | basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` | ||
4772 | 842 | os=-linux | ||
4773 | 843 | ;; | ||
4774 | 811 | pbd) | 844 | pbd) |
4775 | 812 | basic_machine=sparc-tti | 845 | basic_machine=sparc-tti |
4776 | 813 | ;; | 846 | ;; |
4777 | @@ -909,6 +942,10 @@ | |||
4778 | 909 | sb1el) | 942 | sb1el) |
4779 | 910 | basic_machine=mipsisa64sb1el-unknown | 943 | basic_machine=mipsisa64sb1el-unknown |
4780 | 911 | ;; | 944 | ;; |
4781 | 945 | sde) | ||
4782 | 946 | basic_machine=mipsisa32-sde | ||
4783 | 947 | os=-elf | ||
4784 | 948 | ;; | ||
4785 | 912 | sei) | 949 | sei) |
4786 | 913 | basic_machine=mips-sei | 950 | basic_machine=mips-sei |
4787 | 914 | os=-seiux | 951 | os=-seiux |
4788 | @@ -920,6 +957,9 @@ | |||
4789 | 920 | basic_machine=sh-hitachi | 957 | basic_machine=sh-hitachi |
4790 | 921 | os=-hms | 958 | os=-hms |
4791 | 922 | ;; | 959 | ;; |
4792 | 960 | sh5el) | ||
4793 | 961 | basic_machine=sh5le-unknown | ||
4794 | 962 | ;; | ||
4795 | 923 | sh64) | 963 | sh64) |
4796 | 924 | basic_machine=sh64-unknown | 964 | basic_machine=sh64-unknown |
4797 | 925 | ;; | 965 | ;; |
4798 | @@ -1009,6 +1049,10 @@ | |||
4799 | 1009 | basic_machine=tic6x-unknown | 1049 | basic_machine=tic6x-unknown |
4800 | 1010 | os=-coff | 1050 | os=-coff |
4801 | 1011 | ;; | 1051 | ;; |
4802 | 1052 | tile*) | ||
4803 | 1053 | basic_machine=tile-unknown | ||
4804 | 1054 | os=-linux-gnu | ||
4805 | 1055 | ;; | ||
4806 | 1012 | tx39) | 1056 | tx39) |
4807 | 1013 | basic_machine=mipstx39-unknown | 1057 | basic_machine=mipstx39-unknown |
4808 | 1014 | ;; | 1058 | ;; |
4809 | @@ -1214,7 +1258,7 @@ | |||
4810 | 1214 | | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | 1258 | | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ |
4811 | 1215 | | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | 1259 | | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ |
4812 | 1216 | | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ | 1260 | | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ |
4814 | 1217 | | -skyos* | -haiku* | -rdos* | -toppers*) | 1261 | | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) |
4815 | 1218 | # Remember, each alternative MUST END IN *, to match a version number. | 1262 | # Remember, each alternative MUST END IN *, to match a version number. |
4816 | 1219 | ;; | 1263 | ;; |
4817 | 1220 | -qnx*) | 1264 | -qnx*) |
4818 | @@ -1366,6 +1410,9 @@ | |||
4819 | 1366 | # system, and we'll never get to this point. | 1410 | # system, and we'll never get to this point. |
4820 | 1367 | 1411 | ||
4821 | 1368 | case $basic_machine in | 1412 | case $basic_machine in |
4822 | 1413 | score-*) | ||
4823 | 1414 | os=-elf | ||
4824 | 1415 | ;; | ||
4825 | 1369 | spu-*) | 1416 | spu-*) |
4826 | 1370 | os=-elf | 1417 | os=-elf |
4827 | 1371 | ;; | 1418 | ;; |
4828 | @@ -1406,6 +1453,9 @@ | |||
4829 | 1406 | m68*-cisco) | 1453 | m68*-cisco) |
4830 | 1407 | os=-aout | 1454 | os=-aout |
4831 | 1408 | ;; | 1455 | ;; |
4832 | 1456 | mep-*) | ||
4833 | 1457 | os=-elf | ||
4834 | 1458 | ;; | ||
4835 | 1409 | mips*-cisco) | 1459 | mips*-cisco) |
4836 | 1410 | os=-elf | 1460 | os=-elf |
4837 | 1411 | ;; | 1461 | ;; |
4838 | 1412 | 1462 | ||
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 | 1 | #! /bin/sh | 1 | #! /bin/sh |
4844 | 2 | # Guess values for system-dependent variables and create Makefiles. | 2 | # Guess values for system-dependent variables and create Makefiles. |
4846 | 3 | # Generated by GNU Autoconf 2.61 for libticables2 1.2.0. | 3 | # Generated by GNU Autoconf 2.61 for libticables2 1.3.0. |
4847 | 4 | # | 4 | # |
4848 | 5 | # Report bugs to <tilp-users@lists.sourceforge.net>. | 5 | # Report bugs to <tilp-users@lists.sourceforge.net>. |
4849 | 6 | # | 6 | # |
4850 | @@ -728,8 +728,8 @@ | |||
4851 | 728 | # Identity of this package. | 728 | # Identity of this package. |
4852 | 729 | PACKAGE_NAME='libticables2' | 729 | PACKAGE_NAME='libticables2' |
4853 | 730 | PACKAGE_TARNAME='libticables2' | 730 | PACKAGE_TARNAME='libticables2' |
4856 | 731 | PACKAGE_VERSION='1.2.0' | 731 | PACKAGE_VERSION='1.3.0' |
4857 | 732 | PACKAGE_STRING='libticables2 1.2.0' | 732 | PACKAGE_STRING='libticables2 1.3.0' |
4858 | 733 | PACKAGE_BUGREPORT='tilp-users@lists.sourceforge.net' | 733 | PACKAGE_BUGREPORT='tilp-users@lists.sourceforge.net' |
4859 | 734 | 734 | ||
4860 | 735 | ac_default_prefix=/usr/local | 735 | ac_default_prefix=/usr/local |
4861 | @@ -858,12 +858,15 @@ | |||
4862 | 858 | CCDEPMODE | 858 | CCDEPMODE |
4863 | 859 | am__fastdepCC_TRUE | 859 | am__fastdepCC_TRUE |
4864 | 860 | am__fastdepCC_FALSE | 860 | am__fastdepCC_FALSE |
4865 | 861 | SED | ||
4866 | 861 | GREP | 862 | GREP |
4867 | 862 | EGREP | 863 | EGREP |
4868 | 863 | LN_S | 864 | LN_S |
4869 | 864 | ECHO | 865 | ECHO |
4870 | 865 | AR | 866 | AR |
4871 | 866 | RANLIB | 867 | RANLIB |
4872 | 868 | DSYMUTIL | ||
4873 | 869 | NMEDIT | ||
4874 | 867 | DLLTOOL | 870 | DLLTOOL |
4875 | 868 | AS | 871 | AS |
4876 | 869 | OBJDUMP | 872 | OBJDUMP |
4877 | @@ -884,6 +887,7 @@ | |||
4878 | 884 | USE_DOCGEN_FALSE | 887 | USE_DOCGEN_FALSE |
4879 | 885 | RC | 888 | RC |
4880 | 886 | USE_NLS | 889 | USE_NLS |
4881 | 890 | GETTEXT_MACRO_VERSION | ||
4882 | 887 | MSGFMT | 891 | MSGFMT |
4883 | 888 | GMSGFMT | 892 | GMSGFMT |
4884 | 889 | MSGFMT_015 | 893 | MSGFMT_015 |
4885 | @@ -891,35 +895,10 @@ | |||
4886 | 891 | XGETTEXT | 895 | XGETTEXT |
4887 | 892 | XGETTEXT_015 | 896 | XGETTEXT_015 |
4888 | 893 | MSGMERGE | 897 | MSGMERGE |
4900 | 894 | GLIBC2 | 898 | XGETTEXT_EXTRA_OPTIONS |
4901 | 895 | CFLAG_VISIBILITY | 899 | INTL_MACOSX_LIBS |
4891 | 896 | HAVE_VISIBILITY | ||
4892 | 897 | ALLOCA | ||
4893 | 898 | PRI_MACROS_BROKEN | ||
4894 | 899 | LIBPTH | ||
4895 | 900 | LTLIBPTH | ||
4896 | 901 | LIBTHREAD | ||
4897 | 902 | LTLIBTHREAD | ||
4898 | 903 | LIBMULTITHREAD | ||
4899 | 904 | LTLIBMULTITHREAD | ||
4902 | 905 | LIBICONV | 900 | LIBICONV |
4903 | 906 | LTLIBICONV | 901 | LTLIBICONV |
4904 | 907 | INTLBISON | ||
4905 | 908 | GLIBC21 | ||
4906 | 909 | INTL_MACOSX_LIBS | ||
4907 | 910 | HAVE_POSIX_PRINTF | ||
4908 | 911 | HAVE_ASPRINTF | ||
4909 | 912 | HAVE_SNPRINTF | ||
4910 | 913 | HAVE_WPRINTF | ||
4911 | 914 | WOE32DLL | ||
4912 | 915 | BUILD_INCLUDED_LIBINTL | ||
4913 | 916 | USE_INCLUDED_LIBINTL | ||
4914 | 917 | CATOBJEXT | ||
4915 | 918 | DATADIRNAME | ||
4916 | 919 | INSTOBJEXT | ||
4917 | 920 | GENCAT | ||
4918 | 921 | INTLOBJS | ||
4919 | 922 | INTL_LIBTOOL_SUFFIX_PREFIX | ||
4920 | 923 | INTLLIBS | 902 | INTLLIBS |
4921 | 924 | LIBINTL | 903 | LIBINTL |
4922 | 925 | LTLIBINTL | 904 | LTLIBINTL |
4923 | @@ -1456,7 +1435,7 @@ | |||
4924 | 1456 | # Omit some internal or obsolete options to make the list less imposing. | 1435 | # Omit some internal or obsolete options to make the list less imposing. |
4925 | 1457 | # This message is too long to be a string in the A/UX 3.1 sh. | 1436 | # This message is too long to be a string in the A/UX 3.1 sh. |
4926 | 1458 | cat <<_ACEOF | 1437 | cat <<_ACEOF |
4928 | 1459 | \`configure' configures libticables2 1.2.0 to adapt to many kinds of systems. | 1438 | \`configure' configures libticables2 1.3.0 to adapt to many kinds of systems. |
4929 | 1460 | 1439 | ||
4930 | 1461 | Usage: $0 [OPTION]... [VAR=VALUE]... | 1440 | Usage: $0 [OPTION]... [VAR=VALUE]... |
4931 | 1462 | 1441 | ||
4932 | @@ -1526,7 +1505,7 @@ | |||
4933 | 1526 | 1505 | ||
4934 | 1527 | if test -n "$ac_init_help"; then | 1506 | if test -n "$ac_init_help"; then |
4935 | 1528 | case $ac_init_help in | 1507 | case $ac_init_help in |
4937 | 1529 | short | recursive ) echo "Configuration of libticables2 1.2.0:";; | 1508 | short | recursive ) echo "Configuration of libticables2 1.3.0:";; |
4938 | 1530 | esac | 1509 | esac |
4939 | 1531 | cat <<\_ACEOF | 1510 | cat <<\_ACEOF |
4940 | 1532 | 1511 | ||
4941 | @@ -1543,9 +1522,6 @@ | |||
4942 | 1543 | --enable-dependency-tracking do not reject slow dependency extractors | 1522 | --enable-dependency-tracking do not reject slow dependency extractors |
4943 | 1544 | --disable-libtool-lock avoid locking (might break parallel builds) | 1523 | --disable-libtool-lock avoid locking (might break parallel builds) |
4944 | 1545 | --disable-nls do not use Native Language Support | 1524 | --disable-nls do not use Native Language Support |
4945 | 1546 | --enable-threads={posix|solaris|pth|win32} | ||
4946 | 1547 | specify multithreading API | ||
4947 | 1548 | --disable-threads build without multithread safety | ||
4948 | 1549 | --disable-rpath do not hardcode runtime library paths | 1525 | --disable-rpath do not hardcode runtime library paths |
4949 | 1550 | --disable-libusb disable USB support | 1526 | --disable-libusb disable USB support |
4950 | 1551 | --enable-logging enable logging | 1527 | --enable-logging enable logging |
4951 | @@ -1558,11 +1534,8 @@ | |||
4952 | 1558 | both] | 1534 | both] |
4953 | 1559 | --with-tags[=TAGS] include additional configurations [automatic] | 1535 | --with-tags[=TAGS] include additional configurations [automatic] |
4954 | 1560 | --with-gnu-ld assume the C compiler uses GNU ld default=no | 1536 | --with-gnu-ld assume the C compiler uses GNU ld default=no |
4955 | 1561 | --with-libpth-prefix[=DIR] search for libpth in DIR/include and DIR/lib | ||
4956 | 1562 | --without-libpth-prefix don't search for libpth in includedir and libdir | ||
4957 | 1563 | --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib | 1537 | --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib |
4958 | 1564 | --without-libiconv-prefix don't search for libiconv in includedir and libdir | 1538 | --without-libiconv-prefix don't search for libiconv in includedir and libdir |
4959 | 1565 | --with-included-gettext use the GNU gettext library included here | ||
4960 | 1566 | --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib | 1539 | --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib |
4961 | 1567 | --without-libintl-prefix don't search for libintl in includedir and libdir | 1540 | --without-libintl-prefix don't search for libintl in includedir and libdir |
4962 | 1568 | 1541 | ||
4963 | @@ -1651,7 +1624,7 @@ | |||
4964 | 1651 | test -n "$ac_init_help" && exit $ac_status | 1624 | test -n "$ac_init_help" && exit $ac_status |
4965 | 1652 | if $ac_init_version; then | 1625 | if $ac_init_version; then |
4966 | 1653 | cat <<\_ACEOF | 1626 | cat <<\_ACEOF |
4968 | 1654 | libticables2 configure 1.2.0 | 1627 | libticables2 configure 1.3.0 |
4969 | 1655 | generated by GNU Autoconf 2.61 | 1628 | generated by GNU Autoconf 2.61 |
4970 | 1656 | 1629 | ||
4971 | 1657 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, | 1630 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, |
4972 | @@ -1665,7 +1638,7 @@ | |||
4973 | 1665 | This file contains any messages produced by compilers while | 1638 | This file contains any messages produced by compilers while |
4974 | 1666 | running configure, to aid debugging if configure makes a mistake. | 1639 | running configure, to aid debugging if configure makes a mistake. |
4975 | 1667 | 1640 | ||
4977 | 1668 | It was created by libticables2 $as_me 1.2.0, which was | 1641 | It was created by libticables2 $as_me 1.3.0, which was |
4978 | 1669 | generated by GNU Autoconf 2.61. Invocation command line was | 1642 | generated by GNU Autoconf 2.61. Invocation command line was |
4979 | 1670 | 1643 | ||
4980 | 1671 | $ $0 $@ | 1644 | $ $0 $@ |
4981 | @@ -2020,11 +1993,11 @@ | |||
4982 | 2020 | 1993 | ||
4983 | 2021 | 1994 | ||
4984 | 2022 | 1995 | ||
4990 | 2023 | VERSION="1.2.0" | 1996 | VERSION="1.3.0" |
4991 | 2024 | 1997 | ||
4992 | 2025 | 1998 | ||
4993 | 2026 | LT_CURRENT=1 | 1999 | LT_CURRENT=2 |
4994 | 2027 | LT_REVISION=16 | 2000 | LT_REVISION=0 |
4995 | 2028 | LT_AGE=0 | 2001 | LT_AGE=0 |
4996 | 2029 | LT_LIBVERSION="$LT_CURRENT:$LT_REVISION:$LT_AGE" | 2002 | LT_LIBVERSION="$LT_CURRENT:$LT_REVISION:$LT_AGE" |
4997 | 2030 | LT_LIBVERSION=$LT_CURRENT:$LT_REVISION:$LT_AGE | 2003 | LT_LIBVERSION=$LT_CURRENT:$LT_REVISION:$LT_AGE |
4998 | @@ -2367,7 +2340,7 @@ | |||
4999 | 2367 | 2340 | ||
5000 | 2368 | # Define the identity of the package. | 2341 | # 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.