From 28204ee9c38194d504e302d5a0f83209f0486829 Mon Sep 17 00:00:00 2001 From: Aaron Sethman Date: Tue, 27 Jan 2026 15:11:47 -0500 Subject: [PATCH 01/32] Remove the old ChangeLog files from the repo, the same info is still in git log. --- ChangeLog | 7723 ----------------------------------------------- ChangeLog.1.bz2 | Bin 46956 -> 0 bytes ChangeLog.2.bz2 | Bin 25779 -> 0 bytes 3 files changed, 7723 deletions(-) delete mode 100644 ChangeLog delete mode 100644 ChangeLog.1.bz2 delete mode 100644 ChangeLog.2.bz2 diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index ce4392ce..00000000 --- a/ChangeLog +++ /dev/null @@ -1,7723 +0,0 @@ -androsyn 2017/11/06 19:50:11 UTC (20171106_0-29447) - Log: - remove extra space - - Modified: - ircd-ratbox/trunk/modules/core/m_join.c (File Modified) - - -dubkat 2016/10/10 21:21:16 UTC (20161010_0-29445) - Log: - fixed a typo in the config - - Modified: - ircd-ratbox/trunk/doc/example.conf (File Modified) - ircd-ratbox/trunk/doc/example.efnet.conf (File Modified) - - -dubkat 2016/07/05 02:20:26 UTC (20160705_1-29441) - Log: - properties & keywords - - Modified: - ircd-ratbox/trunk/doc/ircd-ratbox.init (Property Modified) - - -dubkat 2016/07/05 02:17:01 UTC (20160705_0-29439) - Log: - ircd-ratbox sysvinit taken from SUSE Linux. - - Modified: - ircd-ratbox/trunk/doc/ircd-ratbox.init (File Added) - - -dubkat 2016/05/29 02:29:30 UTC (20160529_0-29437) - Log: - add logfile rotation script, updated doc/index.txt - - Modified: - ircd-ratbox/trunk/doc/genopercert.sh (File Modified) (Property Modified) - ircd-ratbox/trunk/doc/index.txt (File Modified) - ircd-ratbox/trunk/doc/ratbox-rotate.sh (File Added) - - -androsyn 2016/04/29 18:54:44 UTC (20160429_0-29435) - Log: - return CLIENT_EXITED when exiting a RBLBANed client - - Modified: - ircd-ratbox/trunk/src/s_user.c (File Modified) - - -dubkat 2016/04/06 18:49:01 UTC (20160406_0-29433) - Log: - Add a nice README formatted in Markdown - - Modified: - ircd-ratbox/trunk/README.md (File Added) - - -androsyn 2016/03/25 15:21:35 UTC (20160325_3-29430) - Log: - more cleanups, mostly 0 for NULL changes and a few functions declared static - - Modified: - ircd-ratbox/trunk/bandb/bantool.c (File Modified) - - -androsyn 2016/03/25 15:08:53 UTC (20160325_2-29428) - Log: - use RB_DLINK_FOREACH_SAFE when rehashing temporary resvs - - Modified: - ircd-ratbox/trunk/modules/m_rehash.c (File Modified) - - -androsyn 2016/03/25 14:57:40 UTC (20160325_1-29426) - Log: - chasing variable was effectively unused on ms_kill, remove it - - Modified: - ircd-ratbox/trunk/modules/core/m_kill.c (File Modified) - - -androsyn 2016/03/25 14:56:18 UTC (20160325_0-29424) - Log: - use saved_errno for the no more connections left for listener message - - Modified: - ircd-ratbox/trunk/src/listener.c (File Modified) - - -androsyn 2016/03/23 17:37:26 UTC (20160323_11-29418) - Log: - fix hash stats to include empty tables - - Modified: - ircd-ratbox/trunk/src/hash.c (File Modified) - - -androsyn 2016/03/23 17:26:12 UTC (20160323_10-29416) - Log: - add a second set of () - - Modified: - ircd-ratbox/trunk/modules/m_set.c (File Modified) - - -androsyn 2016/03/23 17:18:58 UTC (20160323_9-29414) - Log: - do not call assign_dns_id twice - - Modified: - ircd-ratbox/trunk/src/dns.c (File Modified) - - -androsyn 2016/03/23 17:10:15 UTC (20160323_8-29412) - Log: - no need for para to be statically allocated in parse() i don't think - - Modified: - ircd-ratbox/trunk/src/parse.c (File Modified) - - -androsyn 2016/03/23 17:07:58 UTC (20160323_7-29410) - Log: - rebuild ircd_lexer.c - - Modified: - ircd-ratbox/trunk/src/ircd_lexer.c (File Modified) - - -androsyn 2016/03/23 16:28:13 UTC (20160323_6-29408) - Log: - make tgchange_ev static - - Modified: - ircd-ratbox/trunk/modules/core/m_message.c (File Modified) - - -androsyn 2016/03/23 16:25:50 UTC (20160323_5-29404) - Log: - use NULL instead of 0 - - Modified: - ircd-ratbox/trunk/resolver/res.c (File Modified) - - -androsyn 2016/03/23 16:25:17 UTC (20160323_4-29402) - Log: - use NULL instead of 0 - - Modified: - ircd-ratbox/trunk/src/listener.c (File Modified) - - -androsyn 2016/03/23 16:15:37 UTC (20160323_3-29400) - Log: - handle hash_create failing - - Modified: - ircd-ratbox/trunk/modules/m_set.c (File Modified) - - -androsyn 2016/03/23 16:14:45 UTC (20160323_2-29398) - Log: - have the set code use the hash.c code for its sub command parser - - Modified: - ircd-ratbox/trunk/modules/m_set.c (File Modified) - - -androsyn 2016/03/23 16:14:22 UTC (20160323_1-29396) - Log: - remove old commented out code - - Modified: - ircd-ratbox/trunk/src/hash.c (File Modified) - - -androsyn 2016/03/23 16:12:18 UTC (20160323_0-29394) - Log: - free the hash structures in hash_destroyall - - Modified: - ircd-ratbox/trunk/src/hash.c (File Modified) - - -androsyn 2016/03/22 19:39:40 UTC (20160322_22-29392) - Log: - more 0 to NULL conversions - - Modified: - ircd-ratbox/trunk/modules/m_links.c (File Modified) - ircd-ratbox/trunk/modules/m_oper.c (File Modified) - - -androsyn 2016/03/22 19:33:39 UTC (20160322_21-29390) - Log: - dereference p when checking for an EmptyString - - Modified: - ircd-ratbox/trunk/modules/m_cap.c (File Modified) - - -androsyn 2016/03/22 19:28:17 UTC (20160322_20-29388) - Log: - more 0 to NULL conversions - - Modified: - ircd-ratbox/trunk/src/s_serv.c (File Modified) - - -androsyn 2016/03/22 19:27:28 UTC (20160322_19-29386) - Log: - more () to (void) conversions on functions - - Modified: - ircd-ratbox/trunk/src/s_conf.c (File Modified) - - -androsyn 2016/03/22 19:26:53 UTC (20160322_18-29384) - Log: - use NULL instead of 0 - - Modified: - ircd-ratbox/trunk/src/newconf.c (File Modified) - - -androsyn 2016/03/22 19:26:34 UTC (20160322_17-29382) - Log: - remove extern char conffilebuf from ircd_lexer.l and put it in newconf.h - - Modified: - ircd-ratbox/trunk/include/newconf.h (File Modified) - ircd-ratbox/trunk/src/ircd_lexer.l (File Modified) - - -androsyn 2016/03/22 19:24:29 UTC (20160322_16-29380) - Log: - use NULL instead of 0 - - Modified: - ircd-ratbox/trunk/src/client.c (File Modified) - - -androsyn 2016/03/22 19:24:11 UTC (20160322_15-29378) - Log: - fix function declarations - - Modified: - ircd-ratbox/trunk/src/class.c (File Modified) - - -androsyn 2016/03/22 19:23:57 UTC (20160322_14-29376) - Log: - more 0 = NULL conversions - - Modified: - ircd-ratbox/trunk/src/ircd_signal.c (File Modified) - - -androsyn 2016/03/22 19:14:21 UTC (20160322_13-29374) - Log: - use NULL instead of 0 as a pointer - - Modified: - ircd-ratbox/trunk/src/version.c.SH (File Modified) - - -androsyn 2016/03/22 19:13:04 UTC (20160322_12-29372) - Log: - make exit_aborted_clients static to match the previous static forward declaration - - Modified: - ircd-ratbox/trunk/src/client.c (File Modified) - - -androsyn 2016/03/22 19:12:14 UTC (20160322_11-29370) - Log: - use NULL, not 0 for localClient->listener - - Modified: - ircd-ratbox/trunk/src/client.c (File Modified) - - -androsyn 2016/03/22 19:03:20 UTC (20160322_10-29366) - Log: - use NULL instead of 0 to pass to close_conn - - Modified: - ircd-ratbox/trunk/ssld/ssld.c (File Modified) - - -androsyn 2016/03/22 19:01:06 UTC (20160322_9-29364) - Log: - use NULL instead of 0 for the third sigaction argument - - Modified: - ircd-ratbox/trunk/resolver/resolver.c (File Modified) - - -androsyn 2016/03/22 19:00:35 UTC (20160322_8-29362) - Log: - use normal ansi style declaration for setup_signals - - Modified: - ircd-ratbox/trunk/resolver/resolver.c (File Modified) - - -androsyn 2016/03/22 18:55:14 UTC (20160322_7-29360) - Log: - move extern variables to res.h - - Modified: - ircd-ratbox/trunk/resolver/res.c (File Modified) - ircd-ratbox/trunk/resolver/res.h (File Modified) - - -androsyn 2016/03/22 18:53:11 UTC (20160322_6-29358) - Log: - use normal ansi style declaration for setup_signals - - Modified: - ircd-ratbox/trunk/ssld/ssld.c (File Modified) - - -androsyn 2016/03/22 18:52:56 UTC (20160322_5-29356) - Log: - use NULL instead of 0 for the third sigaction argument - - Modified: - ircd-ratbox/trunk/ssld/ssld.c (File Modified) - - -androsyn 2016/03/22 18:52:04 UTC (20160322_4-29354) - Log: - use NULL instead of 0 for the third sigaction argument - - Modified: - ircd-ratbox/trunk/bandb/bandb.c (File Modified) - - -androsyn 2016/03/22 18:51:08 UTC (20160322_3-29352) - Log: - use normal ansi style declaration for setup_signals - - Modified: - ircd-ratbox/trunk/bandb/bandb.c (File Modified) - - -androsyn 2016/03/22 18:49:26 UTC (20160322_2-29350) - Log: - make rbl_check_rbls static - - Modified: - ircd-ratbox/trunk/src/s_auth.c (File Modified) - - -androsyn 2016/03/22 18:49:14 UTC (20160322_1-29348) - Log: - use NULL instead of 0 to init pointer - - Modified: - ircd-ratbox/trunk/src/s_auth.c (File Modified) - - -androsyn 2016/03/22 18:47:29 UTC (20160322_0-29346) - Log: - use NULL instead of 0 to initialize pointers - - Modified: - ircd-ratbox/trunk/src/parse.c (File Modified) - - -androsyn 2016/03/20 20:44:20 UTC (20160320_0-29344) - Log: - return after calling free_ssl_daemon() - - Ported from charbydis - - - - Modified: - ircd-ratbox/trunk/src/sslproc.c (File Modified) - - -androsyn 2016/02/18 17:21:27 UTC (20160218_1-29339) - Log: - remove IO Debugging hooks from autoconf output, it doesn't exist anymore - - Modified: - ircd-ratbox/trunk/configure (File Modified) - ircd-ratbox/trunk/configure.ac (File Modified) - - -androsyn 2016/02/18 17:14:09 UTC (20160218_0-29337) - Log: - remove stamp-h1 - - Modified: - ircd-ratbox/trunk/libltdl/stamp-h1 (File Deleted) - - -androsyn 2016/02/13 02:43:53 UTC (20160213_0-29335) - Log: - Port the following changes from the previous trunk.. - - +jilles 2009/01/09 19:22:08 UTC (20090109_4-26387) - + Log: - + Use mask_match() to check bans from local clients for redundancy. - + This fixes the problem that bans like *!?@* - + prevent any ban starting with *!*@ being set. - + - + - + Modified: - + ircd-ratbox/trunk/modules/core/m_mode.c (File Modified) - + - + - +jilles 2009/01/09 19:21:17 UTC (20090109_3-26385) - + Log: - + Add mask_match(), like ircu mmatch(). - + This compares two masks and returns whether the "new" is - + more specific than or equal to the "old". The difference - + with match() is that a '?' in "old" does not match a '*' in - + "new". - + The idea is as in charybdis, but this is a modified - + version of ratbox's match(), not of charybdis's ircu-like - + match(). - + - + - + Modified: - + ircd-ratbox/trunk/include/match.h (File Modified) - + ircd-ratbox/trunk/src/match.c (File Modified) - + - - - - Modified: - ircd-ratbox/trunk/include/match.h (File Modified) - ircd-ratbox/trunk/modules/core/m_mode.c (File Modified) - ircd-ratbox/trunk/src/match.c (File Modified) - - -androsyn 2016/01/20 19:16:32 UTC (20160120_0-29333) - Log: - fix RPL_STATSLINKINFO's format string, it was missing a space - - Modified: - ircd-ratbox/trunk/include/numeric.h (File Modified) - - -androsyn 2016/01/19 16:57:17 UTC (20160119_0-29331) - Log: - remove debug code - - Modified: - ircd-ratbox/trunk/modules/m_list.c (File Modified) - - -androsyn 2016/01/14 19:03:30 UTC (20160114_2-29327) - Log: - oops..make that min - - Modified: - ircd-ratbox/trunk/modules/m_list.c (File Modified) - - -androsyn 2016/01/14 17:38:03 UTC (20160114_1-29325) - Log: - move the hash_create for whowas to whowas.c - - Modified: - ircd-ratbox/trunk/include/hash.h (File Modified) - ircd-ratbox/trunk/src/hash.c (File Modified) - ircd-ratbox/trunk/src/whowas.c (File Modified) - - -androsyn 2016/01/14 16:48:38 UTC (20160114_0-29323) - Log: - The hash code gets some more changes. There is now a hash_create function that allows for new hash creation, as named. Ideally the initializataion of hashes will get moved towards their owner modules, but for now, we just fake it a bit with macros... - - - Modified: - ircd-ratbox/trunk/include/hash.h (File Modified) - ircd-ratbox/trunk/modules/m_help.c (File Modified) - ircd-ratbox/trunk/src/hash.c (File Modified) - - -androsyn 2016/01/13 20:58:59 UTC (20160113_4-29321) - Log: - remove debug code - - Modified: - ircd-ratbox/trunk/src/hash.c (File Modified) - - -androsyn 2016/01/13 20:57:54 UTC (20160113_3-29319) - Log: - fix some variable shadowing - - Modified: - ircd-ratbox/trunk/src/hash.c (File Modified) - - -androsyn 2016/01/13 20:55:29 UTC (20160113_2-29317) - Log: - Have the hash tables be pointers to rb_dlink_lists, instead of directly allocated in BSS. Each bucket now needs to have a malloc done, but we end up saving a bit of memory as most buckets are typically empty - - - Modified: - ircd-ratbox/trunk/src/hash.c (File Modified) - - -androsyn 2016/01/13 16:42:26 UTC (20160113_1-29285) - Log: - just use rb_free here - - Modified: - ircd-ratbox/trunk/src/s_conf.c (File Modified) - - -androsyn 2016/01/13 15:36:52 UTC (20160113_0-29283) - Log: - clear out ssl related settings on rehash - - Modified: - ircd-ratbox/trunk/src/s_conf.c (File Modified) - - -androsyn 2016/01/12 17:14:06 UTC (20160112_1-29279) - Log: - remove prebuilt static_modules.c to keep someone quiet :P - - Modified: - ircd-ratbox/trunk/modules/static_modules.c (File Deleted) - - -androsyn 2016/01/12 17:06:12 UTC (20160112_0-29277) - Log: - make that BUILT_SOURCES not BUILT_SOURCE - - Modified: - ircd-ratbox/trunk/modules/Makefile.am (File Modified) - ircd-ratbox/trunk/modules/Makefile.in (File Modified) - - -androsyn 2016/01/08 18:16:31 UTC (20160108_1-29275) - Log: - do flexible array members the C99 way - - Modified: - ircd-ratbox/trunk/src/operhash.c (File Modified) - - -androsyn 2016/01/08 18:03:16 UTC (20160108_0-29273) - Log: - use a flexible array memory for operhash - - Modified: - ircd-ratbox/trunk/src/operhash.c (File Modified) - - -androsyn 2015/12/26 03:58:25 UTC (20151226_0-29269) - Log: - change the scope of a few rb_dlink_nodes, no functional change - - Modified: - ircd-ratbox/trunk/src/send.c (File Modified) - - -androsyn 2015/12/18 18:00:59 UTC (20151218_5-29259) - Log: - check plain_fd for setting RB_FD_SOCKET, ported from charbydis - - Modified: - ircd-ratbox/trunk/ssld/ssld.c (File Modified) - - -androsyn 2015/12/18 17:46:48 UTC (20151218_4-29257) - Log: - port cidr mask validation changes from charybdis - - Modified: - ircd-ratbox/trunk/src/match.c (File Modified) - - -androsyn 2015/12/18 13:26:04 UTC (20151218_3-29243) - Log: - simplify scache a bit... - - Modified: - ircd-ratbox/trunk/src/scache.c (File Modified) - - -androsyn 2015/12/18 00:58:31 UTC (20151218_2-29241) - Log: - whitespace/style cleanup - - Modified: - ircd-ratbox/trunk/src/whowas.c (File Modified) - - -androsyn 2015/12/18 00:48:00 UTC (20151218_1-29239) - Log: - more whitespace/style cleanups - - Modified: - ircd-ratbox/trunk/src/sslproc.c (File Modified) - - -androsyn 2015/12/18 00:44:00 UTC (20151218_0-29237) - Log: - whitespace cleanup - - Modified: - ircd-ratbox/trunk/ssld/ssld.c (File Modified) - - -androsyn 2015/12/13 00:12:21 UTC (20151213_0-29231) - Log: - run the cleanup_dead_ssld's event a little more frequently - - Modified: - ircd-ratbox/trunk/src/sslproc.c (File Modified) - - -androsyn 2015/12/11 18:43:45 UTC (20151211_0-29229) - Log: - make services.c compile again - - Modified: - ircd-ratbox/trunk/src/services.c (File Modified) - - -androsyn 2015/12/10 20:31:20 UTC (20151210_0-29225) - Log: - indent/whitespace cleanup, no code changes - - Modified: - ircd-ratbox/trunk/src/hash.c (File Modified) - - -androsyn 2015/12/09 21:01:44 UTC (20151209_5-29211) - Log: - update documentation on certfp somewhat, i'm a terrible documentation writer... - - Modified: - ircd-ratbox/trunk/doc/example.conf (File Modified) - ircd-ratbox/trunk/doc/whats-new-3.1.txt (File Modified) - - -androsyn 2015/12/09 20:45:06 UTC (20151209_4-29209) - Log: - only enforce nicklen minimums on local clients - - Modified: - ircd-ratbox/trunk/modules/core/m_nick.c (File Modified) - - -androsyn 2015/12/09 20:41:13 UTC (20151209_3-29207) - Log: - Add nicklen_min parameter to allow setting the minimum nicklen we require - - - Modified: - ircd-ratbox/trunk/doc/example.conf (File Modified) - ircd-ratbox/trunk/include/s_conf.h (File Modified) - ircd-ratbox/trunk/modules/core/m_nick.c (File Modified) - ircd-ratbox/trunk/src/newconf.c (File Modified) - - -androsyn 2015/12/09 18:43:49 UTC (20151209_2-29201) - Log: - free ohash->name if we are freeing ohash - - Modified: - ircd-ratbox/trunk/src/operhash.c (File Modified) - - -androsyn 2015/12/09 18:22:43 UTC (20151209_1-29199) - Log: - free zlib_stream_t with the rest of the conn_t - - Modified: - ircd-ratbox/trunk/ssld/ssld.c (File Modified) - - -androsyn 2015/12/09 18:01:37 UTC (20151209_0-29195) - Log: - call rb_setselect to handle res_readreply rather than calling it directly to avoid a minor race condition - - Modified: - ircd-ratbox/trunk/resolver/res.c (File Modified) - - -androsyn 2015/12/05 10:27:43 UTC (20151205_0-29193) - Log: - swap generation and creation around - - Modified: - ircd-ratbox/trunk/modules/m_info.c (File Modified) - - -androsyn 2015/12/04 20:26:49 UTC (20151204_1-29189) - Log: - don't call remove_dline twice - - Modified: - ircd-ratbox/trunk/src/reject.c (File Modified) - - -androsyn 2015/12/04 19:19:12 UTC (20151204_0-29179) - Log: - use the listener->ssl variable to set defer_accept for rb_listen - - Modified: - ircd-ratbox/trunk/src/listener.c (File Modified) - - -androsyn 2015/12/03 02:51:55 UTC (20151203_0-29167) - Log: - rearrange struct server_conf to improve alignment - - Modified: - ircd-ratbox/trunk/include/s_newconf.h (File Modified) - - -androsyn 2015/12/02 21:07:00 UTC (20151202_10-29163) - Log: - don't add hub/leaf masks to the hubleaf list until after the connect block is ended. Also cleanup remote_confs correctly - - Modified: - ircd-ratbox/trunk/src/newconf.c (File Modified) - - -androsyn 2015/12/02 20:36:42 UTC (20151202_9-29161) - Log: - add remove_exempts to reject.h - - Modified: - ircd-ratbox/trunk/include/reject.h (File Modified) - - -androsyn 2015/12/02 20:25:14 UTC (20151202_8-29159) - Log: - - Clear out old E lines(aka exempts) correctly before rehash - - RB_PATRICIA_WALK is not safe for removal, work around this... - - - - - Modified: - ircd-ratbox/trunk/src/reject.c (File Modified) - ircd-ratbox/trunk/src/s_conf.c (File Modified) - - -androsyn 2015/12/02 19:17:03 UTC (20151202_7-29157) - Log: - in conf_set_generic_value_cb, if the pointer to the memory location is != NULL free the location - - Modified: - ircd-ratbox/trunk/src/newconf.c (File Modified) - - -androsyn 2015/12/02 19:16:22 UTC (20151202_6-29155) - Log: - move the memset of ServerInfo etc to before set_default_conf otherwise we end up clobbering what we just did... - - Modified: - ircd-ratbox/trunk/src/ircd.c (File Modified) - - -androsyn 2015/12/02 18:58:28 UTC (20151202_5-29153) - Log: - set motd_path == NULL in clear_out_old_conf - - Modified: - ircd-ratbox/trunk/src/s_conf.c (File Modified) - - -androsyn 2015/12/02 18:55:45 UTC (20151202_4-29151) - Log: - free memory for conf->subname - - Modified: - ircd-ratbox/trunk/src/newconf.c (File Modified) - - -androsyn 2015/12/02 18:25:49 UTC (20151202_3-29145) - Log: - remove fprintfs - - Modified: - ircd-ratbox/trunk/src/newconf.c (File Modified) - - -androsyn 2015/12/02 17:53:58 UTC (20151202_2-29143) - Log: - - Fix memory leak in rbl rehash code - - Fix error related to using rb_dlinkDestroy on a rb_dlink_node allocated as part of a struct. Amazingly this code didn't blow up - as it was doing an rb_free on the node, which happened to be at the top of the struct, thus free() wasn't complaining as we weren't - trying to free this rbl list elsewhere.... - - - - Modified: - ircd-ratbox/trunk/src/newconf.c (File Modified) - ircd-ratbox/trunk/src/s_auth.c (File Modified) - - -androsyn 2015/12/02 17:16:35 UTC (20151202_1-29141) - Log: - don't leak a struct module on modunload - - Modified: - ircd-ratbox/trunk/src/modules.c (File Modified) - - -androsyn 2015/12/02 17:02:05 UTC (20151202_0-29139) - Log: - eliminate more memory leaks on rehash - - Modified: - ircd-ratbox/trunk/src/newconf.c (File Modified) - - -androsyn 2015/12/01 20:32:10 UTC (20151201_1-29137) - Log: - eliminate some memory leaks on rehash - - Modified: - ircd-ratbox/trunk/src/ircd_parser.c (File Modified) - ircd-ratbox/trunk/src/ircd_parser.h (File Modified) - ircd-ratbox/trunk/src/ircd_parser.y (File Modified) - ircd-ratbox/trunk/src/newconf.c (File Modified) - - -androsyn 2015/12/01 18:12:23 UTC (20151201_0-29135) - Log: - Do whowas a little differently. Each nickname in the hash table gets added via a linked list off of a struct whowas_node. This eliminates the whowas hash table getting quite deep with multiples of the same nick - - - Modified: - ircd-ratbox/trunk/include/whowas.h (File Modified) - ircd-ratbox/trunk/modules/m_whowas.c (File Modified) - ircd-ratbox/trunk/src/whowas.c (File Modified) - - -androsyn 2015/11/25 05:21:12 UTC (20151125_0-29133) - Log: - just allocate a READBUF_SIZE'd buffer - - Modified: - ircd-ratbox/trunk/src/sslproc.c (File Modified) - - -androsyn 2015/11/23 14:57:08 UTC (20151123_5-29131) - Log: - return invalid certificate if certfp does not match - - Modified: - ircd-ratbox/trunk/modules/core/m_server.c (File Modified) - - -androsyn 2015/11/23 04:49:30 UTC (20151123_4-29129) - Log: - make buffer, para and sender local to the functions that use them, i'm still not sure if the static could be discarded though... - - Modified: - ircd-ratbox/trunk/src/parse.c (File Modified) - - -androsyn 2015/11/23 02:49:58 UTC (20151123_3-29127) - Log: - move get_or_create_channel to modules/core/m_join.c, remove allocate_channel/free_channel and just use rb_malloc/rb_free for chptr/chptr->chname - - Modified: - ircd-ratbox/trunk/include/channel.h (File Modified) - ircd-ratbox/trunk/modules/core/m_join.c (File Modified) - ircd-ratbox/trunk/src/channel.c (File Modified) - - -androsyn 2015/11/23 02:15:05 UTC (20151123_2-29125) - Log: - use == NULL instead of ! to check for null pointers - - Modified: - ircd-ratbox/trunk/src/parse.c (File Modified) - - -androsyn 2015/11/23 01:45:47 UTC (20151123_1-29123) - Log: - use size_t to restore the return value from strlen() - - Modified: - ircd-ratbox/trunk/src/modules.c (File Modified) - - -androsyn 2015/11/23 01:42:27 UTC (20151123_0-29121) - Log: - cast size parameter to rb_socklen_t for rb_inet_ntop_sock - - Modified: - ircd-ratbox/trunk/src/ipv4_from_ipv6.c (File Modified) - - -androsyn 2015/11/19 04:00:12 UTC (20151119_6-29113) - Log: - rework hash_do_cmp a little - - Modified: - ircd-ratbox/trunk/src/hash.c (File Modified) - - -androsyn 2015/11/19 02:50:53 UTC (20151119_5-29111) - Log: - Remove string_to_array, replace with rb_string_to_array. - - One point of note, rb_string_to_array does not skip para[0], so we deal with that where approriate. - - - Modified: - ircd-ratbox/trunk/include/parse.h (File Modified) - ircd-ratbox/trunk/src/dns.c (File Modified) - ircd-ratbox/trunk/src/parse.c (File Modified) - ircd-ratbox/trunk/src/services.c (File Modified) - - -androsyn 2015/11/19 01:59:33 UTC (20151119_4-29109) - Log: - move various defines for hash.c into hash.c from hash.h - - Modified: - ircd-ratbox/trunk/include/hash.h (File Modified) - ircd-ratbox/trunk/modules/m_stats.c (File Modified) - - -androsyn 2015/11/19 01:59:22 UTC (20151119_3-29107) - Log: - move various defines for hash.c into hash.c from hash.h - - Modified: - ircd-ratbox/trunk/src/hash.c (File Modified) - - -androsyn 2015/11/19 01:57:16 UTC (20151119_2-29105) - Log: - do the cast too - - Modified: - ircd-ratbox/trunk/src/operhash.c (File Modified) - - -androsyn 2015/11/19 01:56:43 UTC (20151119_1-29103) - Log: - use hash_find_data in operhash_add - - Modified: - ircd-ratbox/trunk/src/operhash.c (File Modified) - - -androsyn 2015/11/19 01:43:30 UTC (20151119_0-29101) - Log: - move command hash into the hash.c code as well - - Modified: - ircd-ratbox/trunk/include/hash.h (File Modified) - ircd-ratbox/trunk/include/parse.h (File Modified) - ircd-ratbox/trunk/include/services.h (File Modified) - ircd-ratbox/trunk/modules/m_stats.c (File Modified) - ircd-ratbox/trunk/src/hash.c (File Modified) - ircd-ratbox/trunk/src/ircd.c (File Modified) - ircd-ratbox/trunk/src/parse.c (File Modified) - - -androsyn 2015/11/18 15:14:19 UTC (20151118_0-29099) - Log: - add connect certfp support - - Modified: - ircd-ratbox/trunk/modules/core/m_server.c (File Modified) - ircd-ratbox/trunk/src/newconf.c (File Modified) - - -androsyn 2015/11/17 20:19:37 UTC (20151117_4-29097) - Log: - have the hash stats code use unsigned long throughout - - Modified: - ircd-ratbox/trunk/src/hash.c (File Modified) - - -androsyn 2015/11/17 19:30:33 UTC (20151117_3-29093) - Log: - really fix the jemalloc/tcmalloc crap - - Modified: - ircd-ratbox/trunk/configure (File Modified) - ircd-ratbox/trunk/configure.ac (File Modified) - - -androsyn 2015/11/17 19:28:16 UTC (20151117_2-29091) - Log: - fix jemalloc/tcmalloc checks - - Modified: - ircd-ratbox/trunk/configure (File Modified) - ircd-ratbox/trunk/configure.ac (File Modified) - ircd-ratbox/trunk/src/Makefile.in (File Modified) - - -androsyn 2015/11/17 18:51:40 UTC (20151117_1-29083) - Log: - add support for building against either jemalloc or tcmalloc - - Modified: - ircd-ratbox/trunk/INSTALL (File Modified) - ircd-ratbox/trunk/Makefile.am (File Modified) - ircd-ratbox/trunk/Makefile.in (File Modified) - ircd-ratbox/trunk/bandb/Makefile.in (File Modified) - ircd-ratbox/trunk/bandb/sqlite3/Makefile.in (File Modified) - ircd-ratbox/trunk/configure (File Modified) - ircd-ratbox/trunk/configure.ac (File Modified) - ircd-ratbox/trunk/contrib/Makefile.in (File Modified) - ircd-ratbox/trunk/help/Makefile.in (File Modified) - ircd-ratbox/trunk/include/setup.h.in (File Modified) - ircd-ratbox/trunk/modules/Makefile.in (File Modified) - ircd-ratbox/trunk/resolver/Makefile.in (File Modified) - ircd-ratbox/trunk/src/Makefile.am (File Modified) - ircd-ratbox/trunk/src/Makefile.in (File Modified) - ircd-ratbox/trunk/ssld/Makefile.in (File Modified) - ircd-ratbox/trunk/tools/Makefile.in (File Modified) - - -androsyn 2015/11/17 18:01:13 UTC (20151117_0-29081) - Log: - don't redefine the typedef for hash_node - - Modified: - ircd-ratbox/trunk/include/hash.h (File Modified) - - -androsyn 2015/11/11 05:57:06 UTC (20151111_1-29077) - Log: - tweak cc_accepts_flags a litle - - Modified: - ircd-ratbox/trunk/configure (File Modified) - ircd-ratbox/trunk/configure.ac (File Modified) - - -androsyn 2015/11/11 05:48:40 UTC (20151111_0-29075) - Log: - Oh why...do I even need to think about having to use this gcc flag: -fno-delete-null-pointer-checks? Seriously? - - Modified: - ircd-ratbox/trunk/configure (File Modified) - ircd-ratbox/trunk/configure.ac (File Modified) - - -androsyn 2015/11/10 02:41:35 UTC (20151110_7-29061) - Log: - whitespace cleanups - - Modified: - ircd-ratbox/trunk/src/whowas.c (File Modified) - - -androsyn 2015/11/10 02:39:12 UTC (20151110_6-29059) - Log: - move the channel RESV related code out of hash.c into s_newconf.c with the rest of the resv code - - Modified: - ircd-ratbox/trunk/include/hash.h (File Modified) - ircd-ratbox/trunk/include/s_newconf.h (File Modified) - ircd-ratbox/trunk/src/hash.c (File Modified) - ircd-ratbox/trunk/src/s_newconf.c (File Modified) - - -androsyn 2015/11/10 02:26:00 UTC (20151110_5-29057) - Log: - Move the fnv_ hash functions to be local to hash.c - - - Modified: - ircd-ratbox/trunk/include/hash.h (File Modified) - ircd-ratbox/trunk/src/hash.c (File Modified) - - -androsyn 2015/11/10 02:19:14 UTC (20151110_4-29055) - Log: - make monitor use the hash interface too - - Modified: - ircd-ratbox/trunk/include/hash.h (File Modified) - ircd-ratbox/trunk/include/monitor.h (File Modified) - ircd-ratbox/trunk/src/hash.c (File Modified) - ircd-ratbox/trunk/src/monitor.c (File Modified) - - -androsyn 2015/11/10 01:40:04 UTC (20151110_3-29053) - Log: - scache allocations now reflect reality(includes the size of the hash table in the scache memory counts too - - Modified: - ircd-ratbox/trunk/src/scache.c (File Modified) - - -androsyn 2015/11/10 01:21:48 UTC (20151110_2-29051) - Log: - use SCACHE_MAX values for scache - - Modified: - ircd-ratbox/trunk/src/hash.c (File Modified) - - -androsyn 2015/11/10 01:12:01 UTC (20151110_1-29049) - Log: - get rid of redundant test code - - Modified: - ircd-ratbox/trunk/src/operhash.c (File Modified) - - -androsyn 2015/11/10 01:07:05 UTC (20151110_0-29047) - Log: - make operhash and whowas hash report something resembling valid memory stats. extend the hash interface to help with this as well - - Modified: - ircd-ratbox/trunk/src/hash.c (File Modified) - ircd-ratbox/trunk/src/operhash.c (File Modified) - ircd-ratbox/trunk/src/whowas.c (File Modified) - - -androsyn 2015/11/09 22:08:51 UTC (20151109_22-29045) - Log: - no really those +1s are meant to be there - - Modified: - ircd-ratbox/trunk/src/hash.c (File Modified) - - -androsyn 2015/11/09 21:49:16 UTC (20151109_21-29043) - Log: - correct hash stats - - Modified: - ircd-ratbox/trunk/src/hash.c (File Modified) - - -androsyn 2015/11/09 21:22:26 UTC (20151109_20-29041) - Log: - add hash_get_memusage and modify the sizes of OPERHASH_MAX a little - - Modified: - ircd-ratbox/trunk/include/hash.h (File Modified) - - -androsyn 2015/11/09 21:21:52 UTC (20151109_19-29039) - Log: - fix operhash again - - Modified: - ircd-ratbox/trunk/src/hash.c (File Modified) - ircd-ratbox/trunk/src/operhash.c (File Modified) - - -androsyn 2015/11/09 20:56:17 UTC (20151109_18-29037) - Log: - allocate the operhash nick with the operhash_entry - - Modified: - ircd-ratbox/trunk/src/operhash.c (File Modified) - - -androsyn 2015/11/09 20:27:13 UTC (20151109_17-29035) - Log: - call whowas_trim if we're over 100 past the configured whowas length as well - - Modified: - ircd-ratbox/trunk/src/whowas.c (File Modified) - - -androsyn 2015/11/09 20:26:45 UTC (20151109_16-29033) - Log: - increase the size of the whowas hash table - - Modified: - ircd-ratbox/trunk/include/hash.h (File Modified) - - -androsyn 2015/11/09 19:28:23 UTC (20151109_15-29031) - Log: - remove comments - - Modified: - ircd-ratbox/trunk/src/whowas.c (File Modified) - - -androsyn 2015/11/09 19:23:46 UTC (20151109_14-29029) - Log: - make whowas use the new hash code as well - - Modified: - ircd-ratbox/trunk/include/hash.h (File Modified) - ircd-ratbox/trunk/include/whowas.h (File Modified) - ircd-ratbox/trunk/modules/m_whowas.c (File Modified) - ircd-ratbox/trunk/src/hash.c (File Modified) - ircd-ratbox/trunk/src/whowas.c (File Modified) - - -androsyn 2015/11/09 16:51:08 UTC (20151109_13-29027) - Log: - have hash_add return the hash_node - - Modified: - ircd-ratbox/trunk/include/hash.h (File Modified) - ircd-ratbox/trunk/src/hash.c (File Modified) - - -androsyn 2015/11/09 16:15:36 UTC (20151109_12-29025) - Log: - update example.conf with the whowas_length change - - Modified: - ircd-ratbox/trunk/doc/example.conf (File Modified) - - -androsyn 2015/11/09 16:01:55 UTC (20151109_11-29023) - Log: - check EmptyString for the hash_ functions that accept strings. Add hash_do_cmp so we can get the default case mostly inlined - - Modified: - ircd-ratbox/trunk/src/hash.c (File Modified) - - -androsyn 2015/11/09 16:00:40 UTC (20151109_10-29021) - Log: - rework whowas_trim a little - - Modified: - ircd-ratbox/trunk/src/whowas.c (File Modified) - - -androsyn 2015/11/09 15:46:07 UTC (20151109_9-29019) - Log: - move whowas_length to general{} - - Modified: - ircd-ratbox/trunk/include/s_conf.h (File Modified) - ircd-ratbox/trunk/src/newconf.c (File Modified) - ircd-ratbox/trunk/src/s_conf.c (File Modified) - - -androsyn 2015/11/09 13:53:54 UTC (20151109_8-29017) - Log: - allow the whowas history length to be exceeded until the whowas trim event gets run, this gets the whowas trimming out of a busy code path - - Modified: - ircd-ratbox/trunk/src/whowas.c (File Modified) - - -androsyn 2015/11/09 03:19:36 UTC (20151109_7-29015) - Log: - get this del_from_cli_connid_hash gone too - - Modified: - ircd-ratbox/trunk/src/client.c (File Modified) - - -androsyn 2015/11/09 03:15:05 UTC (20151109_6-29013) - Log: - make the connection id hashes use the new interfaces as well - - Modified: - ircd-ratbox/trunk/include/hash.h (File Modified) - ircd-ratbox/trunk/src/client.c (File Modified) - ircd-ratbox/trunk/src/hash.c (File Modified) - ircd-ratbox/trunk/src/sslproc.c (File Modified) - - -androsyn 2015/11/09 03:04:14 UTC (20151109_5-29011) - Log: - move struct Channel returning functions to channel.c from hash.c - - Modified: - ircd-ratbox/trunk/include/channel.h (File Modified) - ircd-ratbox/trunk/include/hash.h (File Modified) - ircd-ratbox/trunk/src/channel.c (File Modified) - ircd-ratbox/trunk/src/hash.c (File Modified) - - -androsyn 2015/11/09 03:00:55 UTC (20151109_4-29009) - Log: - hash table cleanups for the find_hostname related code - - Modified: - ircd-ratbox/trunk/include/hash.h (File Modified) - ircd-ratbox/trunk/modules/m_ison.c (File Modified) - ircd-ratbox/trunk/src/hash.c (File Modified) - ircd-ratbox/trunk/src/s_conf.c (File Modified) - - -androsyn 2015/11/09 02:37:43 UTC (20151109_3-29007) - Log: - use rb_free instead of rb_free_rb_dlink_node - - Modified: - ircd-ratbox/trunk/src/modules.c (File Modified) - ircd-ratbox/trunk/src/monitor.c (File Modified) - - -androsyn 2015/11/09 02:25:35 UTC (20151109_2-29005) - Log: - move struct Client * returning functions to client.c from hash.c, otherwise slight cleanups - - Modified: - ircd-ratbox/trunk/include/client.h (File Modified) - ircd-ratbox/trunk/include/hash.h (File Modified) - ircd-ratbox/trunk/src/client.c (File Modified) - ircd-ratbox/trunk/src/hash.c (File Modified) - - -androsyn 2015/11/09 02:22:52 UTC (20151109_1-29003) - Log: - use rb_free on the rb_dlink_node - - Modified: - ircd-ratbox/trunk/src/cache.c (File Modified) - - -androsyn 2015/11/09 01:27:14 UTC (20151109_0-28999) - Log: - add two missing )'s - - - Modified: - ircd-ratbox/trunk/modules/core/m_nick.c (File Modified) - - -androsyn 2015/11/07 03:23:05 UTC (20151107_7-28997) - Log: - nick delay cleanups - - Modified: - ircd-ratbox/trunk/include/hash.h (File Modified) - ircd-ratbox/trunk/include/s_newconf.h (File Modified) - ircd-ratbox/trunk/modules/core/m_nick.c (File Modified) - ircd-ratbox/trunk/src/hash.c (File Modified) - ircd-ratbox/trunk/src/s_newconf.c (File Modified) - - -androsyn 2015/11/07 02:48:45 UTC (20151107_6-28995) - Log: - more of the hash related work, rename the functions to hash_* - add hash_destroyall as well - - Modified: - ircd-ratbox/trunk/include/cache.h (File Modified) - ircd-ratbox/trunk/include/hash.h (File Modified) - ircd-ratbox/trunk/modules/core/m_nick.c (File Modified) - ircd-ratbox/trunk/modules/core/m_server.c (File Modified) - ircd-ratbox/trunk/modules/m_help.c (File Modified) - ircd-ratbox/trunk/modules/m_rehash.c (File Modified) - ircd-ratbox/trunk/modules/m_resv.c (File Modified) - ircd-ratbox/trunk/src/cache.c (File Modified) - ircd-ratbox/trunk/src/channel.c (File Modified) - ircd-ratbox/trunk/src/client.c (File Modified) - ircd-ratbox/trunk/src/hash.c (File Modified) - ircd-ratbox/trunk/src/ircd.c (File Modified) - ircd-ratbox/trunk/src/operhash.c (File Modified) - ircd-ratbox/trunk/src/s_newconf.c (File Modified) - ircd-ratbox/trunk/src/s_user.c (File Modified) - ircd-ratbox/trunk/src/scache.c (File Modified) - ircd-ratbox/trunk/src/services.c (File Modified) - - -androsyn 2015/11/07 01:39:56 UTC (20151107_5-28993) - Log: - rework the resv system a bit..this still needs a bit more work - - Modified: - ircd-ratbox/trunk/include/s_newconf.h (File Modified) - ircd-ratbox/trunk/modules/m_resv.c (File Modified) - ircd-ratbox/trunk/modules/m_stats.c (File Modified) - ircd-ratbox/trunk/src/bandbi.c (File Modified) - - -androsyn 2015/11/07 01:31:39 UTC (20151107_4-28991) - Log: - make help use the new cache system, split the operator help hash and user hash into their own hashes - - Modified: - ircd-ratbox/trunk/include/cache.h (File Modified) - ircd-ratbox/trunk/modules/m_help.c (File Modified) - ircd-ratbox/trunk/src/cache.c (File Modified) - - -androsyn 2015/11/07 01:22:29 UTC (20151107_3-28989) - Log: - make scache use the new hashing interface - - Modified: - ircd-ratbox/trunk/src/scache.c (File Modified) - - -androsyn 2015/11/07 01:21:49 UTC (20151107_2-28987) - Log: - make operhash use the new hashing interface - - Modified: - ircd-ratbox/trunk/src/operhash.c (File Modified) - - -androsyn 2015/11/07 01:20:21 UTC (20151107_1-28985) - Log: - use rb_event_add for cleanup_dead_conns - - Modified: - ircd-ratbox/trunk/ssld/ssld.c (File Modified) - - -androsyn 2015/11/07 01:19:07 UTC (20151107_0-28983) - Log: - Start of a major cleanup of the hash code. Rework some of the various other hashes in use to use the add_to_hash interface and extend that interface quite a bit.... - - - - - Modified: - ircd-ratbox/trunk/include/hash.h (File Modified) - ircd-ratbox/trunk/src/hash.c (File Modified) - - -androsyn 2015/11/03 01:58:58 UTC (20151103_0-28981) - Log: - fix/cleanup signal handling - - Modified: - ircd-ratbox/trunk/bandb/bandb.c (File Modified) - ircd-ratbox/trunk/resolver/resolver.c (File Modified) - ircd-ratbox/trunk/ssld/ssld.c (File Modified) - - -androsyn 2015/10/30 23:16:06 UTC (20151030_8-28979) - Log: - use designated initializers for the hash_function table, this is quite a bit more readable - - Modified: - ircd-ratbox/trunk/src/hash.c (File Modified) - - -androsyn 2015/10/30 22:43:02 UTC (20151030_7-28977) - Log: - use bool as the sendqex parameters for dead_link - - Modified: - ircd-ratbox/trunk/include/client.h (File Modified) - ircd-ratbox/trunk/src/client.c (File Modified) - ircd-ratbox/trunk/src/send.c (File Modified) - - -androsyn 2015/10/30 22:35:44 UTC (20151030_6-28975) - Log: - not sure why ptr->data was being used to check for NULL instead of target_p - - Modified: - ircd-ratbox/trunk/src/client.c (File Modified) - - -androsyn 2015/10/30 18:18:03 UTC (20151030_5-28973) - Log: - use uint8_t for the ssl control buffers - - Modified: - ircd-ratbox/trunk/src/sslproc.c (File Modified) - ircd-ratbox/trunk/ssld/ssld.c (File Modified) - - -androsyn 2015/10/30 17:24:21 UTC (20151030_4-28971) - Log: - define loop variables within the loop scope - - Modified: - ircd-ratbox/trunk/src/bandbi.c (File Modified) - ircd-ratbox/trunk/src/cache.c (File Modified) - ircd-ratbox/trunk/src/channel.c (File Modified) - ircd-ratbox/trunk/src/class.c (File Modified) - ircd-ratbox/trunk/src/client.c (File Modified) - ircd-ratbox/trunk/src/hash.c (File Modified) - ircd-ratbox/trunk/src/hook.c (File Modified) - ircd-ratbox/trunk/src/ircd.c (File Modified) - ircd-ratbox/trunk/src/listener.c (File Modified) - ircd-ratbox/trunk/src/modules.c (File Modified) - ircd-ratbox/trunk/src/monitor.c (File Modified) - ircd-ratbox/trunk/src/operhash.c (File Modified) - ircd-ratbox/trunk/src/packet.c (File Modified) - ircd-ratbox/trunk/src/reject.c (File Modified) - ircd-ratbox/trunk/src/s_auth.c (File Modified) - ircd-ratbox/trunk/src/s_conf.c (File Modified) - ircd-ratbox/trunk/src/s_newconf.c (File Modified) - ircd-ratbox/trunk/src/s_serv.c (File Modified) - ircd-ratbox/trunk/src/s_user.c (File Modified) - ircd-ratbox/trunk/src/send.c (File Modified) - ircd-ratbox/trunk/src/services.c (File Modified) - ircd-ratbox/trunk/src/sslproc.c (File Modified) - ircd-ratbox/trunk/src/supported.c (File Modified) - - -androsyn 2015/10/30 16:45:50 UTC (20151030_3-28969) - Log: - Declare loop variable pointers within the loop - - - Modified: - ircd-ratbox/trunk/modules/core/m_kill.c (File Modified) - ircd-ratbox/trunk/modules/core/m_message.c (File Modified) - ircd-ratbox/trunk/modules/core/m_mode.c (File Modified) - ircd-ratbox/trunk/modules/core/m_nick.c (File Modified) - ircd-ratbox/trunk/modules/core/m_server.c (File Modified) - ircd-ratbox/trunk/modules/core/m_squit.c (File Modified) - ircd-ratbox/trunk/modules/m_close.c (File Modified) - ircd-ratbox/trunk/modules/m_dline.c (File Modified) - ircd-ratbox/trunk/modules/m_gline.c (File Modified) - ircd-ratbox/trunk/modules/m_gungline.c (File Modified) - ircd-ratbox/trunk/modules/m_invite.c (File Modified) - ircd-ratbox/trunk/modules/m_kline.c (File Modified) - ircd-ratbox/trunk/modules/m_links.c (File Modified) - ircd-ratbox/trunk/modules/m_list.c (File Modified) - ircd-ratbox/trunk/modules/m_map.c (File Modified) - ircd-ratbox/trunk/modules/m_monitor.c (File Modified) - ircd-ratbox/trunk/modules/m_names.c (File Modified) - ircd-ratbox/trunk/modules/m_rehash.c (File Modified) - ircd-ratbox/trunk/modules/m_restart.c (File Modified) - ircd-ratbox/trunk/modules/m_stats.c (File Modified) - ircd-ratbox/trunk/modules/m_testmask.c (File Modified) - ircd-ratbox/trunk/modules/m_trace.c (File Modified) - ircd-ratbox/trunk/modules/m_who.c (File Modified) - ircd-ratbox/trunk/modules/m_whois.c (File Modified) - ircd-ratbox/trunk/modules/m_xline.c (File Modified) - - -androsyn 2015/10/30 16:40:45 UTC (20151030_2-28967) - Log: - and make it compile - - Modified: - ircd-ratbox/trunk/modules/core/m_join.c (File Modified) - - -androsyn 2015/10/30 16:40:04 UTC (20151030_1-28965) - Log: - use rb_dlinkFind instead of a hand rolled version - - Modified: - ircd-ratbox/trunk/modules/core/m_join.c (File Modified) - - -androsyn 2015/10/30 16:12:42 UTC (20151030_0-28963) - Log: - minor style cleanup, declare target_p inside the foreach loop - - Modified: - ircd-ratbox/trunk/modules/m_accept.c (File Modified) - - -androsyn 2015/10/28 20:25:40 UTC (20151028_22-28961) - Log: - use sha256 for the cert signature - - Modified: - ircd-ratbox/trunk/doc/genopercert.sh (File Modified) - ircd-ratbox/trunk/doc/genssl.sh (File Modified) - - -androsyn 2015/10/28 20:12:59 UTC (20151028_21-28959) - Log: - set install-mod.sh to be executable - - Modified: - ircd-ratbox/trunk/configure (File Modified) - ircd-ratbox/trunk/configure.ac (File Modified) - - -androsyn 2015/10/28 20:04:50 UTC (20151028_20-28957) - Log: - add genopercert.sh - - Modified: - ircd-ratbox/trunk/doc/genopercert.sh (File Added) - - -androsyn 2015/10/28 20:01:19 UTC (20151028_19-28955) - Log: - output the sha256 fingerprint for the certificate and also just use /bin/sh to run genssl.sh, i don't think we have any bashisms - - Modified: - ircd-ratbox/trunk/doc/genssl.sh (File Modified) - - -androsyn 2015/10/28 19:48:52 UTC (20151028_18-28953) - Log: - document the blacklist::aftype stuff a little bit - - Modified: - ircd-ratbox/trunk/doc/example.conf (File Modified) - - -androsyn 2015/10/28 19:46:05 UTC (20151028_17-28951) - Log: - have blacklist::aftype be a regular string, not quoted - - Modified: - ircd-ratbox/trunk/src/newconf.c (File Modified) - - -androsyn 2015/10/28 19:43:38 UTC (20151028_16-28949) - Log: - add aftype to blacklist to set whether a rbl support ipv4/ipv6 or both - - Modified: - ircd-ratbox/trunk/src/newconf.c (File Modified) - - -androsyn 2015/10/28 19:30:19 UTC (20151028_15-28947) - Log: - pass the cert and key parameters to rb_setup_ssl_client, currently we just use the same keys for the server, but we could change this in the future - - Modified: - ircd-ratbox/trunk/ssld/ssld.c (File Modified) - - -androsyn 2015/10/28 19:24:50 UTC (20151028_14-28943) - Log: - report the CERTFP string as part of the server capabilities, I'm not sure this is the best place for it, but it'll do for now - - Modified: - ircd-ratbox/trunk/src/s_serv.c (File Modified) - - -androsyn 2015/10/28 18:52:03 UTC (20151028_13-28939) - Log: - add certificate fingerprint checking for auth blocks too - - Modified: - ircd-ratbox/trunk/include/s_conf.h (File Modified) - ircd-ratbox/trunk/src/newconf.c (File Modified) - ircd-ratbox/trunk/src/s_conf.c (File Modified) - ircd-ratbox/trunk/src/s_user.c (File Modified) - - -androsyn 2015/10/28 18:11:06 UTC (20151028_12-28937) - Log: - wrap init_fake_services in an ifdef - - Modified: - ircd-ratbox/trunk/src/ircd.c (File Modified) - - -androsyn 2015/10/28 17:57:45 UTC (20151028_11-28935) - Log: - put operators first when outputing names/who for channels, why? why not - - Modified: - ircd-ratbox/trunk/src/channel.c (File Modified) - - -androsyn 2015/10/28 17:46:54 UTC (20151028_10-28933) - Log: - only check the MEMBER_OP list if ONLY_CHANOPS is selected for sendto_channel_flags - - Modified: - ircd-ratbox/trunk/src/send.c (File Modified) - - -androsyn 2015/10/28 17:45:30 UTC (20151028_9-28931) - Log: - actually move members between the MEMBER_OP and MEMBER_NOOP lists - - Modified: - ircd-ratbox/trunk/modules/core/m_join.c (File Modified) - ircd-ratbox/trunk/modules/core/m_mode.c (File Modified) - - -androsyn 2015/10/28 16:23:48 UTC (20151028_8-28929) - Log: - huh..define uptime as time_t instead of long - - Modified: - ircd-ratbox/trunk/modules/m_stats.c (File Modified) - - -androsyn 2015/10/28 16:18:41 UTC (20151028_7-28927) - Log: - more bool type changes - - Modified: - ircd-ratbox/trunk/include/ircd.h (File Modified) - ircd-ratbox/trunk/modules/core/m_server.c (File Modified) - ircd-ratbox/trunk/modules/m_connect.c (File Modified) - ircd-ratbox/trunk/src/channel.c (File Modified) - ircd-ratbox/trunk/src/client.c (File Modified) - ircd-ratbox/trunk/src/ircd.c (File Modified) - ircd-ratbox/trunk/src/listener.c (File Modified) - ircd-ratbox/trunk/src/newconf.c (File Modified) - ircd-ratbox/trunk/src/s_log.c (File Modified) - ircd-ratbox/trunk/src/s_serv.c (File Modified) - ircd-ratbox/trunk/src/sslproc.c (File Modified) - - -androsyn 2015/10/28 16:00:47 UTC (20151028_6-28925) - Log: - make comp_with_mask_sock use a switch statement and return 0 if we don't recognize the socket type, rather than passing the NULLs down to comp_with_mask - - Modified: - ircd-ratbox/trunk/src/match.c (File Modified) - - -androsyn 2015/10/28 15:55:49 UTC (20151028_5-28923) - Log: - comment typo - - Modified: - ircd-ratbox/trunk/ssld/ssld.c (File Modified) - - -androsyn 2015/10/28 15:53:57 UTC (20151028_4-28921) - Log: - include the size of the whowas table in the whowas memory usage - - Modified: - ircd-ratbox/trunk/src/whowas.c (File Modified) - - -androsyn 2015/10/28 15:34:52 UTC (20151028_3-28919) - Log: - replace a time() call with a rb_current_time() call - - Modified: - ircd-ratbox/trunk/src/client.c (File Modified) - - -androsyn 2015/10/28 15:30:31 UTC (20151028_2-28917) - Log: - Have generate_uid do the right thing should it ever roll over. I'm not sure how this would ever happen, but deal with it anyways. - - - Modified: - ircd-ratbox/trunk/src/client.c (File Modified) - - -androsyn 2015/10/28 14:43:49 UTC (20151028_1-28915) - Log: - set max_bans default to 100 in the source as well - - Modified: - ircd-ratbox/trunk/src/s_conf.c (File Modified) - - -androsyn 2015/10/28 14:43:06 UTC (20151028_0-28913) - Log: - update max_bans to 100 - - Modified: - ircd-ratbox/trunk/doc/example.conf (File Modified) - - -androsyn 2015/10/27 06:29:23 UTC (20151027_21-28911) - Log: - cleanup socketpairs if start_ssld fails - - Modified: - ircd-ratbox/trunk/src/listener.c (File Modified) - ircd-ratbox/trunk/src/s_serv.c (File Modified) - - -androsyn 2015/10/27 06:24:43 UTC (20151027_20-28909) - Log: - check the return values from which_ssld - - Modified: - ircd-ratbox/trunk/src/sslproc.c (File Modified) - - -androsyn 2015/10/27 05:23:10 UTC (20151027_19-28907) - Log: - so it seems nothing used ircncmp. remove it - - Modified: - ircd-ratbox/trunk/include/match.h (File Modified) - - -androsyn 2015/10/27 05:12:00 UTC (20151027_18-28905) - Log: - set ascii 29 to be a fake channel character - - Modified: - ircd-ratbox/trunk/src/match.c (File Modified) - - -androsyn 2015/10/27 05:03:56 UTC (20151027_17-28903) - Log: - rename the variable new to tgt - - Modified: - ircd-ratbox/trunk/src/s_serv.c (File Modified) - - -androsyn 2015/10/27 04:52:07 UTC (20151027_16-28901) - Log: - get the numeric/format strings for certfp too - - Modified: - ircd-ratbox/trunk/include/numeric.h (File Modified) - - -androsyn 2015/10/27 04:27:46 UTC (20151027_15-28899) - Log: - output client certificate fingerprint in whois - - Modified: - ircd-ratbox/trunk/modules/m_whois.c (File Modified) - - -androsyn 2015/10/27 03:17:41 UTC (20151027_14-28895) - Log: - a few minor include cleanups - - Modified: - ircd-ratbox/trunk/src/bandbi.c (File Modified) - ircd-ratbox/trunk/src/dns.c (File Modified) - - -androsyn 2015/10/27 03:10:30 UTC (20151027_13-28893) - Log: - remove some unnecessary forward declarations - - Modified: - ircd-ratbox/trunk/include/s_serv.h (File Modified) - ircd-ratbox/trunk/include/s_stats.h (File Modified) - - -androsyn 2015/10/27 02:58:19 UTC (20151027_12-28891) - Log: - move counter declaration to the for loop in whowas_set_size - - Modified: - ircd-ratbox/trunk/src/whowas.c (File Modified) - - -androsyn 2015/10/27 02:50:23 UTC (20151027_11-28889) - Log: - make that close_listeners(void) instead of () - - Modified: - ircd-ratbox/trunk/src/listener.c (File Modified) - - -androsyn 2015/10/27 02:41:34 UTC (20151027_10-28887) - Log: - remove (void) before closedir - - Modified: - ircd-ratbox/trunk/src/modules.c (File Modified) - - -androsyn 2015/10/27 02:40:05 UTC (20151027_9-28885) - Log: - change buffer to be IRCD_BUFSIZE * 2 instead of 1024 - - Modified: - ircd-ratbox/trunk/src/parse.c (File Modified) - - -androsyn 2015/10/27 02:37:00 UTC (20151027_8-28883) - Log: - remove now bogus comment - - Modified: - ircd-ratbox/trunk/src/s_auth.c (File Modified) - - -androsyn 2015/10/27 02:01:03 UTC (20151027_7-28881) - Log: - add certfp support to operator blocks - - Modified: - ircd-ratbox/trunk/include/s_newconf.h (File Modified) - ircd-ratbox/trunk/modules/m_oper.c (File Modified) - ircd-ratbox/trunk/src/newconf.c (File Modified) - ircd-ratbox/trunk/src/s_newconf.c (File Modified) - - -androsyn 2015/10/27 01:23:26 UTC (20151027_6-28877) - Log: - fix certfp hex mask - - Modified: - ircd-ratbox/trunk/src/sslproc.c (File Modified) - - -androsyn 2015/10/27 00:39:50 UTC (20151027_5-28875) - Log: - put in missing word in comment - - Modified: - ircd-ratbox/trunk/src/whowas.c (File Modified) - - -androsyn 2015/10/27 00:38:50 UTC (20151027_4-28873) - Log: - make whowas_add_history take a bool for online/offline - - Modified: - ircd-ratbox/trunk/include/whowas.h (File Modified) - ircd-ratbox/trunk/modules/core/m_nick.c (File Modified) - ircd-ratbox/trunk/src/client.c (File Modified) - ircd-ratbox/trunk/src/whowas.c (File Modified) - - -androsyn 2015/10/27 00:32:02 UTC (20151027_3-28871) - Log: - change isupportlist to static - - Modified: - ircd-ratbox/trunk/src/supported.c (File Modified) - - -androsyn 2015/10/27 00:15:20 UTC (20151027_2-28869) - Log: - i think we can remove this ancient extern crypt prototype - - Modified: - ircd-ratbox/trunk/src/s_user.c (File Modified) - - -androsyn 2015/10/27 00:12:47 UTC (20151027_1-28867) - Log: - try to get stats z total memory at least to add up all of the things we report line by line at least. this needs more work... - - Modified: - ircd-ratbox/trunk/modules/m_stats.c (File Modified) - - -androsyn 2015/10/27 00:12:04 UTC (20151027_0-28865) - Log: - add operhash_count - - Modified: - ircd-ratbox/trunk/include/operhash.h (File Modified) - ircd-ratbox/trunk/src/operhash.c (File Modified) - - -androsyn 2015/10/26 23:37:08 UTC (20151026_5-28863) - Log: - remove #if 0'd code - - Modified: - ircd-ratbox/trunk/src/sslproc.c (File Modified) - - -androsyn 2015/10/26 20:29:54 UTC (20151026_4-28861) - Log: - inline irccmp and ircncmp - - Modified: - ircd-ratbox/trunk/include/match.h (File Modified) - ircd-ratbox/trunk/src/match.c (File Modified) - - -androsyn 2015/10/26 20:11:55 UTC (20151026_3-28859) - Log: - boolify ssl and active arguments in struct Listener and its respective code - - Modified: - ircd-ratbox/trunk/include/listener.h (File Modified) - ircd-ratbox/trunk/src/listener.c (File Modified) - - -androsyn 2015/10/26 20:07:54 UTC (20151026_2-28857) - Log: - why did i change current_serial to uint32_t, just use unsigned long - - Modified: - ircd-ratbox/trunk/src/send.c (File Modified) - - -androsyn 2015/10/26 17:13:30 UTC (20151026_1-28855) - Log: - have find_hostname return a rb_dlink_list instead of the head node. functionally the same, but I think this way is a bit more correct and follows the patterns of other code - - Modified: - ircd-ratbox/trunk/include/hash.h (File Modified) - ircd-ratbox/trunk/src/hash.c (File Modified) - ircd-ratbox/trunk/src/s_conf.c (File Modified) - - -androsyn 2015/10/26 15:52:53 UTC (20151026_0-28853) - Log: - Port from trunk-broken, the original commit message is: - - Rev 27203 - jilles - 2011-08-30 18:52:08 - Rev 27183 - Log message: Ensure all signals keep working after a SIGINT restart. - - After setting up signal handlers, unmask the signals we care about - (installed handlers for). - - When handling SIGINT, the kernel adds SIGHUP and SIGINT to the signal - mask (as requested in sigaction()); if execve() is called from the - signal handler, this change is persistent. - - - - - Modified: - ircd-ratbox/trunk/src/ircd_signal.c (File Modified) - - -androsyn 2015/10/23 16:02:35 UTC (20151023_0-28849) - Log: - boolify ssl_ok/zlib_ok - - Modified: - ircd-ratbox/trunk/ssld/ssld.c (File Modified) - - -androsyn 2015/10/20 18:50:44 UTC (20151020_7-28847) - Log: - make genssl.sh generate 2048bit DH parameters - - Modified: - ircd-ratbox/trunk/doc/genssl.sh (File Modified) - - -androsyn 2015/10/20 18:16:20 UTC (20151020_6-28843) - Log: - change helper argv[0] to be ircd-ratbox {resolver,bandb,ssld} daemon - - Modified: - ircd-ratbox/trunk/src/bandbi.c (File Modified) - ircd-ratbox/trunk/src/dns.c (File Modified) - ircd-ratbox/trunk/src/sslproc.c (File Modified) - - -androsyn 2015/10/20 17:42:48 UTC (20151020_5-28839) - Log: - whitespace cleanup - - Modified: - ircd-ratbox/trunk/src/listener.c (File Modified) - - -androsyn 2015/10/20 17:09:43 UTC (20151020_4-28837) - Log: - style only changes - - Modified: - ircd-ratbox/trunk/src/hash.c (File Modified) - - -androsyn 2015/10/20 16:22:38 UTC (20151020_3-28835) - Log: - Stop exporting resvTable from hash.c - - Add hash_get_tablelist/hash_free_tablelist to export a linked list of the hash tables if you need those. - - - - Modified: - ircd-ratbox/trunk/include/hash.h (File Modified) - ircd-ratbox/trunk/modules/m_rehash.c (File Modified) - ircd-ratbox/trunk/modules/m_stats.c (File Modified) - ircd-ratbox/trunk/src/hash.c (File Modified) - ircd-ratbox/trunk/src/s_newconf.c (File Modified) - - -androsyn 2015/10/20 14:56:17 UTC (20151020_2-28831) - Log: - remove MINGW ifdef for RBTT_FMT - - Modified: - ircd-ratbox/trunk/include/stdinc.h (File Modified) - - -androsyn 2015/10/20 14:55:36 UTC (20151020_1-28829) - Log: - services style cleanups mostly - - Modified: - ircd-ratbox/trunk/include/client.h (File Modified) - ircd-ratbox/trunk/include/services.h (File Modified) - ircd-ratbox/trunk/modules/core/m_squit.c (File Modified) - ircd-ratbox/trunk/src/services.c (File Modified) - - -androsyn 2015/10/20 14:49:20 UTC (20151020_0-28827) - Log: - linebuf cleanups - - Modified: - ircd-ratbox/trunk/src/send.c (File Modified) - - -androsyn 2015/10/17 01:38:36 UTC (20151017_0-28823) - Log: - no need to use rb_linebuf_bufhead_size now - - Modified: - ircd-ratbox/trunk/src/send.c (File Modified) - - -androsyn 2015/10/16 18:52:33 UTC (20151016_0-28817) - Log: - fix some slight brain damange with the fake client stuff - - Modified: - ircd-ratbox/trunk/include/services.h (File Modified) - ircd-ratbox/trunk/modules/core/m_message.c (File Modified) - ircd-ratbox/trunk/modules/static_modules.c.SH (File Modified) - ircd-ratbox/trunk/src/Makefile.in (File Modified) - ircd-ratbox/trunk/src/ircd.c (File Modified) - ircd-ratbox/trunk/src/services.c (File Modified) - - -androsyn 2015/10/15 16:16:20 UTC (20151015_0-28801) - Log: - Add fake client support for openchanfix in into the mainline tree. No point in keeping this out of tree. - - - Modified: - ircd-ratbox/trunk/configure (File Modified) - ircd-ratbox/trunk/configure.ac (File Modified) - ircd-ratbox/trunk/include/channel.h (File Modified) - ircd-ratbox/trunk/include/client.h (File Modified) - ircd-ratbox/trunk/include/hash.h (File Modified) - ircd-ratbox/trunk/include/hook.h (File Modified) - ircd-ratbox/trunk/include/services.h (File Added) - ircd-ratbox/trunk/include/setup.h.in (File Modified) - ircd-ratbox/trunk/modules/core/m_join.c (File Modified) - ircd-ratbox/trunk/modules/core/m_kill.c (File Modified) - ircd-ratbox/trunk/modules/core/m_message.c (File Modified) - ircd-ratbox/trunk/modules/core/m_nick.c (File Modified) - ircd-ratbox/trunk/modules/core/m_server.c (File Modified) - ircd-ratbox/trunk/modules/core/m_squit.c (File Modified) - ircd-ratbox/trunk/modules/m_knock.c (File Modified) - ircd-ratbox/trunk/modules/m_list.c (File Modified) - ircd-ratbox/trunk/modules/m_stats.c (File Modified) - ircd-ratbox/trunk/modules/m_trace.c (File Modified) - ircd-ratbox/trunk/modules/m_who.c (File Modified) - ircd-ratbox/trunk/src/Makefile.am (File Modified) - ircd-ratbox/trunk/src/Makefile.in (File Modified) - ircd-ratbox/trunk/src/channel.c (File Modified) - ircd-ratbox/trunk/src/client.c (File Modified) - ircd-ratbox/trunk/src/hash.c (File Modified) - ircd-ratbox/trunk/src/hook.c (File Modified) - ircd-ratbox/trunk/src/send.c (File Modified) - ircd-ratbox/trunk/src/services.c (File Added) - - -androsyn 2015/10/12 17:09:16 UTC (20151012_2-28745) - Log: - move some old documentation to old - - Modified: - ircd-ratbox/trunk/doc/old/technical/ (File Added) - ircd-ratbox/trunk/doc/old/technical/event.txt (File Added) - ircd-ratbox/trunk/doc/old/technical/fd-management.txt (File Added) - ircd-ratbox/trunk/doc/old/technical/file-management.txt (File Added) - ircd-ratbox/trunk/doc/old/technical/linebuf.txt (File Added) - ircd-ratbox/trunk/doc/technical/event.txt (File Deleted) - ircd-ratbox/trunk/doc/technical/fd-management.txt (File Deleted) - ircd-ratbox/trunk/doc/technical/file-management.txt (File Deleted) - ircd-ratbox/trunk/doc/technical/linebuf.txt (File Deleted) - - -androsyn 2015/10/12 17:09:05 UTC (20151012_1-28743) - Log: - slight update to whats new - - Modified: - ircd-ratbox/trunk/doc/whats-new-3.1.txt (File Modified) - - -androsyn 2015/10/12 16:46:12 UTC (20151012_0-28741) - Log: - add isupport for ACCEPT, MAP and KEYLEN - - Modified: - ircd-ratbox/trunk/src/supported.c (File Modified) - - -androsyn 2015/10/11 13:55:29 UTC (20151011_0-28733) - Log: - how did you go missing free_monitor - - Modified: - ircd-ratbox/trunk/modules/m_monitor.c (File Modified) - - -dubkat 2015/10/10 21:16:12 UTC (20151010_0-28731) - Log: - increase the bits from generated ssl keys from 1024 to 4096. - - Modified: - ircd-ratbox/trunk/doc/genssl.sh (File Modified) - - -androsyn 2015/10/06 17:26:15 UTC (20151006_3-28719) - Log: - initialize emptyline at compile time instead of runtime - - Modified: - ircd-ratbox/trunk/src/cache.c (File Modified) - - -androsyn 2015/10/06 15:07:54 UTC (20151006_2-28717) - Log: - use true/false for the find_monitor parameter - - Modified: - ircd-ratbox/trunk/modules/m_monitor.c (File Modified) - ircd-ratbox/trunk/src/monitor.c (File Modified) - - -androsyn 2015/10/06 00:34:37 UTC (20151006_1-28715) - Log: - remove AUTH_BLOCK_SIZE define that was used for balloc - - Modified: - ircd-ratbox/trunk/include/s_auth.h (File Modified) - - -androsyn 2015/10/06 00:06:08 UTC (20151006_0-28713) - Log: - change ssl_{server,client}_ctx to static. no functional change, just makes me feel better - - Modified: - ircd-ratbox/trunk/ssld/ssld.c (File Modified) - - -androsyn 2015/10/05 14:25:32 UTC (20151005_0-28711) - Log: - whitespace cleanup - - Modified: - ircd-ratbox/trunk/modules/m_monitor.c (File Modified) - - -androsyn 2015/10/03 04:00:41 UTC (20151003_1-28701) - Log: - don't use the pointer return from strerror as in theory this string could be overwritten by another call to strerror in further functions - - Modified: - ircd-ratbox/trunk/src/s_serv.c (File Modified) - - -androsyn 2015/10/03 02:42:08 UTC (20151003_0-28699) - Log: - fix remote_client_memory_used to report valid data - - Modified: - ircd-ratbox/trunk/src/client.c (File Modified) - - -androsyn 2015/10/02 20:45:35 UTC (20151002_6-28695) - Log: - remove monitor.h from ircd.c - - Modified: - ircd-ratbox/trunk/src/ircd.c (File Modified) - - -androsyn 2015/10/02 20:26:14 UTC (20151002_5-28693) - Log: - explictly test for != NULL - - Modified: - ircd-ratbox/trunk/modules/m_monitor.c (File Modified) - - -androsyn 2015/10/02 20:14:18 UTC (20151002_4-28691) - Log: - update generated files - - Modified: - ircd-ratbox/trunk/modules/Makefile.in (File Modified) - ircd-ratbox/trunk/src/Makefile.in (File Modified) - - -androsyn 2015/10/02 20:13:56 UTC (20151002_3-28689) - Log: - remove init_monitor - - Modified: - ircd-ratbox/trunk/include/monitor.h (File Modified) - - -androsyn 2015/10/02 20:13:44 UTC (20151002_2-28687) - Log: - remove init_monitor - - Modified: - ircd-ratbox/trunk/src/ircd.c (File Modified) - ircd-ratbox/trunk/src/monitor.c (File Modified) - - -androsyn 2015/10/02 20:10:33 UTC (20151002_1-28685) - Log: - remove debugging code - - Modified: - ircd-ratbox/trunk/src/monitor.c (File Modified) - - -androsyn 2015/10/02 20:08:53 UTC (20151002_0-28683) - Log: - Readd a slightly reworked monitor implementation - - - Modified: - ircd-ratbox/trunk/doc/monitor.txt (File Added) - ircd-ratbox/trunk/help/opers/monitor (File Added) - ircd-ratbox/trunk/include/monitor.h (File Added) - ircd-ratbox/trunk/include/s_conf.h (File Modified) - ircd-ratbox/trunk/include/send.h (File Modified) - ircd-ratbox/trunk/include/struct.h (File Modified) - ircd-ratbox/trunk/modules/Makefile.am (File Modified) - ircd-ratbox/trunk/modules/Makefile.in (File Modified) - ircd-ratbox/trunk/modules/core/m_nick.c (File Modified) - ircd-ratbox/trunk/modules/m_info.c (File Modified) - ircd-ratbox/trunk/modules/m_monitor.c (File Added) - ircd-ratbox/trunk/modules/m_services.c (File Modified) - ircd-ratbox/trunk/modules/static_modules.c (File Modified) - ircd-ratbox/trunk/src/Makefile.am (File Modified) - ircd-ratbox/trunk/src/Makefile.in (File Modified) - ircd-ratbox/trunk/src/client.c (File Modified) - ircd-ratbox/trunk/src/ircd.c (File Modified) - ircd-ratbox/trunk/src/monitor.c (File Added) - ircd-ratbox/trunk/src/newconf.c (File Modified) - ircd-ratbox/trunk/src/s_conf.c (File Modified) - ircd-ratbox/trunk/src/s_user.c (File Modified) - ircd-ratbox/trunk/src/send.c (File Modified) - ircd-ratbox/trunk/src/supported.c (File Modified) - - -androsyn 2015/09/29 15:04:13 UTC (20150929_0-28669) - Log: - remove monitor, nobody really uses it, rebuild automake to reflect its removal as well - - Modified: - ircd-ratbox/trunk/Makefile.in (File Modified) - ircd-ratbox/trunk/bandb/Makefile.in (File Modified) - ircd-ratbox/trunk/bandb/sqlite3/Makefile.in (File Modified) - ircd-ratbox/trunk/configure (File Modified) - ircd-ratbox/trunk/contrib/Makefile.in (File Modified) - ircd-ratbox/trunk/doc/monitor.txt (File Deleted) - ircd-ratbox/trunk/help/Makefile.in (File Modified) - ircd-ratbox/trunk/help/opers/monitor (File Deleted) - ircd-ratbox/trunk/include/monitor.h (File Deleted) - ircd-ratbox/trunk/include/s_conf.h (File Modified) - ircd-ratbox/trunk/include/send.h (File Modified) - ircd-ratbox/trunk/include/struct.h (File Modified) - ircd-ratbox/trunk/modules/Makefile.am (File Modified) - ircd-ratbox/trunk/modules/Makefile.in (File Modified) - ircd-ratbox/trunk/modules/core/m_nick.c (File Modified) - ircd-ratbox/trunk/modules/m_info.c (File Modified) - ircd-ratbox/trunk/modules/m_monitor.c (File Deleted) - ircd-ratbox/trunk/modules/m_services.c (File Modified) - ircd-ratbox/trunk/modules/static_modules.c (File Modified) - ircd-ratbox/trunk/resolver/Makefile.in (File Modified) - ircd-ratbox/trunk/src/Makefile.am (File Modified) - ircd-ratbox/trunk/src/Makefile.in (File Modified) - ircd-ratbox/trunk/src/bandbi.c (File Modified) - ircd-ratbox/trunk/src/cache.c (File Modified) - ircd-ratbox/trunk/src/channel.c (File Modified) - ircd-ratbox/trunk/src/client.c (File Modified) - ircd-ratbox/trunk/src/dns.c (File Modified) - ircd-ratbox/trunk/src/ircd.c (File Modified) - ircd-ratbox/trunk/src/ircd_parser.c (File Modified) - ircd-ratbox/trunk/src/ircd_parser.h (File Modified) - ircd-ratbox/trunk/src/monitor.c (File Deleted) - ircd-ratbox/trunk/src/newconf.c (File Modified) - ircd-ratbox/trunk/src/s_conf.c (File Modified) - ircd-ratbox/trunk/src/s_user.c (File Modified) - ircd-ratbox/trunk/src/send.c (File Modified) - ircd-ratbox/trunk/src/supported.c (File Modified) - ircd-ratbox/trunk/ssld/Makefile.in (File Modified) - ircd-ratbox/trunk/tools/Makefile.in (File Modified) - - -androsyn 2015/09/23 15:01:49 UTC (20150923_2-28667) - Log: - new whats-new for 3.1beta - - Modified: - ircd-ratbox/trunk/doc/whats-new-3.1.txt (File Added) - - -androsyn 2015/09/23 14:52:10 UTC (20150923_1-28665) - Log: - remove havent_read_conf. i hate this thing - - Modified: - ircd-ratbox/trunk/doc/example.conf (File Modified) - ircd-ratbox/trunk/src/newconf.c (File Modified) - - -androsyn 2015/09/23 14:45:24 UTC (20150923_0-28663) - Log: - update executable name - - Modified: - ircd-ratbox/trunk/doc/ircd_crontab.sh (File Modified) - - -androsyn 2015/09/22 18:21:39 UTC (20150922_3-28661) - Log: - reorder struct LocalUser a little bit and save 16 bytes for our troubles on x86-64 - - Modified: - ircd-ratbox/trunk/include/struct.h (File Modified) - - -androsyn 2015/09/22 17:39:05 UTC (20150922_2-28659) - Log: - have the me_gcap handler use the .handler way - - Modified: - ircd-ratbox/trunk/modules/m_capab.c (File Modified) - - -androsyn 2015/09/22 17:24:10 UTC (20150922_1-28657) - Log: - Change status values to enums from #defines - It also appears that the status field is NOT a bitmask, so there isnt a reason to have values based on the bits. - - - - Modified: - ircd-ratbox/trunk/include/client.h (File Modified) - - -androsyn 2015/09/22 15:27:20 UTC (20150922_0-28655) - Log: - document nick_delay - - Modified: - ircd-ratbox/trunk/doc/example.conf (File Modified) - - -androsyn 2015/08/25 14:49:23 UTC (20150825_3-28653) - Log: - comment corrections - - Modified: - ircd-ratbox/trunk/include/version.h (File Modified) - ircd-ratbox/trunk/include/whowas.h (File Modified) - - -androsyn 2015/08/25 14:48:57 UTC (20150825_2-28651) - Log: - documentation update from jackal^@EFnet - - Modified: - ircd-ratbox/trunk/doc/index.txt (File Modified) - ircd-ratbox/trunk/tools/README (File Modified) - - -androsyn 2015/08/25 14:48:22 UTC (20150825_1-28649) - Log: - Change LAST_BANDB_TYPE to BANDB_LAST_TYPE. Patch from jackal^@EFnet - - - - Modified: - ircd-ratbox/trunk/bandb/bandb.c (File Modified) - ircd-ratbox/trunk/bandb/bantool.c (File Modified) - ircd-ratbox/trunk/include/bandb_defs.h (File Modified) - ircd-ratbox/trunk/src/bandbi.c (File Modified) - - -androsyn 2015/08/25 14:46:50 UTC (20150825_0-28647) - Log: - print ircd-ratbox instead of ircd - - Modified: - ircd-ratbox/trunk/src/ircd.c (File Modified) - - -androsyn 2015/08/21 15:47:06 UTC (20150821_12-28645) - Log: - move struct operhash_entry to be internal to src/operhash.c - - Modified: - ircd-ratbox/trunk/include/operhash.h (File Modified) - ircd-ratbox/trunk/src/operhash.c (File Modified) - - -androsyn 2015/08/21 15:43:52 UTC (20150821_11-28643) - Log: - style cleanups - - Modified: - ircd-ratbox/trunk/ssld/ssld.c (File Modified) - - -androsyn 2015/08/21 15:28:20 UTC (20150821_10-28641) - Log: - have the levels for sendto_realops_flags be enums rather than defines - - Modified: - ircd-ratbox/trunk/include/send.h (File Modified) - ircd-ratbox/trunk/src/send.c (File Modified) - - -androsyn 2015/08/21 14:52:37 UTC (20150821_9-28639) - Log: - dead_list is internal to client.c so don't export it - - Modified: - ircd-ratbox/trunk/include/ircd.h (File Modified) - ircd-ratbox/trunk/src/client.c (File Modified) - - -androsyn 2015/08/21 14:48:20 UTC (20150821_8-28637) - Log: - avoid exporting monitorTable by moving cleanup_monitor to inside src/monitor.c - - Modified: - ircd-ratbox/trunk/include/monitor.h (File Modified) - ircd-ratbox/trunk/modules/m_monitor.c (File Modified) - ircd-ratbox/trunk/src/monitor.c (File Modified) - - -androsyn 2015/08/21 02:45:31 UTC (20150821_7-28635) - Log: - suppress warnings regarding diagnostic push/pop on older gcc versions - - Modified: - ircd-ratbox/trunk/bandb/rsdb_sqlite3.c (File Modified) - ircd-ratbox/trunk/src/newconf.c (File Modified) - ircd-ratbox/trunk/src/s_serv.c (File Modified) - ircd-ratbox/trunk/ssld/ssld.c (File Modified) - - -androsyn 2015/08/21 02:38:12 UTC (20150821_6-28633) - Log: - fix format specifier - - Modified: - ircd-ratbox/trunk/src/ircd.c (File Modified) - - -androsyn 2015/08/21 01:44:36 UTC (20150821_5-28629) - Log: - formatting fixup - - Modified: - ircd-ratbox/trunk/include/send.h (File Modified) - - -androsyn 2015/08/21 00:46:15 UTC (20150821_4-28627) - Log: - boolify inetport - - Modified: - ircd-ratbox/trunk/src/listener.c (File Modified) - - -androsyn 2015/08/21 00:30:26 UTC (20150821_3-28623) - Log: - use #include instead of #include "foo.h" - - Modified: - ircd-ratbox/trunk/contrib/example_module.c (File Modified) - ircd-ratbox/trunk/contrib/m_42.c (File Modified) - ircd-ratbox/trunk/contrib/m_clearchan.c (File Modified) - ircd-ratbox/trunk/contrib/m_flags.c (File Modified) - ircd-ratbox/trunk/contrib/m_force.c (File Modified) - ircd-ratbox/trunk/contrib/m_mallinfo.c (File Modified) - ircd-ratbox/trunk/contrib/m_mkpasswd.c (File Modified) - ircd-ratbox/trunk/contrib/m_ojoin.c (File Modified) - ircd-ratbox/trunk/contrib/m_okick.c (File Modified) - ircd-ratbox/trunk/contrib/m_olist.c (File Modified) - ircd-ratbox/trunk/contrib/m_opme.c (File Modified) - ircd-ratbox/trunk/contrib/m_reportssl.c (File Modified) - ircd-ratbox/trunk/contrib/m_webirc.c (File Modified) - ircd-ratbox/trunk/contrib/spy_admin_notice.c (File Modified) - ircd-ratbox/trunk/contrib/spy_info_notice.c (File Modified) - ircd-ratbox/trunk/contrib/spy_links_notice.c (File Modified) - ircd-ratbox/trunk/contrib/spy_motd_notice.c (File Modified) - ircd-ratbox/trunk/contrib/spy_stats_notice.c (File Modified) - ircd-ratbox/trunk/contrib/spy_stats_p_notice.c (File Modified) - ircd-ratbox/trunk/contrib/spy_whois_notice.c (File Modified) - ircd-ratbox/trunk/contrib/spy_whois_notice_global.c (File Modified) - ircd-ratbox/trunk/include/bandbi.h (File Modified) - ircd-ratbox/trunk/include/config.h (File Modified) - ircd-ratbox/trunk/include/hash.h (File Modified) - ircd-ratbox/trunk/include/modules.h (File Modified) - ircd-ratbox/trunk/include/s_user.h (File Modified) - ircd-ratbox/trunk/include/send.h (File Modified) - ircd-ratbox/trunk/include/stdinc.h (File Modified) - ircd-ratbox/trunk/include/struct.h (File Modified) - ircd-ratbox/trunk/include/substitution.h (File Modified) - ircd-ratbox/trunk/modules/core/m_die.c (File Modified) - ircd-ratbox/trunk/modules/core/m_error.c (File Modified) - ircd-ratbox/trunk/modules/core/m_join.c (File Modified) - ircd-ratbox/trunk/modules/core/m_kick.c (File Modified) - ircd-ratbox/trunk/modules/core/m_kill.c (File Modified) - ircd-ratbox/trunk/modules/core/m_message.c (File Modified) - ircd-ratbox/trunk/modules/core/m_mode.c (File Modified) - ircd-ratbox/trunk/modules/core/m_nick.c (File Modified) - ircd-ratbox/trunk/modules/core/m_part.c (File Modified) - ircd-ratbox/trunk/modules/core/m_quit.c (File Modified) - ircd-ratbox/trunk/modules/core/m_server.c (File Modified) - ircd-ratbox/trunk/modules/core/m_squit.c (File Modified) - ircd-ratbox/trunk/modules/m_accept.c (File Modified) - ircd-ratbox/trunk/modules/m_admin.c (File Modified) - ircd-ratbox/trunk/modules/m_adminwall.c (File Modified) - ircd-ratbox/trunk/modules/m_away.c (File Modified) - ircd-ratbox/trunk/modules/m_cap.c (File Modified) - ircd-ratbox/trunk/modules/m_capab.c (File Modified) - ircd-ratbox/trunk/modules/m_close.c (File Modified) - ircd-ratbox/trunk/modules/m_cmessage.c (File Modified) - ircd-ratbox/trunk/modules/m_connect.c (File Modified) - ircd-ratbox/trunk/modules/m_dline.c (File Modified) - ircd-ratbox/trunk/modules/m_encap.c (File Modified) - ircd-ratbox/trunk/modules/m_gline.c (File Modified) - ircd-ratbox/trunk/modules/m_gungline.c (File Modified) - ircd-ratbox/trunk/modules/m_help.c (File Modified) - ircd-ratbox/trunk/modules/m_info.c (File Modified) - ircd-ratbox/trunk/modules/m_invite.c (File Modified) - ircd-ratbox/trunk/modules/m_ison.c (File Modified) - ircd-ratbox/trunk/modules/m_kline.c (File Modified) - ircd-ratbox/trunk/modules/m_knock.c (File Modified) - ircd-ratbox/trunk/modules/m_links.c (File Modified) - ircd-ratbox/trunk/modules/m_list.c (File Modified) - ircd-ratbox/trunk/modules/m_locops.c (File Modified) - ircd-ratbox/trunk/modules/m_lusers.c (File Modified) - ircd-ratbox/trunk/modules/m_map.c (File Modified) - ircd-ratbox/trunk/modules/m_monitor.c (File Modified) - ircd-ratbox/trunk/modules/m_motd.c (File Modified) - ircd-ratbox/trunk/modules/m_names.c (File Modified) - ircd-ratbox/trunk/modules/m_oper.c (File Modified) - ircd-ratbox/trunk/modules/m_operspy.c (File Modified) - ircd-ratbox/trunk/modules/m_pass.c (File Modified) - ircd-ratbox/trunk/modules/m_ping.c (File Modified) - ircd-ratbox/trunk/modules/m_pong.c (File Modified) - ircd-ratbox/trunk/modules/m_post.c (File Modified) - ircd-ratbox/trunk/modules/m_rehash.c (File Modified) - ircd-ratbox/trunk/modules/m_restart.c (File Modified) - ircd-ratbox/trunk/modules/m_resv.c (File Modified) - ircd-ratbox/trunk/modules/m_services.c (File Modified) - ircd-ratbox/trunk/modules/m_set.c (File Modified) - ircd-ratbox/trunk/modules/m_stats.c (File Modified) - ircd-ratbox/trunk/modules/m_svinfo.c (File Modified) - ircd-ratbox/trunk/modules/m_tb.c (File Modified) - ircd-ratbox/trunk/modules/m_testline.c (File Modified) - ircd-ratbox/trunk/modules/m_testmask.c (File Modified) - ircd-ratbox/trunk/modules/m_time.c (File Modified) - ircd-ratbox/trunk/modules/m_topic.c (File Modified) - ircd-ratbox/trunk/modules/m_trace.c (File Modified) - ircd-ratbox/trunk/modules/m_unreject.c (File Modified) - ircd-ratbox/trunk/modules/m_user.c (File Modified) - ircd-ratbox/trunk/modules/m_userhost.c (File Modified) - ircd-ratbox/trunk/modules/m_version.c (File Modified) - ircd-ratbox/trunk/modules/m_wallops.c (File Modified) - ircd-ratbox/trunk/modules/m_who.c (File Modified) - ircd-ratbox/trunk/modules/m_whois.c (File Modified) - ircd-ratbox/trunk/modules/m_whowas.c (File Modified) - ircd-ratbox/trunk/modules/m_xline.c (File Modified) - ircd-ratbox/trunk/modules/static_modules.c (File Modified) - ircd-ratbox/trunk/src/bandbi.c (File Modified) - ircd-ratbox/trunk/src/cache.c (File Modified) - ircd-ratbox/trunk/src/channel.c (File Modified) - ircd-ratbox/trunk/src/class.c (File Modified) - ircd-ratbox/trunk/src/client.c (File Modified) - ircd-ratbox/trunk/src/dns.c (File Modified) - ircd-ratbox/trunk/src/getopt.c (File Modified) - ircd-ratbox/trunk/src/hash.c (File Modified) - ircd-ratbox/trunk/src/hook.c (File Modified) - ircd-ratbox/trunk/src/hostmask.c (File Modified) - ircd-ratbox/trunk/src/ipv4_from_ipv6.c (File Modified) - ircd-ratbox/trunk/src/ircd.c (File Modified) - ircd-ratbox/trunk/src/ircd_signal.c (File Modified) - ircd-ratbox/trunk/src/listener.c (File Modified) - ircd-ratbox/trunk/src/match.c (File Modified) - ircd-ratbox/trunk/src/modules.c (File Modified) - ircd-ratbox/trunk/src/monitor.c (File Modified) - ircd-ratbox/trunk/src/newconf.c (File Modified) - ircd-ratbox/trunk/src/operhash.c (File Modified) - ircd-ratbox/trunk/src/packet.c (File Modified) - ircd-ratbox/trunk/src/parse.c (File Modified) - ircd-ratbox/trunk/src/reject.c (File Modified) - ircd-ratbox/trunk/src/s_auth.c (File Modified) - ircd-ratbox/trunk/src/s_conf.c (File Modified) - ircd-ratbox/trunk/src/s_log.c (File Modified) - ircd-ratbox/trunk/src/s_newconf.c (File Modified) - ircd-ratbox/trunk/src/s_serv.c (File Modified) - ircd-ratbox/trunk/src/s_user.c (File Modified) - ircd-ratbox/trunk/src/scache.c (File Modified) - ircd-ratbox/trunk/src/send.c (File Modified) - ircd-ratbox/trunk/src/sslproc.c (File Modified) - ircd-ratbox/trunk/src/substitution.c (File Modified) - ircd-ratbox/trunk/src/supported.c (File Modified) - ircd-ratbox/trunk/src/whowas.c (File Modified) - - -androsyn 2015/08/21 00:26:34 UTC (20150821_2-28621) - Log: - make function names for bandbi be prefixed with bandb_ consistently - - Modified: - ircd-ratbox/trunk/include/bandbi.h (File Modified) - ircd-ratbox/trunk/src/bandbi.c (File Modified) - ircd-ratbox/trunk/src/ircd.c (File Modified) - - -androsyn 2015/08/21 00:21:34 UTC (20150821_1-28619) - Log: - style changes - - Modified: - ircd-ratbox/trunk/src/whowas.c (File Modified) - - -androsyn 2015/08/21 00:19:50 UTC (20150821_0-28617) - Log: - change hash_whowas_name to whowas_hash_name - - Modified: - ircd-ratbox/trunk/src/whowas.c (File Modified) - - -androsyn 2015/08/20 19:17:02 UTC (20150820_10-28615) - Log: - further updates for the ircd -> ircd-ratbox changes from jackal^@EFnet - - Modified: - ircd-ratbox/trunk/INSTALL (File Modified) - ircd-ratbox/trunk/doc/example.conf (File Modified) - ircd-ratbox/trunk/doc/ircd_crontab.sh (File Modified) - ircd-ratbox/trunk/include/config.h (File Modified) - ircd-ratbox/trunk/src/ircd.c (File Modified) - - -androsyn 2015/08/20 18:56:41 UTC (20150820_9-28613) - Log: - use the correct parameter for the creation date - - Modified: - ircd-ratbox/trunk/src/s_user.c (File Modified) - - -androsyn 2015/08/20 18:56:30 UTC (20150820_8-28611) - Log: - fix core dump - - Modified: - ircd-ratbox/trunk/src/version.c.SH (File Modified) - - -androsyn 2015/08/20 18:52:32 UTC (20150820_7-28609) - Log: - automake rerun - - Modified: - ircd-ratbox/trunk/src/Makefile.in (File Modified) - - -androsyn 2015/08/20 18:49:56 UTC (20150820_6-28607) - Log: - fix version.c rebuilding/generation number - - Modified: - ircd-ratbox/trunk/src/Makefile.am (File Modified) - ircd-ratbox/trunk/src/Makefile.in (File Modified) - ircd-ratbox/trunk/src/version.c.SH (File Modified) - - -androsyn 2015/08/20 18:34:45 UTC (20150820_5-28605) - Log: - change binary name from ircd to ircd-ratbox - - Modified: - ircd-ratbox/trunk/Makefile.am (File Modified) - ircd-ratbox/trunk/Makefile.in (File Modified) - ircd-ratbox/trunk/src/Makefile.in (File Modified) - - -androsyn 2015/08/20 18:28:49 UTC (20150820_4-28603) - Log: - change default prefix to /usr/local/ircd-ratbox - - Modified: - ircd-ratbox/trunk/configure (File Modified) - ircd-ratbox/trunk/configure.ac (File Modified) - - -androsyn 2015/08/20 18:20:25 UTC (20150820_3-28601) - Log: - reset of the version cleanup - - Modified: - ircd-ratbox/trunk/bandb/bantool.c (File Modified) - ircd-ratbox/trunk/include/ircd.h (File Modified) - ircd-ratbox/trunk/include/version.h (File Modified) - ircd-ratbox/trunk/modules/m_info.c (File Modified) - ircd-ratbox/trunk/modules/m_trace.c (File Modified) - ircd-ratbox/trunk/modules/m_version.c (File Modified) - ircd-ratbox/trunk/src/Makefile.am (File Modified) - ircd-ratbox/trunk/src/Makefile.in (File Modified) - ircd-ratbox/trunk/src/ircd.c (File Modified) - ircd-ratbox/trunk/src/s_user.c (File Modified) - ircd-ratbox/trunk/src/version.c.SH (File Modified) - - -androsyn 2015/08/20 17:58:25 UTC (20150820_2-28599) - Log: - rebuild automake - - - Modified: - ircd-ratbox/trunk/Makefile.in (File Modified) - ircd-ratbox/trunk/bandb/Makefile.in (File Modified) - ircd-ratbox/trunk/bandb/sqlite3/Makefile.in (File Modified) - ircd-ratbox/trunk/contrib/Makefile.in (File Modified) - ircd-ratbox/trunk/help/Makefile.in (File Modified) - ircd-ratbox/trunk/modules/Makefile.in (File Modified) - ircd-ratbox/trunk/resolver/Makefile.in (File Modified) - ircd-ratbox/trunk/src/Makefile.in (File Modified) - ircd-ratbox/trunk/ssld/Makefile.in (File Modified) - ircd-ratbox/trunk/tools/Makefile.in (File Modified) - - -androsyn 2015/08/20 17:58:12 UTC (20150820_1-28597) - Log: - Rework version.c a bit, next part of the patch is coming - - - Modified: - ircd-ratbox/trunk/include/patchlevel.h (File Deleted) - ircd-ratbox/trunk/include/version.h (File Added) - ircd-ratbox/trunk/src/Makefile.am (File Modified) - ircd-ratbox/trunk/src/version.c.SH (File Modified) - - -androsyn 2015/08/20 15:54:48 UTC (20150820_0-28595) - Log: - Rename whowas function to be whowas_* no functional changes otherwise. - - - - Modified: - ircd-ratbox/trunk/include/whowas.h (File Modified) - ircd-ratbox/trunk/modules/core/m_kill.c (File Modified) - ircd-ratbox/trunk/modules/core/m_nick.c (File Modified) - ircd-ratbox/trunk/modules/m_whowas.c (File Modified) - ircd-ratbox/trunk/src/client.c (File Modified) - ircd-ratbox/trunk/src/ircd.c (File Modified) - ircd-ratbox/trunk/src/newconf.c (File Modified) - ircd-ratbox/trunk/src/whowas.c (File Modified) - - -androsyn 2015/08/19 23:03:14 UTC (20150819_3-28593) - Log: - show information from mallinfo on platforms that have it(glibc mainly) - - Modified: - ircd-ratbox/trunk/configure (File Modified) - ircd-ratbox/trunk/configure.ac (File Modified) - ircd-ratbox/trunk/include/setup.h.in (File Modified) - ircd-ratbox/trunk/modules/m_stats.c (File Modified) - - -androsyn 2015/08/19 15:54:06 UTC (20150819_2-28591) - Log: - move get_vm_top to be one of the earliest functions called, to not miss any allocations - - Modified: - ircd-ratbox/trunk/src/ircd.c (File Modified) - - -androsyn 2015/08/19 15:44:34 UTC (20150819_1-28589) - Log: - fix logic inversion with mod_find_name on module reload - - Modified: - ircd-ratbox/trunk/src/modules.c (File Modified) - - -androsyn 2015/08/19 15:23:58 UTC (20150819_0-28587) - Log: - have get_maxrss use uintptr_t - - Modified: - ircd-ratbox/trunk/include/ircd.h (File Modified) - ircd-ratbox/trunk/modules/m_stats.c (File Modified) - ircd-ratbox/trunk/src/ircd.c (File Modified) - - -androsyn 2015/08/13 19:04:08 UTC (20150813_6-28585) - Log: - whitespace/style cleanups - - Modified: - ircd-ratbox/trunk/src/s_auth.c (File Modified) - - -androsyn 2015/08/13 18:57:01 UTC (20150813_5-28583) - Log: - get rid of camel case on GetValidIdent and change to get_valid_ident - - Modified: - ircd-ratbox/trunk/src/s_auth.c (File Modified) - - -androsyn 2015/08/13 18:53:58 UTC (20150813_4-28581) - Log: - use bool for ipv4_from_ipv6 and fix types - - Modified: - ircd-ratbox/trunk/include/ipv4_from_ipv6.h (File Modified) - ircd-ratbox/trunk/src/ipv4_from_ipv6.c (File Modified) - - -androsyn 2015/08/13 17:24:11 UTC (20150813_3-28577) - Log: - more sizeof style changes - - Modified: - ircd-ratbox/trunk/src/supported.c (File Modified) - - -androsyn 2015/08/13 17:22:50 UTC (20150813_2-28575) - Log: - replace sizeof result with sizeof(result) - - Modified: - ircd-ratbox/trunk/src/supported.c (File Modified) - - -androsyn 2015/08/13 17:21:54 UTC (20150813_1-28573) - Log: - rework the ipv6 tunnel remap code to only check against k/d lines and channel bans - - Modified: - ircd-ratbox/trunk/include/ipv4_from_ipv6.h (File Modified) - ircd-ratbox/trunk/src/channel.c (File Modified) - ircd-ratbox/trunk/src/hostmask.c (File Modified) - ircd-ratbox/trunk/src/ipv4_from_ipv6.c (File Modified) - ircd-ratbox/trunk/src/listener.c (File Modified) - - -androsyn 2015/08/13 15:21:14 UTC (20150813_0-28571) - Log: - remove the existing ipv6_tun_remap code, need to rework it - - Modified: - ircd-ratbox/trunk/doc/example.conf (File Modified) - ircd-ratbox/trunk/src/listener.c (File Modified) - - -androsyn 2015/08/11 03:11:43 UTC (20150811_3-28569) - Log: - add more #pragmas to turn of some warnings, minor cleanups - - Modified: - ircd-ratbox/trunk/bandb/bandb.c (File Modified) - ircd-ratbox/trunk/bandb/rsdb_sqlite3.c (File Modified) - ircd-ratbox/trunk/include/channel.h (File Modified) - ircd-ratbox/trunk/modules/core/m_die.c (File Modified) - ircd-ratbox/trunk/modules/m_restart.c (File Modified) - ircd-ratbox/trunk/resolver/res.c (File Modified) - ircd-ratbox/trunk/resolver/resolver.c (File Modified) - ircd-ratbox/trunk/src/bandbi.c (File Modified) - ircd-ratbox/trunk/src/channel.c (File Modified) - ircd-ratbox/trunk/src/client.c (File Modified) - ircd-ratbox/trunk/src/hash.c (File Modified) - ircd-ratbox/trunk/src/ircd.c (File Modified) - ircd-ratbox/trunk/src/newconf.c (File Modified) - ircd-ratbox/trunk/src/s_newconf.c (File Modified) - ircd-ratbox/trunk/src/s_serv.c (File Modified) - ircd-ratbox/trunk/ssld/ssld.c (File Modified) - - -androsyn 2015/08/11 03:09:14 UTC (20150811_2-28567) - Log: - use empty string on certfp/cstring - - Modified: - ircd-ratbox/trunk/src/sslproc.c (File Modified) - - -androsyn 2015/08/11 03:08:50 UTC (20150811_1-28565) - Log: - * When converting incoming request ids, verify that the id is below sized DNS_IDTABLE_SIZE before trying to do anything with it. - * When looking to assign the DNS request id, if all slots are full, give up, don't keep spinning - - - - Modified: - ircd-ratbox/trunk/src/dns.c (File Modified) - - -androsyn 2015/08/11 03:06:52 UTC (20150811_0-28563) - Log: - add must checks for lookup_hostname and lookup_ip, a return of 0 is failure - - Modified: - ircd-ratbox/trunk/include/dns.h (File Modified) - - -androsyn 2015/08/10 22:02:36 UTC (20150810_9-28549) - Log: - well, the ipv6_tun_remap code went in with the last commit by accident, just noting the change in the next commit - - Modified: - ircd-ratbox/trunk/doc/example.conf (File Modified) - - -androsyn 2015/08/10 22:01:39 UTC (20150810_8-28547) - Log: - update svn:externals for libratbox - - Modified: - ircd-ratbox/trunk/ (Property Modified) - ircd-ratbox/trunk/doc/example.conf (File Modified) - ircd-ratbox/trunk/include/s_conf.h (File Modified) - ircd-ratbox/trunk/src/Makefile.in (File Modified) - ircd-ratbox/trunk/src/listener.c (File Modified) - ircd-ratbox/trunk/src/newconf.c (File Modified) - - -androsyn 2015/08/10 21:41:17 UTC (20150810_7-28543) - Log: - Copy ircd-ratbox-clean to trunk. This will be used for further development - - - Modified: - ircd-ratbox/trunk/ (File Added) - - -androsyn 2015/08/10 19:47:37 UTC (20150810_6-28539) - Log: - second half of module changes - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/newconf.c (File Modified) - - -androsyn 2015/08/10 19:42:54 UTC (20150810_5-28537) - Log: - remove dead code - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/modules.c (File Modified) - - -androsyn 2015/08/10 19:36:57 UTC (20150810_4-28535) - Log: - convert module code to use rb_dlink_list instead of a hand rolled array - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/modules.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/modules.c (File Modified) - - -androsyn 2015/08/10 18:59:28 UTC (20150810_3-28533) - Log: - use memmove for overlapping memory - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/modules.c (File Modified) - - -androsyn 2015/08/10 18:49:18 UTC (20150810_2-28531) - Log: - free rbl lists correctly - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_auth.c (File Modified) - - -androsyn 2015/08/10 17:02:12 UTC (20150810_1-28527) - Log: - fix missing ) - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/client.c (File Modified) - - -androsyn 2015/08/10 16:47:30 UTC (20150810_0-28525) - Log: - change back to comment - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/client.c (File Modified) - - -androsyn 2015/08/07 17:30:54 UTC (20150807_7-28523) - Log: - fix formatting - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/doc/example.conf (File Modified) - - -androsyn 2015/08/07 16:17:10 UTC (20150807_6-28521) - Log: - don't leak an rb_ssl_ctx when parsing the config - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/newconf.c (File Modified) - - -androsyn 2015/08/07 16:16:51 UTC (20150807_5-28519) - Log: - fix example config - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/doc/example.conf (File Modified) - - -androsyn 2015/08/07 12:49:52 UTC (20150807_4-28515) - Log: - fix double free that resulted from a half of a code cleanup - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/client.c (File Modified) - - -androsyn 2015/08/07 03:53:11 UTC (20150807_3-28513) - Log: - cleanup the rest of the fprintfs - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_auth.c (File Modified) - - -androsyn 2015/08/07 03:46:23 UTC (20150807_2-28511) - Log: - no you are match_other_answer - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/newconf.c (File Modified) - - -androsyn 2015/08/07 03:46:04 UTC (20150807_1-28509) - Log: - remove some fprintfs and generally tidy up - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_auth.c (File Modified) - - -androsyn 2015/08/07 03:37:31 UTC (20150807_0-28507) - Log: - More RBL related changes. - - Delay the exit of RBL banned clients by generalizing the delayed exit code from the reject cache. - REHASH seems to work now and update the RBL lists etc - - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/doc/example.conf (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/s_auth.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/s_conf.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/newconf.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/reject.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_auth.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_conf.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_user.c (File Modified) - - -androsyn 2015/08/06 17:16:39 UTC (20150806_9-28505) - Log: - make delayed_exit_time configurable from ircd.conf - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/reject.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/s_conf.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/newconf.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/reject.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_conf.c (File Modified) - - -androsyn 2015/08/06 17:10:20 UTC (20150806_8-28503) - Log: - update example.conf to reflex the new blacklist conifg - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/doc/example.conf (File Modified) - - -androsyn 2015/08/06 16:39:52 UTC (20150806_7-28501) - Log: - More RBL related changes. Also add delayed exiting for RBL banned clients - - - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/doc/example.conf (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/client.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/reject.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/s_auth.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/client.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/newconf.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/reject.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_auth.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_user.c (File Modified) - - -androsyn 2015/08/06 16:38:55 UTC (20150806_6-28499) - Log: - remove fprintf debugging - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/resolver/resolver.c (File Modified) - - -androsyn 2015/08/06 03:35:41 UTC (20150806_5-28497) - Log: - add update make - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/Makefile.am (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/Makefile.in (File Modified) - - -androsyn 2015/08/06 03:35:22 UTC (20150806_4-28495) - Log: - let me just borrow this here file from charbydis as well - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/ipv4_from_ipv6.h (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/ipv4_from_ipv6.c (File Added) - - -androsyn 2015/08/06 03:16:39 UTC (20150806_3-28493) - Log: - Add substitution.c - - Thanks to the charybdis guys and neonlod in particular for writing some rather handy code :) - - - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/substitution.h (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/Makefile.am (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/substitution.c (File Added) - - -androsyn 2015/08/06 02:51:35 UTC (20150806_2-28491) - Log: - handle longer hostnames to deal with rbls - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/resolver/res.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/resolver/res.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/resolver/reslib.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_auth.c (File Modified) - - -androsyn 2015/08/06 02:45:00 UTC (20150806_1-28489) - Log: - rbl function name cleanups - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/s_auth.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/newconf.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_auth.c (File Modified) - - -androsyn 2015/08/06 02:43:39 UTC (20150806_0-28487) - Log: - check if handler is NULL for a module, use m_ignore instead of dereferencing a null pointer - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/parse.c (File Modified) - - -androsyn 2015/08/05 20:41:34 UTC (20150805_0-28485) - Log: - First pass at RBL support. RBL checks seem to work, there is still a lot of debugging to go here though - - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/doc/example.conf (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/client.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/dns.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/s_auth.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/struct.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/resolver/resolver.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/dns.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/newconf.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_auth.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_user.c (File Modified) - - -androsyn 2015/08/03 16:07:59 UTC (20150803_0-28483) - Log: - initialize the rest of the handlers - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/contrib/m_reportssl.c (File Modified) - - -androsyn 2015/08/02 18:40:52 UTC (20150802_0-28481) - Log: - fix end of whowas formatting - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/numeric.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/ssld.c (File Modified) - - -androsyn 2015/07/31 19:08:10 UTC (20150731_3-28477) - Log: - fix typo on install-data-local - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/Makefile.am (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/Makefile.in (File Modified) - - -androsyn 2015/07/31 18:46:18 UTC (20150731_2-28475) - Log: - bleh..fix namespace conflicts on mingw - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/resolver/getaddrinfo.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/resolver/getaddrinfo.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/resolver/getnameinfo.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/resolver/getnameinfo.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/resolver/reslib.c (File Modified) - - -androsyn 2015/07/31 16:55:04 UTC (20150731_1-28465) - Log: - update the stable tree related info. i'll figure out what to do with trunk soon - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/SVN-Access (File Modified) - - -androsyn 2015/07/31 15:51:16 UTC (20150731_0-28463) - Log: - update libltdl - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/Makefile.am (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/aclocal.m4 (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/config/compile (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/config/depcomp (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/config/install-sh (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/config/missing (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/config/ylwrap (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/configure (File Modified) - - -androsyn 2015/07/29 19:02:42 UTC (20150729_4-28459) - Log: - oops fix merge issue - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/configure (File Modified) - - -androsyn 2015/07/29 19:01:22 UTC (20150729_3-28457) - Log: - fix configure - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/configure (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/configure.ac (File Modified) - - -androsyn 2015/07/29 18:50:50 UTC (20150729_2-28453) - Log: - add cygwin to have_win - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/configure (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/configure.ac (File Modified) - - -androsyn 2015/07/29 18:24:44 UTC (20150729_1-28451) - Log: - Fix oper_motd_path - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/doc/example.conf (File Modified) - - -androsyn 2015/07/29 17:44:03 UTC (20150729_0-28449) - Log: - fix a missing ; - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/doc/example.conf (File Modified) - - -androsyn 2015/07/28 20:21:12 UTC (20150728_8-28447) - Log: - fix memset swap error - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/tools/mkpasswd.c (File Modified) - - -androsyn 2015/07/28 19:46:49 UTC (20150728_7-28445) - Log: - i hate autoconf - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/configure (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/configure.ac (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/aclocal.m4 (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/configure (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/loaders/.deps/dlopen.Plo (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/loaders/.deps/libltdlc_la-preopen.Plo (File Modified) - - -androsyn 2015/07/28 19:42:36 UTC (20150728_6-28443) - Log: - fix RBTT_FMT for mingw - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/stdinc.h (File Modified) - - -androsyn 2015/07/28 19:11:30 UTC (20150728_5-28441) - Log: - add back rb_inet_pton - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/resolver/resolver.c (File Modified) - - -androsyn 2015/07/28 18:37:20 UTC (20150728_4-28435) - Log: - continue to include rb_inet_ntop as well - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/listener.c (File Modified) - - -androsyn 2015/07/28 18:19:49 UTC (20150728_3-28431) - Log: - change inet_pton to rb_inet_pton - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/match.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/newconf.c (File Modified) - - -androsyn 2015/07/28 17:29:58 UTC (20150728_2-28421) - Log: - cast ptr->data to struct Channel - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/client.c (File Modified) - - -androsyn 2015/07/28 16:48:08 UTC (20150728_1-28419) - Log: - update sqlite3 - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/sqlite3/shell.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/sqlite3/sqlite3.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/sqlite3/sqlite3.h (File Modified) - - -androsyn 2015/07/28 16:45:55 UTC (20150728_0-28417) - Log: - Fix building/not building libltdl if its installed or not - - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/Makefile.am (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/aclocal.m4 (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/sqlite3/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/configure (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/configure.ac (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/contrib/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/help/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/resolver/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/tools/Makefile.in (File Modified) - - -androsyn 2015/07/27 03:10:58 UTC (20150727_3-28415) - Log: - err nm - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/ssld.c (File Modified) - - -androsyn 2015/07/27 03:10:10 UTC (20150727_2-28413) - Log: - further allocation increases - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/ssld.c (File Modified) - - -androsyn 2015/07/27 03:07:47 UTC (20150727_1-28411) - Log: - no really, we don't need to default everyones ssld to use select - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/ssld.c (File Modified) - - -androsyn 2015/07/27 03:05:22 UTC (20150727_0-28409) - Log: - use larger size for SO_SNDBUF for the unix sockets for ssld - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/sslproc.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/ssld.c (File Modified) - - -androsyn 2015/07/26 22:52:44 UTC (20150726_6-28403) - Log: - fix sslproc too - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/sslproc.c (File Modified) - - -androsyn 2015/07/26 22:47:53 UTC (20150726_5-28401) - Log: - rework generating the K command for ssld - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/sslproc.c (File Modified) - - -androsyn 2015/07/26 21:45:00 UTC (20150726_4-28399) - Log: - use some of our new string handling functions - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/ssld.c (File Modified) - - -androsyn 2015/07/26 20:05:09 UTC (20150726_3-28395) - Log: - rework ssld setup handling a little bit - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/sslproc.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/ssld.c (File Modified) - - -androsyn 2015/07/26 07:01:22 UTC (20150726_2-28393) - Log: - move bandb_del_letter up higher into the file and make it const char as well - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/bandbi.c (File Modified) - - -androsyn 2015/07/26 06:58:12 UTC (20150726_1-28391) - Log: - odd, bandb_letter was not const char - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/bandb.c (File Modified) - - -androsyn 2015/07/26 06:46:45 UTC (20150726_0-28389) - Log: - close everything but fd 0-2 for now in ssld, but actually close everything else - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/ssld.c (File Modified) - - -androsyn 2015/07/24 19:25:52 UTC (20150724_6-28385) - Log: - remove unneeded code to test the ssl setup, it gets tested in newconf.c - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/ircd.c (File Modified) - - -androsyn 2015/07/24 19:25:36 UTC (20150724_5-28383) - Log: - minor cleanup - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/newconf.c (File Modified) - - -androsyn 2015/07/24 19:24:42 UTC (20150724_4-28381) - Log: - use sizeof(readBuf) instead of READBUF_SIZE directly - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/packet.c (File Modified) - - -androsyn 2015/07/24 18:26:09 UTC (20150724_3-28379) - Log: - fix printf style formatting warnings on 32bit freebsd - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_stats.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_testline.c (File Modified) - - -androsyn 2015/07/24 18:11:56 UTC (20150724_2-28377) - Log: - add m_reportssl.c to contrib - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/contrib/m_reportssl.c (File Added) - - -androsyn 2015/07/24 18:01:46 UTC (20150724_1-28375) - Log: - fix formatting - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/contrib/m_mallinfo.c (File Modified) - - -androsyn 2015/07/24 17:51:19 UTC (20150724_0-28373) - Log: - add m_mallinfo.c to get malloc arena info on gnu libc systems. does not get built by default - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/contrib/m_mallinfo.c (File Added) - - -androsyn 2015/07/21 17:37:12 UTC (20150721_0-28353) - Log: - remove static variables from rsdb_sqlite3 and pass a pointer down through for the sqlite3 database "connection" - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/bandb.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/bantool.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/rsdb.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/rsdb_sqlite3.c (File Modified) - - -androsyn 2015/07/17 17:58:04 UTC (20150717_5-28351) - Log: - Of all of the interfaces to emulate, clicap_find uses the strtok model? Yikes. Convert clicap_find to at least use a strtok_r model - - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_cap.c (File Modified) - - -androsyn 2015/07/17 17:30:31 UTC (20150717_4-28349) - Log: - well i think that static char really needed to be there... - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_cap.c (File Modified) - - -androsyn 2015/07/17 03:49:04 UTC (20150717_3-28347) - Log: - handle not having a ca cert correctly - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/sslproc.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/ssld.c (File Modified) - - -androsyn 2015/07/17 03:48:46 UTC (20150717_2-28345) - Log: - increment patchlevel - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/patchlevel.h (File Modified) - - -androsyn 2015/07/17 02:04:08 UTC (20150717_1-28343) - Log: - remove debug fprintfs - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/ssld.c (File Modified) - - -androsyn 2015/07/17 01:55:09 UTC (20150717_0-28341) - Log: - collect certfp, we don't do anything with it yet - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/struct.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/client.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/sslproc.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/ssld.c (File Modified) - - -androsyn 2015/07/16 20:23:12 UTC (20150716_12-28335) - Log: - fix tls_min_version handling - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/doc/example.conf (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/newconf.c (File Modified) - - -androsyn 2015/07/16 20:10:25 UTC (20150716_11-28333) - Log: - actually load the ca certificate - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/sslproc.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/ircd.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/newconf.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/sslproc.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/ssld.c (File Modified) - - -androsyn 2015/07/16 19:45:04 UTC (20150716_10-28327) - Log: - display cipher string in whois a bit differently - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_whois.c (File Modified) - - -androsyn 2015/07/16 18:54:17 UTC (20150716_9-28323) - Log: - report TLS version on server connection/stats ? - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_serv.c (File Modified) - - -androsyn 2015/07/16 18:53:59 UTC (20150716_8-28321) - Log: - actually send the cipher - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/ssld.c (File Modified) - - -androsyn 2015/07/16 18:27:28 UTC (20150716_7-28317) - Log: - complete rb_ssl*sctx to rb_ssl*ctx change - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/ircd.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/ssld.c (File Modified) - - -androsyn 2015/07/16 18:01:11 UTC (20150716_6-28309) - Log: - support setting minimum TLS version - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/numeric.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/s_conf.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/sslproc.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/struct.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_whois.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/client.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/ircd.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/newconf.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/sslproc.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/ssld.c (File Modified) - - -androsyn 2015/07/16 18:00:22 UTC (20150716_5-28307) - Log: - update example.conf for new tls stuff - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/doc/example.conf (File Modified) - - -androsyn 2015/07/16 08:03:12 UTC (20150716_4-28305) - Log: - more ssl api related cleanups - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/ssld.c (File Modified) - - -androsyn 2015/07/16 04:31:50 UTC (20150716_3-28299) - Log: - lets do the math right and let them handshake at least once more - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/ssld.c (File Modified) - - -androsyn 2015/07/16 04:25:34 UTC (20150716_2-28297) - Log: - rework ssl handshake detection - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/ssld.c (File Modified) - - -androsyn 2015/07/16 01:38:38 UTC (20150716_1-28293) - Log: - remove an unneeded if block - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/rsdb_sqlite3.c (File Modified) - - -androsyn 2015/07/16 01:34:26 UTC (20150716_0-28291) - Log: - adjust handshake flood parameters - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/ssld.c (File Modified) - - -androsyn 2015/07/15 21:00:47 UTC (20150715_14-28289) - Log: - make bantool use unquoted %Qs - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/bantool.c (File Modified) - - -androsyn 2015/07/15 20:56:45 UTC (20150715_13-28287) - Log: - Make bandb use the sqlite3_vsnprintf formatter to format the exec strings, this supports the %Q modifier, making life so muche asier... - - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/bandb.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/bantool.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/rsdb.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/rsdb_sqlite3.c (File Modified) - - -androsyn 2015/07/15 20:31:10 UTC (20150715_12-28285) - Log: - add a missing line feed - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/bandb_defs.h (File Modified) - - -androsyn 2015/07/15 19:53:29 UTC (20150715_11-28283) - Log: - fix formatting - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/numeric.h (File Modified) - - -androsyn 2015/07/15 19:53:11 UTC (20150715_10-28281) - Log: - fix rehashing ssl - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/sslproc.c (File Modified) - - -androsyn 2015/07/15 18:51:10 UTC (20150715_9-28279) - Log: - use RBTT_FMT for connected times - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/client.c (File Modified) - - -androsyn 2015/07/15 18:33:39 UTC (20150715_8-28275) - Log: - fix the time_t formatting clusterfsck - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/stdinc.h (File Modified) - - -androsyn 2015/07/15 16:55:03 UTC (20150715_7-28273) - Log: - more type cleanups - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/ssld.c (File Modified) - - -androsyn 2015/07/15 16:49:39 UTC (20150715_6-28271) - Log: - have level be signed - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/sslproc.c (File Modified) - - -androsyn 2015/07/15 16:49:24 UTC (20150715_5-28269) - Log: - Fix compile error - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/listener.c (File Modified) - - -androsyn 2015/07/15 16:48:03 UTC (20150715_4-28267) - Log: - more minor cleanups - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/ssld.c (File Modified) - - -androsyn 2015/07/15 16:39:48 UTC (20150715_3-28265) - Log: - use ssize_t and uintptr_t in a few spots - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/ssld.c (File Modified) - - -androsyn 2015/07/15 01:46:39 UTC (20150715_2-28261) - Log: - make toofast like everything else - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/listener.c (File Modified) - - -androsyn 2015/07/15 01:44:25 UTC (20150715_1-28259) - Log: - add bandb_defs.h - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/bandb_defs.h (File Added) - - -androsyn 2015/07/15 01:34:41 UTC (20150715_0-28257) - Log: - use ptrdiff_t for have - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/ssld.c (File Modified) - - -androsyn 2015/07/14 18:22:16 UTC (20150714_6-28255) - Log: - use uintptr_t for doing pointer math - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/sslproc.c (File Modified) - - -androsyn 2015/07/14 18:08:10 UTC (20150714_5-28253) - Log: - use sizeof(listener->addr) - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/listener.c (File Modified) - - -androsyn 2015/07/14 18:06:49 UTC (20150714_4-28251) - Log: - rb_init_rawbuffers has been removed - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/ssld.c (File Modified) - - -androsyn 2015/07/14 17:26:07 UTC (20150714_3-28243) - Log: - Add support for setting ecdh parameters. Disable support for SSLv3 and TLS compression as well - - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/s_conf.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/sslproc.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/ircd.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/newconf.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/sslproc.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/ssld.c (File Modified) - - -androsyn 2015/07/14 16:17:03 UTC (20150714_2-28233) - Log: - finish up the merge of BUFSIZE/IRCD_BUFSIZE - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/bantool.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/rsdb_sqlite3.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/ircd_defs.h (File Modified) - - -androsyn 2015/07/14 16:16:46 UTC (20150714_1-28231) - Log: - make contrib compile - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/contrib/m_flags.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/contrib/m_force.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/contrib/m_mkpasswd.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/contrib/m_okick.c (File Modified) - - -androsyn 2015/07/14 15:42:43 UTC (20150714_0-28229) - Log: - move bandb_type enums into a common file that can be included in both bandb/bandb.c and src/bandbi.c - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/bandb.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/bandbi.h (File Modified) - - -androsyn 2015/07/13 17:17:07 UTC (20150713_0-28223) - Log: - Remove srand/rand crap - - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/ircd.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_user.c (File Modified) - - -androsyn 2015/07/11 02:02:45 UTC (20150711_1-28221) - Log: - remove unnecessary breaks - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_mode.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_server.c (File Modified) - - -androsyn 2015/07/11 01:59:06 UTC (20150711_0-28219) - Log: - have entity flags use an enum. - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_message.c (File Modified) - - -androsyn 2015/07/10 17:59:41 UTC (20150710_24-28217) - Log: - add guard defines for stdinc.h - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/stdinc.h (File Modified) - - -androsyn 2015/07/10 17:58:39 UTC (20150710_23-28215) - Log: - missed a FALSE - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_mode.c (File Modified) - - -androsyn 2015/07/10 17:49:53 UTC (20150710_22-28209) - Log: - How many ways to we need to have #defines for YES/TRUE/1 etc...use C99 true/false for these... - - - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/bandb.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/bantool.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/ircd_defs.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/match.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/s_user.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_join.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_message.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_gline.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_gungline.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_kline.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_names.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_oper.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_who.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/ircd_lexer.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/ircd_lexer.l (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/match.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_newconf.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_user.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/send.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/supported.c (File Modified) - - -androsyn 2015/07/10 17:34:10 UTC (20150710_21-28207) - Log: - Cleanup BUFSIZE/IRCD_BUFSIZE. I'm not sure why both BUFSIZE and IRCD_BUFSIZE were defined, so we'll just use IRCD_BUFSIZE for all. - - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/common.h (File Deleted) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/ircd_defs.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/stdinc.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_join.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_kick.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_kill.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_mode.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_server.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_accept.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_cap.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_encap.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_ison.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_knock.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_map.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_monitor.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_names.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_oper.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_operspy.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_restart.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_services.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_user.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_userhost.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_whois.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/bandbi.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/cache.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/channel.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/client.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/listener.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/match.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_log.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_newconf.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_serv.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_user.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/send.c (File Modified) - - -androsyn 2015/07/10 17:33:35 UTC (20150710_20-28205) - Log: - change was_here to bool - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/ircd.c (File Modified) - - -androsyn 2015/07/10 17:22:17 UTC (20150710_19-28203) - Log: - replace some instances of a magic value of 512 with IRCD_BUFSIZE as these were likely set to match - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_trace.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_log.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/supported.c (File Modified) - - -androsyn 2015/07/10 17:18:27 UTC (20150710_18-28201) - Log: - Wow..report_error() is a really, really terrible function. Remove it and replace it with sendto_realops_flags/ilog in the approriate places - - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/s_log.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_server.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/client.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/listener.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_log.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_serv.c (File Modified) - - -androsyn 2015/07/10 16:46:29 UTC (20150710_17-28199) - Log: - use designated initializers for bandb_add_letter - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/bandbi.c (File Modified) - - -androsyn 2015/07/10 16:40:23 UTC (20150710_16-28197) - Log: - mark several functions with noreturn - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/ircd.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_die.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/ircd.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/ircd_signal.c (File Modified) - - -androsyn 2015/07/10 16:40:00 UTC (20150710_15-28195) - Log: - remove unused flag - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/ircd_getopt.h (File Modified) - - -androsyn 2015/07/10 16:39:35 UTC (20150710_14-28193) - Log: - comment out unused defines - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/class.c (File Modified) - - -androsyn 2015/07/10 16:39:03 UTC (20150710_13-28191) - Log: - remove dead code - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/getopt.c (File Modified) - - -androsyn 2015/07/10 16:38:19 UTC (20150710_12-28189) - Log: - set nicklen to UNSET instead of a magic -1 - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_conf.c (File Modified) - - -androsyn 2015/07/10 16:37:56 UTC (20150710_11-28187) - Log: - remove unused LOG_BUFSIZE - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/send.c (File Modified) - - -androsyn 2015/07/10 16:37:35 UTC (20150710_10-28185) - Log: - allocate start_zlib_session buffer from heap - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/sslproc.c (File Modified) - - -androsyn 2015/07/10 04:44:49 UTC (20150710_9-28183) - Log: - commit the include file too - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/s_conf.h (File Modified) - - -androsyn 2015/07/10 04:44:28 UTC (20150710_8-28181) - Log: - use an enum for verify_access reasons instead of defines - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_conf.c (File Modified) - - -androsyn 2015/07/10 04:43:40 UTC (20150710_7-28179) - Log: - init some more variables - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_cap.c (File Modified) - - -androsyn 2015/07/10 04:43:14 UTC (20150710_6-28177) - Log: - remove unused macro - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_stats.c (File Modified) - - -androsyn 2015/07/10 04:42:54 UTC (20150710_5-28175) - Log: - add RB_noreturn and use it in bandbi - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/ircd_defs.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/bandbi.c (File Modified) - - -androsyn 2015/07/10 04:42:03 UTC (20150710_4-28173) - Log: - init arglen for sanity sake - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/channel.c (File Modified) - - -androsyn 2015/07/10 03:56:59 UTC (20150710_3-28167) - Log: - init cmintime/tmintime - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_list.c (File Modified) - - -androsyn 2015/07/10 03:49:45 UTC (20150710_2-28165) - Log: - more rb_inet_pton removal - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/resolver/resolver.c (File Modified) - - -androsyn 2015/07/10 03:31:38 UTC (20150710_1-28159) - Log: - remove remains of rb_inet_pton..it is 2015, we can rely on rb_inet_pton. There are no vax left out there anymore - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/doc/CIDR.txt (File Deleted) - ircd-ratbox/branches/ircd-ratbox-cleanup/doc/Hybrid-team (File Deleted) - ircd-ratbox/branches/ircd-ratbox-cleanup/doc/old/CIDR.txt (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/doc/old/Hybrid-team (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_oper.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/listener.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/match.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/newconf.c (File Modified) - - -androsyn 2015/07/10 03:31:08 UTC (20150710_0-28157) - Log: - format cleanups - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/numeric.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_stats.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/send.c (File Modified) - - -androsyn 2015/07/08 18:43:34 UTC (20150708_3-28153) - Log: - one more sendto_one_numeric change - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/numeric.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_who.c (File Modified) - - -androsyn 2015/07/08 18:40:18 UTC (20150708_2-28151) - Log: - more sendto_one_numeric conversions still... - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/numeric.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_close.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_monitor.c (File Modified) - - -androsyn 2015/07/08 18:35:40 UTC (20150708_1-28149) - Log: - yet more sendto_one_numeric conversions - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/numeric.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_nick.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_cap.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_invite.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_names.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_rehash.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/channel.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/parse.c (File Modified) - - -androsyn 2015/07/08 18:29:23 UTC (20150708_0-28147) - Log: - more sendto_one_numeric conversions and fixups - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/numeric.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_join.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_kick.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_message.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_mode.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_nick.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_accept.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_cmessage.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_invite.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_knock.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_oper.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_pong.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_topic.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_whois.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/client.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/modules.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_user.c (File Modified) - - -androsyn 2015/07/07 16:37:00 UTC (20150707_7-28145) - Log: - more RPL_/sendto_one_numeric changes - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/numeric.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_message.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_knock.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_oper.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_testline.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_testmask.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_trace.c (File Modified) - - -androsyn 2015/07/07 16:16:53 UTC (20150707_6-28143) - Log: - More sendto_one_numeric updates - - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/numeric.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_help.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_motd.c (File Modified) - - -androsyn 2015/07/07 16:12:32 UTC (20150707_5-28141) - Log: - fix motd formatting - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/numeric.h (File Modified) - - -androsyn 2015/07/07 16:08:39 UTC (20150707_4-28139) - Log: - Update MOTD/OMOTD to use sendto_one_numeric - - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/numeric.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/cache.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_user.c (File Modified) - - -androsyn 2015/07/07 16:00:06 UTC (20150707_3-28137) - Log: - use size_t for the length parameter in ircncmp - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/match.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/match.c (File Modified) - - -androsyn 2015/07/07 15:51:52 UTC (20150707_2-28135) - Log: - use ptrdiff_t when doing pointer math - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/ssld.c (File Modified) - - -androsyn 2015/07/07 15:47:33 UTC (20150707_1-28133) - Log: - Update sqlite3 amalgmation - - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/sqlite3/shell.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/sqlite3/sqlite3.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/sqlite3/sqlite3.h (File Modified) - - -androsyn 2015/07/07 15:38:34 UTC (20150707_0-28131) - Log: - eliminate needless snprintfs as mlog can do the printf formatting just fine - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/rsdb_sqlite3.c (File Modified) - - -androsyn 2015/06/23 15:02:40 UTC (20150623_0-28127) - Log: - whitespace cleanup - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_monitor.c (File Modified) - - -androsyn 2015/06/10 16:53:00 UTC (20150610_1-28125) - Log: - free who when shrinking the whowas list - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/whowas.c (File Modified) - - -androsyn 2015/06/10 15:50:52 UTC (20150610_0-28123) - Log: - use rb_strlcpy instead of strcpy - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/whowas.c (File Modified) - - -androsyn 2015/06/04 15:35:26 UTC (20150604_1-28121) - Log: - remove operhash_find nothing used it - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/operhash.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/operhash.c (File Modified) - - -androsyn 2015/06/04 15:28:26 UTC (20150604_0-28119) - Log: - use sizeof(buff) not a magic value - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/ircd.c (File Modified) - - -androsyn 2015/05/28 01:31:21 UTC (20150528_0-28117) - Log: - make saltChars const - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/tools/mkpasswd.c (File Modified) - - -androsyn 2015/05/27 18:36:17 UTC (20150527_2-28113) - Log: - check if s2 is null as well - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/channel.c (File Modified) - - -androsyn 2015/05/27 17:54:16 UTC (20150527_1-28111) - Log: - add ELIST T support - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_list.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/supported.c (File Modified) - - -androsyn 2015/05/27 17:39:31 UTC (20150527_0-28109) - Log: - store hash values in a uint32_t rather than unsigned int. functionally its no different on most platforms - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/s_newconf.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/whowas.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/hash.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/monitor.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/operhash.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/scache.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/whowas.c (File Modified) - - -androsyn 2015/05/26 18:29:05 UTC (20150526_4-28107) - Log: - convert ERR_NEEDMOREPARAMS to use sendto_one_numeric - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/numeric.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_mode.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_dline.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_kline.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_monitor.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_resv.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_trace.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_xline.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/parse.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_user.c (File Modified) - - -androsyn 2015/05/26 17:59:35 UTC (20150526_3-28105) - Log: - detect strtoul/strtol conversion errors correctly - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_list.c (File Modified) - - -androsyn 2015/05/26 17:45:01 UTC (20150526_2-28103) - Log: - add support for the channel creation search variant of ELIST, aka LIST Cmax - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_list.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/supported.c (File Modified) - - -androsyn 2015/05/26 16:23:28 UTC (20150526_1-28101) - Log: - allocate dnsBuf on the stack - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/dns.c (File Modified) - - -androsyn 2015/05/26 16:20:13 UTC (20150526_0-28099) - Log: - style cleanup mostly. use stdbool true/false and bool type - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/sslproc.c (File Modified) - - -androsyn 2015/05/14 02:44:15 UTC (20150514_7-28097) - Log: - Make mkpasswd consistent with its usage of stderr and return values. Also verify the password for the user. - - - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/tools/mkpasswd.c (File Modified) - - -androsyn 2015/05/14 02:21:17 UTC (20150514_6-28095) - Log: - make client_dopacket static, like it's protoype said it was - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/packet.c (File Modified) - - -androsyn 2015/05/14 02:17:05 UTC (20150514_5-28093) - Log: - update autoconf - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/sqlite3/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/configure (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/configure.ac (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/contrib/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/resolver/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/Makefile.am (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/tools/Makefile.in (File Modified) - - -androsyn 2015/05/14 02:06:47 UTC (20150514_4-28091) - Log: - I'm pretty certain static module builds have been broken for quite a while. Broken no more! - - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/configure (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/configure.ac (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/modules.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/setup.h.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/static_modules.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/static_modules.c.SH (File Modified) - - -androsyn 2015/05/14 01:31:56 UTC (20150514_3-28089) - Log: - move whowas macros/defines into whowas.c - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/whowas.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/whowas.c (File Modified) - - -androsyn 2015/05/14 01:25:37 UTC (20150514_2-28087) - Log: - no reason for mod_ctl to be a defined in a global scope - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/ssld.c (File Modified) - - -androsyn 2015/05/14 01:15:56 UTC (20150514_1-28085) - Log: - tidy up things a little with named initializers - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/bandb.c (File Modified) - - -androsyn 2015/05/14 00:55:51 UTC (20150514_0-28083) - Log: - reduce the dns table size a little - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/dns.c (File Modified) - - -androsyn 2015/05/13 17:17:07 UTC (20150513_4-28081) - Log: - remove iodebug hooks. i never liked these anyways - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/configure (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/configure.ac (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_info.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/hook.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/packet.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/send.c (File Modified) - - -androsyn 2015/05/13 02:38:58 UTC (20150513_3-28079) - Log: - comment that one should not change the bandb_type enum without making the same changes in bandb/bandb.c - i should fix this some day - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/bandbi.h (File Modified) - - -androsyn 2015/05/13 02:35:06 UTC (20150513_2-28077) - Log: - Merge restart.c into ircd.c no reason for that code to be split from the rest of ircd.c..really - - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/ircd.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/restart.h (File Deleted) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_restart.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/Makefile.am (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/ircd.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/ircd_signal.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/restart.c (File Deleted) - - -androsyn 2015/05/13 02:32:49 UTC (20150513_1-28075) - Log: - rebuild autoconf - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/Makefile.am (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/Makefile.in (File Modified) - - -androsyn 2015/05/13 02:15:47 UTC (20150513_0-28071) - Log: - blarg..make autoconf stop shoving -O2 everywhere. Sometimes I want to debug things damnit - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/configure (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/configure.ac (File Modified) - - -androsyn 2015/05/12 18:04:19 UTC (20150512_4-28065) - Log: - change struct ev_entry to rb_ev_entry - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/channel.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/struct.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_message.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_gline.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_gungline.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_monitor.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/resolver/res.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/channel.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/newconf.c (File Modified) - - -androsyn 2015/05/12 17:51:17 UTC (20150512_3-28063) - Log: - change rawbuf types to rb_rawbuf - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/ssld.c (File Modified) - - -androsyn 2015/05/12 17:38:19 UTC (20150512_2-28059) - Log: - rename linebuf related structs to be prefixed with rb_ - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/struct.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/send.c (File Modified) - - -androsyn 2015/05/12 17:30:11 UTC (20150512_1-28053) - Log: - get some more variables for the linebuf changes - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_list.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_stats.c (File Modified) - - -androsyn 2015/05/12 17:27:40 UTC (20150512_0-28051) - Log: - make buf_line_t and buf_head_t from linebufs be opaque structures - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/struct.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/client.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/packet.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/send.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/sslproc.c (File Modified) - - -androsyn 2015/05/08 01:34:24 UTC (20150508_0-28043) - Log: - fix a memory leak - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/whowas.c (File Modified) - - -androsyn 2015/05/07 22:10:20 UTC (20150507_23-28041) - Log: - useful messages - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/ssld.c (File Modified) - - -androsyn 2015/05/07 21:57:38 UTC (20150507_22-28039) - Log: - fix tab - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/numeric.h (File Modified) - - -androsyn 2015/05/07 21:02:08 UTC (20150507_21-28035) - Log: - don't spew ERR_NOT_REGISTERED at an unregistered server - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/parse.c (File Modified) - - -androsyn 2015/05/07 21:01:20 UTC (20150507_20-28033) - Log: - whitespace fixes - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/client.c (File Modified) - - -androsyn 2015/05/07 19:23:14 UTC (20150507_19-28031) - Log: - get rid of the double 0x on module load - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/modules.c (File Modified) - - -androsyn 2015/05/07 19:21:31 UTC (20150507_18-28029) - Log: - Log to stderr if running the ircd in the foreground. I am not sure why this wasn't the case previously to be honest. - - - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_log.c (File Modified) - - -androsyn 2015/05/07 19:11:03 UTC (20150507_17-28027) - Log: - make current_serial static - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/send.c (File Modified) - - -androsyn 2015/05/07 19:10:52 UTC (20150507_16-28025) - Log: - make bandb_pending static - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/bandbi.c (File Modified) - - -androsyn 2015/05/07 19:01:16 UTC (20150507_15-28023) - Log: - comment the who->servername pointer assignment being safe - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/whowas.c (File Modified) - - -androsyn 2015/05/07 18:51:14 UTC (20150507_14-28021) - Log: - make whowas_list_length unsigned - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/whowas.c (File Modified) - - -androsyn 2015/05/07 17:10:44 UTC (20150507_13-28019) - Log: - remove testing value - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/whowas.c (File Modified) - - -androsyn 2015/05/07 17:06:21 UTC (20150507_12-28017) - Log: - make the motd and oper motd files config file configurable - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/doc/example.conf (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/s_conf.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/cache.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/ircd.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/newconf.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_conf.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_user.c (File Modified) - - -androsyn 2015/05/07 16:46:08 UTC (20150507_11-28015) - Log: - some cache.c changes to make things more consistent - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/cache.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_links.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_oper.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_rehash.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/cache.c (File Modified) - - -androsyn 2015/05/07 15:21:20 UTC (20150507_10-28013) - Log: - change _mheader to _rb_mheader to make the symbol a little more unique and also makes it harder for old modules to be loaded by accident - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/modules.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/static_modules.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/modules.c (File Modified) - - -androsyn 2015/05/07 15:20:29 UTC (20150507_9-28011) - Log: - the %p format specifier does not need a leading 0x as it providers that - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/numeric.h (File Modified) - - -androsyn 2015/05/07 14:40:53 UTC (20150507_8-28009) - Log: - add newline to the end of whowas.c - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/whowas.c (File Modified) - - -androsyn 2015/05/07 13:21:38 UTC (20150507_7-28007) - Log: - style fixes - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/whowas.c (File Modified) - - -androsyn 2015/05/07 05:25:14 UTC (20150507_6-28005) - Log: - use rb_strlcat instead of rb_snprintf_append when a more complex format string was not required - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_accept.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_ison.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_rehash.c (File Modified) - - -androsyn 2015/05/07 05:15:53 UTC (20150507_5-28003) - Log: - more rb_snprintf floating point cleanups - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_stats.c (File Modified) - - -androsyn 2015/05/07 03:50:13 UTC (20150507_4-28001) - Log: - change spoof flag to bool in whowas and remove the unused used flag - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/stdinc.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/whowas.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/whowas.c (File Modified) - - -androsyn 2015/05/07 03:24:07 UTC (20150507_3-27999) - Log: - report whowas memory stats again that reflect the real world - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/whowas.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_stats.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/whowas.c (File Modified) - - -androsyn 2015/05/07 03:22:27 UTC (20150507_2-27997) - Log: - i hate autotools - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/sqlite3/Makefile.in (File Modified) - - -androsyn 2015/05/07 03:22:05 UTC (20150507_1-27995) - Log: - i hate autotools - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/contrib/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/resolver/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/tools/Makefile.in (File Modified) - - -androsyn 2015/05/07 03:18:58 UTC (20150507_0-27991) - Log: - update configure to pass -q to grep - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/configure (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/configure.ac (File Modified) - - -androsyn 2015/05/06 17:41:50 UTC (20150506_3-27989) - Log: - more sendto_one_numeric conversions - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/numeric.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_join.c (File Modified) - - -androsyn 2015/05/06 17:38:19 UTC (20150506_2-27987) - Log: - ERR_TOOMANYTARGETS gets treated to sendto_one_numeric now - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_message.c (File Modified) - - -androsyn 2015/05/06 17:32:14 UTC (20150506_1-27985) - Log: - allocate buffer on the stack for start_zlib_session, eliminates a very minor possibility of a memory leak on server error - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/sslproc.c (File Modified) - - -androsyn 2015/05/06 17:28:33 UTC (20150506_0-27983) - Log: - deal with clang being weird about flags - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/configure (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/configure.ac (File Modified) - libratbox/branches/libratbox-cleanup/configure (File Modified) - libratbox/branches/libratbox-cleanup/configure.ac (File Modified) - - -androsyn 2015/05/05 19:29:56 UTC (20150505_1-27981) - Log: - use whowas_list_length instead of the testing value of 5 - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/whowas.c (File Modified) - - -androsyn 2015/05/05 18:46:46 UTC (20150505_0-27979) - Log: - make whowas history length configurable from the config file - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/doc/example.conf (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/whowas.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/newconf.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/whowas.c (File Modified) - - -androsyn 2015/05/01 03:47:52 UTC (20150501_2-27977) - Log: - A little bit more WHOWAS changes - - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/whowas.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_whowas.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/whowas.c (File Modified) - - -androsyn 2015/05/01 03:06:28 UTC (20150501_1-27975) - Log: - err reg/unreg get the sendto_one_numeric treatment too - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/numeric.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/parse.c (File Modified) - - -androsyn 2015/05/01 03:05:48 UTC (20150501_0-27973) - Log: - other half of the yy_linebuf change - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/newconf.h (File Modified) - - -androsyn 2015/04/30 21:29:32 UTC (20150430_3-27971) - Log: - whitespace tidying - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/whowas.c (File Modified) - - -androsyn 2015/04/30 21:29:21 UTC (20150430_2-27969) - Log: - change linebuf variable name in ircd_lexer from linebuf to yy_linebuf, to avoid confusion with the linebuf buffering system - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/ircd_lexer.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/ircd_lexer.l (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/newconf.c (File Modified) - - -androsyn 2015/04/30 21:27:23 UTC (20150430_1-27967) - Log: - remove yyparse/linebuf references from s_conf.c - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_conf.c (File Modified) - - -androsyn 2015/04/30 20:12:54 UTC (20150430_0-27965) - Log: - WHOWAS now uses the standard rb_dlink_lists instead of handrolled lists like everything else has stopped using... - - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/numeric.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/struct.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/whowas.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_stats.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_whowas.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/whowas.c (File Modified) - - -androsyn 2015/04/29 19:24:51 UTC (20150429_13-27963) - Log: - increment module api version..modules need to be at least recompiled - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/modules.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/modules.c (File Modified) - - -androsyn 2015/04/29 19:16:54 UTC (20150429_12-27961) - Log: - expand whitespace to hard tabs. yes i prefer hard tabs... - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/resolver/getaddrinfo.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/resolver/getnameinfo.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/resolver/res.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/resolver/reslib.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/resolver/reslist.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/resolver/resolver.c (File Modified) - - -androsyn 2015/04/29 19:15:29 UTC (20150429_11-27959) - Log: - expand whitespace to hard tabs. yes i prefer hard tabs... - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/channel.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/class.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/client.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/common.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/config.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/defaults.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/ircd_defs.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/match.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/modules.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/numeric.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/parse.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/s_auth.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/s_conf.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/s_newconf.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/s_serv.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/s_stats.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/send.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/stdinc.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/whowas.h (File Modified) - - -androsyn 2015/04/29 19:13:37 UTC (20150429_10-27953) - Log: - expand whitespace to hard tabs. yes i prefer hard tabs... - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/bandbi.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/channel.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/class.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/client.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/dns.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/hash.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/hook.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/hostmask.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/ircd.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/ircd_signal.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/listener.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/match.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/modules.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/monitor.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/newconf.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/packet.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/parse.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_auth.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_conf.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_log.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_serv.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_user.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/send.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/sslproc.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/supported.c (File Modified) - - -androsyn 2015/04/29 19:10:38 UTC (20150429_9-27951) - Log: - expand whitespace to hard tabs. yes i prefer hard tabs... - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_accept.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_admin.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_adminwall.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_away.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_cap.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_capab.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_close.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_cmessage.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_connect.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_dline.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_encap.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_gline.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_gungline.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_help.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_info.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_invite.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_ison.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_kline.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_knock.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_links.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_list.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_locops.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_lusers.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_map.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_monitor.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_motd.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_names.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_oper.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_operspy.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_pass.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_ping.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_pong.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_post.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_rehash.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_restart.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_resv.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_services.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_set.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_stats.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_svinfo.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_tb.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_testline.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_testmask.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_time.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_topic.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_trace.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_unreject.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_user.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_userhost.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_version.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_wallops.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_who.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_whois.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_whowas.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_xline.c (File Modified) - - -androsyn 2015/04/29 18:56:24 UTC (20150429_8-27949) - Log: - update version.c.SH - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/version.c.SH (File Modified) - - -androsyn 2015/04/29 18:10:33 UTC (20150429_7-27947) - Log: - make contrib compile again - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/contrib/example_module.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/contrib/m_42.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/contrib/m_clearchan.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/contrib/m_flags.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/contrib/m_force.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/contrib/m_mkpasswd.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/contrib/m_ojoin.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/contrib/m_okick.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/contrib/m_olist.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/contrib/m_opme.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/contrib/m_webirc.c (File Modified) - - -androsyn 2015/04/29 17:55:59 UTC (20150429_6-27945) - Log: - MFLG_UNREG and MFLG_SLOW removal...this pretty much breaks all old modules... - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/parse.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_die.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_error.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_join.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_kick.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_kill.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_message.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_mode.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_nick.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_part.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_quit.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_server.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_squit.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_admin.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_capab.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_pass.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_pong.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_post.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_user.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_xline.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/modules.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/parse.c (File Modified) - - -androsyn 2015/04/29 17:27:12 UTC (20150429_5-27943) - Log: - more MFLG_SLOW removal - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_accept.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_admin.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_adminwall.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_away.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_cap.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_capab.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_close.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_cmessage.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_connect.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_dline.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_encap.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_gline.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_gungline.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_help.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_info.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_invite.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_ison.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_kline.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_knock.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_links.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_list.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_locops.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_lusers.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_map.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_monitor.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_motd.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_names.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_oper.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_operspy.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_pass.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_pong.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_post.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_rehash.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_restart.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_resv.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_services.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_set.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_stats.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_svinfo.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_tb.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_testline.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_testmask.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_time.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_topic.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_trace.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_whois.c (File Modified) - - -androsyn 2015/04/29 17:24:29 UTC (20150429_4-27941) - Log: - more struct Message fun - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_services.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_unreject.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_user.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_userhost.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_version.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_wallops.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_who.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_whowas.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_xline.c (File Modified) - - -androsyn 2015/04/29 03:26:23 UTC (20150429_3-27939) - Log: - some more struct message changes..yay... - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_testmask.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_time.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_topic.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_trace.c (File Modified) - - -androsyn 2015/04/29 02:59:31 UTC (20150429_2-27937) - Log: - another batch of struct Message changes - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_accept.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_resv.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_set.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_stats.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_svinfo.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_tb.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_testline.c (File Modified) - - -androsyn 2015/04/29 02:43:12 UTC (20150429_1-27935) - Log: - more struct message stuff - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_locops.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_rehash.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_restart.c (File Modified) - - -androsyn 2015/04/29 02:42:14 UTC (20150429_0-27933) - Log: - woops..remove that - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_kline.c (File Modified) - - -androsyn 2015/04/28 19:14:51 UTC (20150428_11-27931) - Log: - more c99 style changes to struct Messages - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_close.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_motd.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_names.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_oper.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_operspy.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_pass.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_ping.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_pong.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_post.c (File Modified) - - -androsyn 2015/04/28 19:01:54 UTC (20150428_10-27929) - Log: - more c99 style changes to struct Messages - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_knock.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_links.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_list.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_locops.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_lusers.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_map.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_monitor.c (File Modified) - - -androsyn 2015/04/28 18:53:34 UTC (20150428_9-27927) - Log: - more c99 style changes to struct Messages - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_dline.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_encap.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_gline.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_gungline.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_help.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_info.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_invite.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_ison.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_kline.c (File Modified) - - -androsyn 2015/04/28 18:25:46 UTC (20150428_8-27925) - Log: - minor cleanups in notify_banned_client. get rid of the mess of static const chars etc - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/client.c (File Modified) - - -androsyn 2015/04/28 15:05:19 UTC (20150428_7-27923) - Log: - make the unknown_list timeout use connect_timeout..i think that makes sense - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/client.c (File Modified) - - -androsyn 2015/04/28 03:43:45 UTC (20150428_6-27921) - Log: - more struct Message modernization - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_accept.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_admin.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_adminwall.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_away.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_cap.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_capab.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_close.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_cmessage.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_connect.c (File Modified) - - -androsyn 2015/04/28 03:25:39 UTC (20150428_5-27919) - Log: - no need to set count/rcount/bytes now. it will be zeroed and we dont need to rely on position of the struct - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/contrib/example_module.c (File Modified) - - -androsyn 2015/04/28 03:19:14 UTC (20150428_4-27917) - Log: - convert a few modules to use c99 struct initialization - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_accept.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_admin.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_adminwall.c (File Modified) - - -androsyn 2015/04/28 03:02:09 UTC (20150428_3-27915) - Log: - initialize struct Message with c99 type named initializers - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/parse.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_whois.c (File Modified) - - -androsyn 2015/04/28 03:01:33 UTC (20150428_2-27913) - Log: - initialize struct Message with c99 type named initializers - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/contrib/example_module.c (File Modified) - - -androsyn 2015/04/28 02:19:22 UTC (20150428_1-27911) - Log: - whitespace cleanup - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/packet.c (File Modified) - - -androsyn 2015/04/28 02:18:12 UTC (20150428_0-27909) - Log: - remove unnecessary cast - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_kill.c (File Modified) - - -androsyn 2015/04/22 03:04:36 UTC (20150422_0-27903) - Log: - Fix Id property - - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/help/Makefile.am (File Modified) (Property Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_gungline.c (File Modified) (Property Modified) - - -androsyn 2015/04/18 05:23:16 UTC (20150418_5-27895) - Log: - yay autotools... - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/sqlite3/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/contrib/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/setup.h.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/resolver/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/tools/Makefile.in (File Modified) - - -androsyn 2015/04/18 05:20:22 UTC (20150418_4-27893) - Log: - add id tags - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/Makefile.am (File Modified) (Property Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/Makefile.am (File Modified) (Property Modified) - - -androsyn 2015/04/18 04:37:31 UTC (20150418_3-27891) - Log: - only set keywords id on Makefile.am - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/contrib/Makefile.am (Property Modified) - - -androsyn 2015/04/18 04:35:06 UTC (20150418_2-27889) - Log: - id tags for contrib makefile stuff - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/contrib/Makefile.am (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/contrib/Makefile.in (File Modified) - - -androsyn 2015/04/18 01:45:56 UTC (20150418_1-27887) - Log: - update the helpful help message that resolver gives when you run it directly ;) - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/resolver/resolver.c (File Modified) - - -androsyn 2015/04/18 01:43:24 UTC (20150418_0-27885) - Log: - got a few more missing Id tags - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/bandbi.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/operhash.h (File Modified) - - -androsyn 2015/04/17 17:29:43 UTC (20150417_0-27881) - Log: - update INSTALL from jackal@EFnet - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/INSTALL (File Modified) - - -androsyn 2015/04/10 18:43:50 UTC (20150410_4-27879) - Log: - check for ssl_cipher_list == NULL - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/sslproc.c (File Modified) - - -androsyn 2015/04/10 18:30:49 UTC (20150410_3-27877) - Log: - more indent fun - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_join.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_kill.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_message.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_mode.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_nick.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_server.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_accept.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_away.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_cap.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_dline.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_encap.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_gline.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_gungline.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_info.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_invite.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_kline.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_knock.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_links.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_list.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_map.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_monitor.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_names.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_oper.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_operspy.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_pong.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_services.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_set.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_stats.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_svinfo.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_testline.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_topic.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_trace.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_userhost.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_version.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_who.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_whois.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_whowas.c (File Modified) - - -androsyn 2015/04/10 18:08:24 UTC (20150410_2-27865) - Log: - make_and_lookup to rb_make_and_lookup changes - - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/sslproc.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/reject.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_conf.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_newconf.c (File Modified) - - -androsyn 2015/04/10 18:06:02 UTC (20150410_1-27859) - Log: - run through indent - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/bandbi.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/cache.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/channel.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/client.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/dns.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/getopt.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/hash.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/hook.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/hostmask.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/ircd.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/ircd_signal.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/listener.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/match.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/modules.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/monitor.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/newconf.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/packet.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/parse.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/reject.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_auth.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_conf.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_log.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_newconf.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_serv.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_user.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/scache.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/send.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/sslproc.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/supported.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/whowas.c (File Modified) - - -androsyn 2015/04/10 17:41:44 UTC (20150410_0-27857) - Log: - comment removal - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/hash.c (File Modified) - - -androsyn 2015/04/09 01:19:08 UTC (20150409_1-27845) - Log: - topic gets the sendto_one_numeric stuff too - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/numeric.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_join.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_mode.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_topic.c (File Modified) - - -androsyn 2015/04/09 01:10:13 UTC (20150409_0-27843) - Log: - get ERR_TOOMANYMATCHES and RPL_LIST using _numeric stuff - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/numeric.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_list.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_who.c (File Modified) - - -androsyn 2015/04/08 21:07:51 UTC (20150408_23-27841) - Log: - tabomatic! - - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/numeric.h (File Modified) - - -androsyn 2015/04/08 21:04:49 UTC (20150408_22-27839) - Log: - RPL RPL my eyeballs... - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/numeric.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_who.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_whowas.c (File Modified) - - -androsyn 2015/04/08 20:34:57 UTC (20150408_21-27837) - Log: - more sendto_one_numeric stuff..make ison even more sane - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/numeric.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_ison.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_user.c (File Modified) - - -androsyn 2015/04/08 20:23:04 UTC (20150408_20-27835) - Log: - Merge messages.h/numeric.h comment the format strings with their RPL/ERR versions - - - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/messages.h (File Deleted) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/numeric.h (File Modified) - - -androsyn 2015/04/08 19:03:17 UTC (20150408_19-27833) - Log: - ERR_NOPRIVS gets the sendto_one_numeric way - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/messages.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_die.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_kill.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_squit.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_adminwall.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_connect.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_dline.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_gline.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_gungline.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_kline.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_rehash.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_restart.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_resv.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_set.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_wallops.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_xline.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/modules.c (File Modified) - - -androsyn 2015/04/08 18:46:53 UTC (20150408_18-27831) - Log: - accept gets the sendto_one_numeric treatment as well - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_accept.c (File Modified) - - -androsyn 2015/04/08 18:41:54 UTC (20150408_17-27829) - Log: - make RPL_LOAD2HI use sendto_one_numeric as well - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/messages.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_admin.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_help.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_info.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_list.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_lusers.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_motd.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_names.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_stats.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_version.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_who.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_whois.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_whowas.c (File Modified) - - -androsyn 2015/04/08 18:35:46 UTC (20150408_16-27827) - Log: - have sendto_one_numeric deal with unregistered clients correctly - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/send.c (File Modified) - - -androsyn 2015/04/08 18:25:47 UTC (20150408_15-27825) - Log: - more sendto_one_numeric conversions - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/messages.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_admin.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_map.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_conf.c (File Modified) - - -androsyn 2015/04/08 18:17:58 UTC (20150408_14-27823) - Log: - convert 001-004 to use sendto_one_numeric - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/messages.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_user.c (File Modified) - - -androsyn 2015/04/08 18:12:23 UTC (20150408_13-27821) - Log: - convert away/unaway to use sendto_one_numeric - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_away.c (File Modified) - - -androsyn 2015/04/08 18:03:00 UTC (20150408_12-27819) - Log: - really should have the type cast from void here too - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_accept.c (File Modified) - - -androsyn 2015/04/08 18:02:31 UTC (20150408_11-27817) - Log: - formatting cleanups - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_accept.c (File Modified) - - -androsyn 2015/04/08 17:41:15 UTC (20150408_10-27815) - Log: - change a few sprintfs to snprintfs - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/channel.c (File Modified) - - -androsyn 2015/04/08 15:34:20 UTC (20150408_9-27811) - Log: - get rid of intermediate buffer for floating point formatting, rb_snprintf is gone..we use a normal libc snprintf now - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/hash.c (File Modified) - - -androsyn 2015/04/08 15:32:17 UTC (20150408_8-27809) - Log: - erm..we require snprintf with c99 now - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/hash.c (File Modified) - - -androsyn 2015/04/08 15:31:36 UTC (20150408_7-27807) - Log: - erm..we require snprintf with c99 now - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/hash.c (File Modified) - - -androsyn 2015/04/08 15:28:00 UTC (20150408_6-27805) - Log: - fix formatting - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_newconf.c (File Modified) - - -androsyn 2015/04/08 15:27:27 UTC (20150408_5-27803) - Log: - fix formatting - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/hash.c (File Modified) - - -androsyn 2015/04/08 05:54:53 UTC (20150408_4-27801) - Log: - remove dead prototype - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/sslproc.c (File Modified) - - -androsyn 2015/04/08 05:54:22 UTC (20150408_3-27799) - Log: - get rid of init_prng code - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/sslproc.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/ssld.c (File Modified) - - -androsyn 2015/04/08 05:49:59 UTC (20150408_2-27797) - Log: - introduce connection ids in struct client for tracking zip stats with ssld. we can have more than one session associated with ssld if we're using both zip and ssl... - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/hash.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/struct.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/client.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/hash.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/sslproc.c (File Modified) - - -androsyn 2015/04/08 05:47:45 UTC (20150408_1-27795) - Log: - remove change_connid code - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/ssld.c (File Modified) - - -androsyn 2015/04/08 05:09:17 UTC (20150408_0-27793) - Log: - simplify some code - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/bantool.c (File Modified) - - -androsyn 2015/04/04 01:52:39 UTC (20150404_0-27791) - Log: - revert change connid stuff for now... - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/sslproc.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/ssld.c (File Modified) - - -androsyn 2015/04/03 23:18:02 UTC (20150403_5-27789) - Log: - Remove generated file - - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/config.h (File Deleted) - - -androsyn 2015/04/03 23:17:26 UTC (20150403_4-27787) - Log: - remove connid change code in the ircd side too... - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/sslproc.c (File Modified) - - -androsyn 2015/04/03 23:14:24 UTC (20150403_3-27785) - Log: - remove change connid code and some other minor cleanups - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/ssld.c (File Modified) - - -androsyn 2015/04/03 21:12:00 UTC (20150403_2-27783) - Log: - more %Q cleanups - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/bantool.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/rsdb.h (File Modified) - - -androsyn 2015/04/03 21:04:42 UTC (20150403_1-27781) - Log: - get rid of rs_snprintf, replace instances that were using %Q with rsdb_quote(via a few macros) - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/Makefile.am (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/bandb.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/bantool.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/rsdb_snprintf.c (File Deleted) - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/rsdb_sqlite3.c (File Modified) - - -androsyn 2015/04/03 20:11:44 UTC (20150403_0-27779) - Log: - remove traces of NICKNAMEHISTORYLENGTH from configure and move it back to include/config.h nobody cares about adjusting this anyways... - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/configure (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/configure.ac (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/config.h (File Modified) - - -androsyn 2015/03/31 17:34:19 UTC (20150331_3-27767) - Log: - stop exporting ndTable and add functions in hash.c to make up for it - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/hash.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_stats.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/hash.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_newconf.c (File Modified) - - -androsyn 2015/03/31 17:16:00 UTC (20150331_2-27765) - Log: - use CLI_CONNID_MAX for the connid table size - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/hash.c (File Modified) - - -androsyn 2015/03/31 17:12:13 UTC (20150331_1-27763) - Log: - i\'m not sure config.h.dist is needed anymore. nobody edits config.h by hand for the most part now - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/config.h.dist (File Deleted) - - -androsyn 2015/03/31 17:10:07 UTC (20150331_0-27761) - Log: - change connid to be uint32_t and fix an issue with ssl_cipher_list being unset - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/sslproc.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/struct.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/config.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/hash.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/sslproc.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/ssld.c (File Modified) - - -androsyn 2015/03/29 17:21:51 UTC (20150329_8-27759) - Log: - arg..missed client.c - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/client.c (File Modified) - - -androsyn 2015/03/29 17:21:35 UTC (20150329_7-27757) - Log: - update hash.h too - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/hash.h (File Modified) - - -androsyn 2015/03/29 17:17:16 UTC (20150329_6-27755) - Log: - connid is signed, using abs() before hashing - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/hash.c (File Modified) - - -androsyn 2015/03/29 03:08:16 UTC (20150329_5-27753) - Log: - get rid of small net remainders - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/configure (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/configure.ac (File Modified) - - -androsyn 2015/03/29 03:06:13 UTC (20150329_4-27751) - Log: - maybe not on -Wstack-protector - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/configure (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/configure.ac (File Modified) - libratbox/branches/libratbox-cleanup/configure (File Modified) - libratbox/branches/libratbox-cleanup/configure.ac (File Modified) - - -androsyn 2015/03/29 02:48:32 UTC (20150329_3-27747) - Log: - Tweak some cflags detection - - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/configure (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/configure.ac (File Modified) - - -androsyn 2015/03/29 02:41:41 UTC (20150329_2-27745) - Log: - move rb_set_time to earlier in the code - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/ircd.c (File Modified) - - -androsyn 2015/03/29 00:24:57 UTC (20150329_1-27742) - Log: - Generate connection ids to pass to ssld instead of using file descriptors - - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/hash.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/struct.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/client.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/hash.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/listener.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_serv.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/sslproc.c (File Modified) - - -androsyn 2015/03/29 00:24:21 UTC (20150329_0-27740) - Log: - remove a pointless macro in configure - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/configure (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/configure.ac (File Modified) - - -androsyn 2015/03/28 21:18:02 UTC (20150328_17-27734) - Log: - introduce s_RPL macro do replace instances of "RPL_WHOISOPERATOR, form_str(RPL_WHOISOPERATOR) with s_RPL(RPL_WHOISOPERATOR) for example - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/messages.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_message.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_nick.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_info.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_invite.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_links.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_stats.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_testline.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_time.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_trace.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_userhost.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_version.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_whois.c (File Modified) - - -androsyn 2015/03/28 20:56:50 UTC (20150328_16-27732) - Log: - remove scratch float formatting. this is no longer needed since we use OS provided snprintf now - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_map.c (File Modified) - - -androsyn 2015/03/28 20:56:19 UTC (20150328_15-27730) - Log: - use form_str - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_userhost.c (File Modified) - - -androsyn 2015/03/28 20:50:34 UTC (20150328_14-27728) - Log: - more static char removals - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_testline.c (File Modified) - - -androsyn 2015/03/28 20:49:47 UTC (20150328_13-27726) - Log: - more static char removals - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_dline.c (File Modified) - - -androsyn 2015/03/28 20:48:42 UTC (20150328_12-27724) - Log: - make confopts const char as it should be - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_version.c (File Modified) - - -androsyn 2015/03/28 20:48:18 UTC (20150328_11-27722) - Log: - remove NICKLEN remnants from configure - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/configure (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/configure.ac (File Modified) - - -androsyn 2015/03/28 20:37:00 UTC (20150328_10-27720) - Log: - wow..userhost was all sorts of brain damaged. refactor into something resembling sane code - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/messages.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_userhost.c (File Modified) - - -androsyn 2015/03/28 20:36:19 UTC (20150328_9-27718) - Log: - yay autotools - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/configure (File Modified) - - -androsyn 2015/03/28 20:35:57 UTC (20150328_8-27716) - Log: - make accept compile - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_accept.c (File Modified) - - -androsyn 2015/03/28 18:33:47 UTC (20150328_7-27714) - Log: - ergh..more manual string building removal. i think this code is right ;) - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_accept.c (File Modified) - - -androsyn 2015/03/28 17:58:09 UTC (20150328_6-27712) - Log: - cleanup the mess that was ison by using rb_snprintf_append - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_ison.c (File Modified) - - -androsyn 2015/03/28 17:44:32 UTC (20150328_5-27710) - Log: - de-sprintf m_stats.c and remove another static char buf... - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_stats.c (File Modified) - - -androsyn 2015/03/28 17:39:39 UTC (20150328_4-27708) - Log: - more unnecessary static chars - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_user.c (File Modified) - - -androsyn 2015/03/28 17:38:40 UTC (20150328_3-27706) - Log: - more unnecessary static chars - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_operspy.c (File Modified) - - -androsyn 2015/03/28 17:36:05 UTC (20150328_2-27704) - Log: - i\'m not sure why these were static char either - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_cap.c (File Modified) - - -androsyn 2015/03/28 17:32:25 UTC (20150328_1-27702) - Log: - again, more buffers that can be on the stack - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_accept.c (File Modified) - - -androsyn 2015/03/28 17:30:35 UTC (20150328_0-27700) - Log: - sure we can allocate 1k off the stack these days - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_ison.c (File Modified) - - -androsyn 2015/03/27 22:40:26 UTC (20150327_0-27698) - Log: - remove IDLETIME from set - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/help/opers/set (File Modified) - - -androsyn 2015/03/23 15:47:47 UTC (20150323_0-27696) - Log: - where did that space come from - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_conf.c (File Modified) - - -androsyn 2015/03/21 00:33:15 UTC (20150321_1-27694) - Log: - remove more static char allocations that aren't necessary - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/send.c (File Modified) - - -androsyn 2015/03/21 00:30:27 UTC (20150321_0-27692) - Log: - really stack allocation is okay - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/packet.c (File Modified) - - -androsyn 2015/03/20 18:59:26 UTC (20150320_10-27690) - Log: - fix formatting - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/ssld.c (File Modified) - - -androsyn 2015/03/20 18:57:47 UTC (20150320_9-27688) - Log: - make sqlite3 detection work as well as the local build of sqlite3 - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/Makefile.am (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/sqlite3/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/configure (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/configure.ac (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/contrib/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/help/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/resolver/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/tools/Makefile.in (File Modified) - - -androsyn 2015/03/20 16:10:51 UTC (20150320_8-27686) - Log: - check argument counts for zipstats - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/sslproc.c (File Modified) - - -androsyn 2015/03/20 16:10:27 UTC (20150320_7-27684) - Log: - dead assignment removal - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/client.c (File Modified) - - -androsyn 2015/03/20 15:44:57 UTC (20150320_6-27682) - Log: - remove unused initializations - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/ssld.c (File Modified) - - -androsyn 2015/03/20 03:18:32 UTC (20150320_5-27680) - Log: - more unused variables - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_whois.c (File Modified) - - -androsyn 2015/03/20 03:07:03 UTC (20150320_4-27678) - Log: - nothing really uses the return value of make_user so stop returning it - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/client.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_nick.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_user.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/client.c (File Modified) - - -androsyn 2015/03/20 00:37:52 UTC (20150320_3-27676) - Log: - remove pointless variable and unused initialization - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_kline.c (File Modified) - - -androsyn 2015/03/20 00:37:15 UTC (20150320_2-27674) - Log: - calculate bans a bit more accurately - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_stats.c (File Modified) - - -androsyn 2015/03/20 00:26:14 UTC (20150320_1-27672) - Log: - more useless variables - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_dline.c (File Modified) - - -androsyn 2015/03/20 00:24:03 UTC (20150320_0-27670) - Log: - remove unused variable - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_server.c (File Modified) - - -androsyn 2015/03/19 23:43:34 UTC (20150319_3-27668) - Log: - yay autotools! - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/sqlite3/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/contrib/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/resolver/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/ircd_parser.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/ircd_parser.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/tools/Makefile.in (File Modified) - - -androsyn 2015/03/19 23:43:15 UTC (20150319_2-27666) - Log: - change type to size_t and remove a useless assignment - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/hash.c (File Modified) - - -androsyn 2015/03/19 23:17:00 UTC (20150319_1-27664) - Log: - remove CONFIG_RATBOX_LEVEL_3 stuff. nobody edits the .h file anymore - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/client.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/config.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/defaults.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/ircd_defs.h (File Modified) - - -androsyn 2015/03/19 23:16:33 UTC (20150319_0-27662) - Log: - declare prototypes - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/ssld.c (File Modified) - - -androsyn 2015/03/17 02:20:33 UTC (20150317_0-27660) - Log: - use named initializers for HeaderMessages - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_auth.c (File Modified) - - -androsyn 2015/03/16 01:18:22 UTC (20150316_0-27656) - Log: - commit the printable_name changes for the header too - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/listener.h (File Modified) - - -androsyn 2015/03/15 02:54:18 UTC (20150315_6-27654) - Log: - more static allocation cleanups - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/bandbi.c (File Modified) - - -androsyn 2015/03/15 02:34:00 UTC (20150315_5-27652) - Log: - lets initialize printable_name to NULL for good measure - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/listener.c (File Modified) - - -androsyn 2015/03/15 02:24:34 UTC (20150315_4-27650) - Log: - have get_listener_name return a cached malloc()ed buffer instead of a static buffer - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/listener.c (File Modified) - - -androsyn 2015/03/15 02:11:53 UTC (20150315_3-27648) - Log: - revert last change..turns out we do - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/listener.c (File Modified) - - -androsyn 2015/03/15 02:08:05 UTC (20150315_2-27646) - Log: - surely we don't need to allocate everything static these days - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/listener.c (File Modified) - - -androsyn 2015/03/15 01:33:03 UTC (20150315_1-27644) - Log: - remove commented out blockheap code - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/channel.c (File Modified) - - -androsyn 2015/03/15 01:32:39 UTC (20150315_0-27642) - Log: - fix memory stats in client.c - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/client.c (File Modified) - - -androsyn 2015/03/12 22:06:16 UTC (20150312_5-27638) - Log: - add new sqlite version - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/sqlite3/shell.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/sqlite3/sqlite3.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/sqlite3/sqlite3.h (File Modified) - - -androsyn 2015/03/12 22:01:06 UTC (20150312_4-27636) - Log: - remove references to egd - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/doc/example.conf (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/doc/example.efnet.conf (File Modified) - - -androsyn 2015/03/12 22:00:36 UTC (20150312_3-27634) - Log: - fix isupport display issues - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/supported.c (File Modified) - - -androsyn 2015/03/12 21:04:56 UTC (20150312_2-27632) - Log: - remove egd - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/s_conf.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/ircd.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/newconf.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_conf.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/sslproc.c (File Modified) - - -androsyn 2015/03/12 20:57:27 UTC (20150312_1-27630) - Log: - add support for ssl_cipher_list - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/s_conf.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/sslproc.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/ircd.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/newconf.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/sslproc.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/ssld.c (File Modified) - - -androsyn 2015/03/12 20:56:36 UTC (20150312_0-27626) - Log: - remove some generated files that shouldn't be in svn - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/Makefile (File Deleted) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/config.log (File Deleted) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/config.status (File Deleted) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/libtool (File Deleted) - - -androsyn 2015/03/09 22:25:01 UTC (20150309_15-27624) - Log: - remove old comment - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/sslproc.c (File Modified) - - -androsyn 2015/03/09 22:24:28 UTC (20150309_14-27622) - Log: - make nul const - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/sslproc.c (File Modified) - - -androsyn 2015/03/09 22:16:58 UTC (20150309_13-27620) - Log: - use pkg-config for sqlite3 as well - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/RELNOTES (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/aclocal.m4 (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/Makefile.am (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/sqlite3/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/configure (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/configure.ac (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/contrib/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/help/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/resolver/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/Makefile.am (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/tools/Makefile.in (File Modified) - - -androsyn 2015/03/09 21:56:26 UTC (20150309_12-27616) - Log: - update config.sub - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/config.sub (File Modified) - - -androsyn 2015/03/09 21:43:42 UTC (20150309_11-27612) - Log: - update ylwarp.. - - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/config/ylwrap (File Added) - - -androsyn 2015/03/09 20:34:19 UTC (20150309_10-27602) - Log: - rerun configure - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/Makefile.am (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/Makefile.in (File Modified) - - -androsyn 2015/03/09 20:33:24 UTC (20150309_9-27600) - Log: - apply log earlier patch from debian - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_log.c (File Modified) - - -androsyn 2015/03/09 20:29:59 UTC (20150309_8-27598) - Log: - add crypt null pointer reference patch from debian - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_server.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_oper.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_user.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/tools/mkpasswd.c (File Modified) - - -androsyn 2015/03/09 20:22:30 UTC (20150309_7-27592) - Log: - Update autoconf. - - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/aclocal.m4 (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/sqlite3/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/configure (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/configure.ac (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/contrib/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/help/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/setup.h.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/Makefile (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/config.log (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/Makefile.am (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/resolver/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/Makefile.am (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/newconf.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/sslproc.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/tools/Makefile.in (File Modified) - - -androsyn 2015/03/09 20:20:53 UTC (20150309_6-27589) - Log: - update propset - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/ (Property Modified) - - -androsyn 2015/03/09 20:20:25 UTC (20150309_5-27587) - Log: - update propset - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/ (Property Modified) - - -androsyn 2015/03/09 20:06:54 UTC (20150309_4-27585) - Log: - cleanup libltdl - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/autom4te.cache/ (File Deleted) - - -androsyn 2015/03/09 20:00:29 UTC (20150309_3-27583) - Log: - readd libltdl - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/ (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/COPYING.LIB (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/Makefile (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/Makefile.am (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/Makefile.in (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/README (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/aclocal.m4 (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/argz.c (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/argz_.h (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/autom4te.cache/ (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/autom4te.cache/output.0 (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/autom4te.cache/output.1 (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/autom4te.cache/requests (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/autom4te.cache/traces.0 (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/autom4te.cache/traces.1 (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/config/ (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/config/compile (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/config/config.guess (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/config/config.sub (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/config/depcomp (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/config/install-sh (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/config/ltmain.sh (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/config/missing (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/config-h.in (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/config.h (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/config.log (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/config.status (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/configure (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/configure.ac (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/libltdl/ (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/libltdl/lt__alloc.h (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/libltdl/lt__dirent.h (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/libltdl/lt__glibc.h (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/libltdl/lt__private.h (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/libltdl/lt__strl.h (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/libltdl/lt_dlloader.h (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/libltdl/lt_error.h (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/libltdl/lt_system.h (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/libltdl/slist.h (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/libtool (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/loaders/ (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/loaders/.deps/ (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/loaders/.deps/dld_link.Plo (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/loaders/.deps/dlopen.Plo (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/loaders/.deps/dyld.Plo (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/loaders/.deps/libltdl_la-preopen.Plo (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/loaders/.deps/libltdlc_la-preopen.Plo (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/loaders/.deps/load_add_on.Plo (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/loaders/.deps/loadlibrary.Plo (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/loaders/.deps/shl_load.Plo (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/loaders/dld_link.c (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/loaders/dlopen.c (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/loaders/dyld.c (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/loaders/load_add_on.c (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/loaders/loadlibrary.c (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/loaders/preopen.c (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/loaders/shl_load.c (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/lt__alloc.c (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/lt__dirent.c (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/lt__strl.c (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/lt_dlloader.c (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/lt_error.c (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/ltdl.c (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/ltdl.h (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/m4/ (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/m4/argz.m4 (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/m4/libtool.m4 (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/m4/ltdl.m4 (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/m4/ltoptions.m4 (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/m4/ltsugar.m4 (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/m4/ltversion.m4 (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/m4/lt~obsolete.m4 (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/slist.c (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/stamp-h1 (File Added) - - -androsyn 2015/03/09 20:00:00 UTC (20150309_2-27581) - Log: - fix type conversion issues - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_svinfo.c (File Modified) - - -androsyn 2015/03/09 19:59:48 UTC (20150309_1-27579) - Log: - revert last change - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_nick.c (File Modified) - - -androsyn 2015/03/09 18:51:38 UTC (20150309_0-27577) - Log: - remove libltdl - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/Makefile.am (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/aclocal.m4 (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/sqlite3/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/configure (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/configure.ac (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/contrib/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/help/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/setup.h.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/ (File Deleted) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_nick.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/resolver/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/packet.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/sslproc.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/tools/Makefile.in (File Modified) - - -androsyn 2015/03/04 22:30:45 UTC (20150304_2-27575) - Log: - move init_isupport down a bit - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/ircd.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/supported.c (File Modified) - - -androsyn 2015/03/04 21:01:11 UTC (20150304_1-27573) - Log: - runtime nicklen change support - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/configure (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/configure.ac (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/doc/example.conf (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/ircd_defs.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/s_conf.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/setup.h.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_nick.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_monitor.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/newconf.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_conf.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/supported.c (File Modified) - - -androsyn 2015/03/04 20:22:21 UTC (20150304_0-27572) - Log: - some type cleanups and modernization - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/cache.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/channel.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/class.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/client.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/dns.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/hash.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/ircd.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/listener.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/messages.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/monitor.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/parse.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/s_auth.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/s_conf.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/s_gline.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/s_log.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/s_newconf.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/s_stats.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/s_user.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/send.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/struct.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_dline.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_invite.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_list.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_names.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_stats.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/bandbi.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/cache.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/channel.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/client.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/dns.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/ircd_lexer.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/ircd_lexer.l (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/newconf.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_conf.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_user.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/sslproc.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/ssld.c (File Modified) - - -androsyn 2014/09/04 16:27:40 UTC (20140904_2-27558) - Log: - more static variable cleanup - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/ssld.c (File Modified) - - -androsyn 2014/09/04 16:22:06 UTC (20140904_1-27556) - Log: - some global/static variable cleanups - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/bandb.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/bantool.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/rsdb.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/rsdb_sqlite3.c (File Modified) - - -androsyn 2014/09/04 15:59:18 UTC (20140904_0-27554) - Log: - use parsed nick in whois ERR_NOSUCHNICK and and RPL_ENDOFWHOIS if commas are passed - we only handle one nick on whois anyways - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_whois.c (File Modified) - - -androsyn 2014/08/07 16:53:48 UTC (20140807_0-27552) - Log: - remove redundant (void)s - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_join.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_message.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_nick.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_accept.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_close.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_xline.c (File Modified) - - -androsyn 2014/08/05 19:42:00 UTC (20140805_14-27542) - Log: - Regenerate lexer/parser files for in-tree - - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/ircd_lexer.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/ircd_parser.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/ircd_parser.h (File Modified) - - -androsyn 2014/08/05 19:10:59 UTC (20140805_13-27540) - Log: - More sizeof(time_t) > sizeof(long) cleanups - - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/messages.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_join.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_mode.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_nick.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_server.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_stats.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_tb.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_testline.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/channel.c (File Modified) - - -androsyn 2014/08/05 18:53:52 UTC (20140805_12-27538) - Log: - fixup services too - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_services.c (File Modified) - - -androsyn 2014/08/05 18:48:21 UTC (20140805_11-27536) - Log: - get rid of some more (long) casts on time_t - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_user.c (File Modified) - - -androsyn 2014/08/05 18:44:11 UTC (20140805_10-27534) - Log: - correctly fix formats - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_svinfo.c (File Modified) - - -androsyn 2014/08/05 18:40:54 UTC (20140805_9-27532) - Log: - I think these are all of the time_t == 64 and long == 32 printf type issues. - This *should* fix openbsd 5.5 on 32bit now - - - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/messages.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/stdinc.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_stats.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_svinfo.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_whois.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_conf.c (File Modified) - - -androsyn 2014/08/05 18:38:00 UTC (20140805_8-27530) - Log: - fix typo - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/ircd_parser.y (File Modified) - - -androsyn 2014/08/05 16:39:47 UTC (20140805_7-27520) - Log: - quiet you... - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/rsdb_sqlite3.c (File Modified) - - -androsyn 2014/08/05 16:38:56 UTC (20140805_6-27518) - Log: - Update sqlite3 amalgamation - - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/sqlite3/shell.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/sqlite3/sqlite3.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/sqlite3/sqlite3.h (File Modified) - - -androsyn 2014/08/05 16:34:52 UTC (20140805_5-27516) - Log: - add m_webirc to makefile - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/contrib/Makefile.am (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/contrib/Makefile.in (File Modified) - - -androsyn 2014/08/05 16:28:03 UTC (20140805_4-27514) - Log: - pass AM_CFLAGS too - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/contrib/Makefile.am (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/contrib/Makefile.in (File Modified) - - -androsyn 2014/08/05 16:22:59 UTC (20140805_3-27512) - Log: - tweak contrib build flags - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/contrib/Makefile.am (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/contrib/Makefile.in (File Modified) - - -androsyn 2014/08/05 16:18:59 UTC (20140805_2-27510) - Log: - Update automake copied addons - - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/compile (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/config.guess (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/config.sub (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/depcomp (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/install-sh (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/missing (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/mkinstalldirs (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/ylwrap (File Modified) - - -androsyn 2014/08/05 16:17:00 UTC (20140805_1-27508) - Log: - change INCLUDES to AM_CPPFLAGS in Makefile.am files - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/Makefile.am (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/Makefile.am (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/resolver/Makefile.am (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/resolver/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/Makefile.am (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/Makefile.am (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/tools/Makefile.am (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/tools/Makefile.in (File Modified) - - -androsyn 2014/08/05 16:16:32 UTC (20140805_0-27506) - Log: - Make everything compile in contrib at least... - - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/contrib/Makefile.am (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/contrib/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/contrib/m_flags.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/contrib/m_force.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/contrib/m_okick.c (File Modified) - - -androsyn 2014/08/04 21:08:18 UTC (20140804_9-27504) - Log: - RBTT_FMT svinfo - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_svinfo.c (File Modified) - - -androsyn 2014/08/04 21:03:51 UTC (20140804_8-27502) - Log: - fix time_t formatting for whois idle at least.. - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/configure (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/configure.ac (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/messages.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/setup.h.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/stdinc.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_whois.c (File Modified) - - -androsyn 2014/08/04 20:22:18 UTC (20140804_7-27500) - Log: - format string fixups - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/include/ircd.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/messages.h (File Added) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/s_serv.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_server.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_pong.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_stats.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_trace.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_serv.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_user.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/sslproc.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/ssld.c (File Modified) - - -androsyn 2014/08/04 19:46:58 UTC (20140804_6-27498) - Log: - suppress clangs empty loop warnings...we know this is an empty loop ;) - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/match.c (File Modified) - - -androsyn 2014/08/04 19:41:58 UTC (20140804_5-27496) - Log: - Port messages.tab to messages.h changes from Charybdis. Next stop..fix the 64bit time_t issues... - - - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/aclocal.m4 (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/sqlite3/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/configure (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/configure.ac (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/contrib/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/help/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/numeric.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/setup.h.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/stdinc.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_join.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_mode.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_trace.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/resolver/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/Makefile.am (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/messages.tab (File Deleted) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/numeric.c (File Deleted) - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/Makefile.in (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/tools/Makefile.in (File Modified) - - -androsyn 2014/08/04 18:49:55 UTC (20140804_4-27494) - Log: - fix compiler warning - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/resolver/reslib.c (File Modified) - - -androsyn 2014/08/04 18:18:49 UTC (20140804_3-27490) - Log: - backport r27451 - Always send ERR_NICKCOLLISION to a user that will be killed. - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_nick.c (File Modified) - - -androsyn 2014/08/04 18:04:29 UTC (20140804_2-27488) - Log: - backport r25473 fix compiler warning - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/src/parse.c (File Modified) - - -androsyn 2014/08/04 18:03:19 UTC (20140804_1-27486) - Log: - backport r27457 and r27455 - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/doc/example.conf (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_info.c (File Modified) - - -androsyn 2014/08/04 17:34:18 UTC (20140804_0-27480) - Log: - backport die notice fix - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_die.c (File Modified) - - -androsyn 2014/07/30 18:02:52 UTC (20140730_3-27476) - Log: - get out of the business of maintaining snprintf/sprintf - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/bandb.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/bantool.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/rsdb_sqlite3.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_join.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_kill.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_mode.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_nick.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_quit.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/core/m_server.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_accept.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_away.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_cap.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_dline.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_encap.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_gline.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_ison.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_kline.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_map.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_monitor.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_names.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_operspy.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_restart.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_stats.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_testline.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_topic.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_user.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_userhost.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_who.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_whois.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/resolver/res.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/bandbi.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/cache.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/channel.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/client.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/dns.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/ircd.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/ircd_lexer.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/ircd_lexer.l (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/listener.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/modules.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/monitor.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/newconf.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/parse.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/restart.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_auth.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_conf.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_log.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_newconf.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_serv.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_user.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/send.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/sslproc.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/supported.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/ssld.c (File Modified) - - -androsyn 2014/07/30 16:51:02 UTC (20140730_2-27472) - Log: - remove blockheap and use rb_malloc/rb_free - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/bandb/bandb.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/include/client.h (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/libltdl/configure (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/modules/m_away.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/resolver/resolver.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/channel.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/client.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/ircd.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/monitor.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_auth.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_conf.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/src/s_newconf.c (File Modified) - ircd-ratbox/branches/ircd-ratbox-cleanup/ssld/ssld.c (File Modified) - - -androsyn 2014/07/30 15:51:08 UTC (20140730_1-27466) - Log: - update external - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/ (Property Modified) - - -androsyn 2014/07/30 15:49:21 UTC (20140730_0-27464) - Log: - branch libratbox-cleanup second try - - Modified: - ircd-ratbox/branches/ircd-ratbox-cleanup/ (File Added) - - -androsyn 2013/01/28 23:38:59 UTC (20130128_0-27433) - Log: - Reject cidr masks that are too large to make sense, assume they are nonsense and skip cidr checking for these - - - Modified: - ircd-ratbox/branches/RATBOX_3_0/src/match.c (File Modified) - - -androsyn 2012/12/31 21:34:15 UTC (20121231_1-27414) - Log: - update release version - - Modified: - ircd-ratbox/branches/RATBOX_3_0/INSTALL (File Modified) - ircd-ratbox/branches/RATBOX_3_0/include/patchlevel.h (File Modified) - - -androsyn 2012/12/31 21:31:20 UTC (20121231_0-27412) - Log: - update relnotes - - Modified: - ircd-ratbox/branches/RATBOX_3_0/RELNOTES (File Modified) - - -jilles 2012/05/27 13:09:42 UTC (20120527_0-27399) - Log: - Backport trunk r27397: Fix typo, reported by Scott MacDonald. - - - Modified: - ircd-ratbox/branches/RATBOX_3_0/src/ircd.c (File Modified) - - -androsyn 2012/04/15 21:41:07 UTC (20120415_0-27391) - Log: - Fix another case of sizeof() returning the pointer size instead of the variable size - - Modified: - ircd-ratbox/branches/RATBOX_3_0/resolver/resolver.c (File Modified) - - -dubkat 2012/03/16 23:10:29 UTC (20120316_2-27381) - Log: - more copyright changes - - Modified: - ircd-ratbox/branches/RATBOX_3_0/contrib/m_clearchan.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/contrib/m_force.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/contrib/m_ojoin.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/contrib/m_okick.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/contrib/m_olist.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/doc/server-version-info (File Modified) - ircd-ratbox/branches/RATBOX_3_0/src/version.c.SH (File Modified) - - -dubkat 2012/03/16 05:33:15 UTC (20120316_1-27371) - Log: - House cleaning - update our copyright notices - - Modified: - ircd-ratbox/branches/RATBOX_3_0/bandb/bandb.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/bandb/bantool.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/bandb/rsdb_sqlite3.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/contrib/ircd-shortcut.pl (File Modified) - ircd-ratbox/branches/RATBOX_3_0/contrib/m_opme.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/contrib/m_webirc.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/doc/challenge.txt (File Modified) - ircd-ratbox/branches/RATBOX_3_0/doc/example.conf (File Modified) - ircd-ratbox/branches/RATBOX_3_0/doc/example.efnet.conf (File Modified) - ircd-ratbox/branches/RATBOX_3_0/doc/genssl.sh (File Modified) - ircd-ratbox/branches/RATBOX_3_0/doc/ircd_crontab.sh (File Modified) - ircd-ratbox/branches/RATBOX_3_0/include/channel.h (File Modified) - ircd-ratbox/branches/RATBOX_3_0/include/class.h (File Modified) - ircd-ratbox/branches/RATBOX_3_0/include/client.h (File Modified) - ircd-ratbox/branches/RATBOX_3_0/include/common.h (File Modified) - ircd-ratbox/branches/RATBOX_3_0/include/config.h (File Modified) - ircd-ratbox/branches/RATBOX_3_0/include/config.h.dist (File Modified) - ircd-ratbox/branches/RATBOX_3_0/include/defaults.h (File Modified) - ircd-ratbox/branches/RATBOX_3_0/include/dns.h (File Modified) - ircd-ratbox/branches/RATBOX_3_0/include/hash.h (File Modified) - ircd-ratbox/branches/RATBOX_3_0/include/hook.h (File Modified) - ircd-ratbox/branches/RATBOX_3_0/include/hostmask.h (File Modified) - ircd-ratbox/branches/RATBOX_3_0/include/ircd.h (File Modified) - ircd-ratbox/branches/RATBOX_3_0/include/ircd_defs.h (File Modified) - ircd-ratbox/branches/RATBOX_3_0/include/ircd_getopt.h (File Modified) - ircd-ratbox/branches/RATBOX_3_0/include/ircd_signal.h (File Modified) - ircd-ratbox/branches/RATBOX_3_0/include/listener.h (File Modified) - ircd-ratbox/branches/RATBOX_3_0/include/match.h (File Modified) - ircd-ratbox/branches/RATBOX_3_0/include/modules.h (File Modified) - ircd-ratbox/branches/RATBOX_3_0/include/monitor.h (File Modified) - ircd-ratbox/branches/RATBOX_3_0/include/numeric.h (File Modified) - ircd-ratbox/branches/RATBOX_3_0/include/packet.h (File Modified) - ircd-ratbox/branches/RATBOX_3_0/include/parse.h (File Modified) - ircd-ratbox/branches/RATBOX_3_0/include/patchlevel.h (File Modified) - ircd-ratbox/branches/RATBOX_3_0/include/reject.h (File Modified) - ircd-ratbox/branches/RATBOX_3_0/include/restart.h (File Modified) - ircd-ratbox/branches/RATBOX_3_0/include/s_auth.h (File Modified) - ircd-ratbox/branches/RATBOX_3_0/include/s_conf.h (File Modified) - ircd-ratbox/branches/RATBOX_3_0/include/s_gline.h (File Modified) - ircd-ratbox/branches/RATBOX_3_0/include/s_log.h (File Modified) - ircd-ratbox/branches/RATBOX_3_0/include/s_newconf.h (File Modified) - ircd-ratbox/branches/RATBOX_3_0/include/s_serv.h (File Modified) - ircd-ratbox/branches/RATBOX_3_0/include/s_stats.h (File Modified) - ircd-ratbox/branches/RATBOX_3_0/include/s_user.h (File Modified) - ircd-ratbox/branches/RATBOX_3_0/include/scache.h (File Modified) - ircd-ratbox/branches/RATBOX_3_0/include/send.h (File Modified) - ircd-ratbox/branches/RATBOX_3_0/include/sslproc.h (File Modified) - ircd-ratbox/branches/RATBOX_3_0/include/struct.h (File Modified) - ircd-ratbox/branches/RATBOX_3_0/include/whowas.h (File Modified) - ircd-ratbox/branches/RATBOX_3_0/main.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/core/m_die.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/core/m_error.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/core/m_join.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/core/m_kick.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/core/m_kill.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/core/m_message.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/core/m_mode.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/core/m_nick.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/core/m_part.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/core/m_quit.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/core/m_server.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/core/m_squit.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_accept.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_admin.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_adminwall.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_away.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_cap.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_capab.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_close.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_cmessage.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_connect.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_dline.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_encap.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_gline.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_gungline.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_help.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_info.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_invite.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_ison.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_kline.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_knock.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_links.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_list.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_locops.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_lusers.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_monitor.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_motd.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_names.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_oper.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_operspy.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_pass.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_ping.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_pong.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_post.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_rehash.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_restart.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_resv.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_services.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_set.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_stats.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_svinfo.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_tb.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_testline.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_time.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_topic.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_trace.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_unreject.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_user.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_userhost.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_version.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_wallops.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_who.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_whois.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_whowas.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/m_xline.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/resolver/res.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/resolver/reslist.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/resolver/resolver.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/src/bandbi.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/src/cache.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/src/channel.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/src/class.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/src/client.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/src/dns.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/src/getopt.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/src/hash.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/src/hook.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/src/hostmask.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/src/ircd.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/src/listener.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/src/modules.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/src/monitor.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/src/newconf.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/src/numeric.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/src/operhash.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/src/packet.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/src/parse.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/src/reject.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/src/restart.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/src/s_auth.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/src/s_conf.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/src/s_log.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/src/s_newconf.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/src/s_serv.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/src/s_user.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/src/scache.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/src/send.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/src/sslproc.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/src/supported.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/src/whowas.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/ssld/ssld.c (File Modified) - - -dubkat 2012/03/16 03:49:19 UTC (20120316_0-27369) - Log: - Add additional documentation instructing the user that issuing a --prefix to configure is highly advised. - - Modified: - ircd-ratbox/branches/RATBOX_3_0/INSTALL (File Modified) - - -androsyn 2012/03/11 00:34:21 UTC (20120311_1-27357) - Log: - Rerun autoconf/libtoolize again... - - - Modified: - ircd-ratbox/branches/RATBOX_3_0/configure (File Modified) - ircd-ratbox/branches/RATBOX_3_0/configure.ac (File Modified) - ircd-ratbox/branches/RATBOX_3_0/ltmain.sh (File Modified) - - -androsyn 2012/03/11 00:12:06 UTC (20120311_0-27353) - Log: - Rerun autoreconf... - - - Modified: - ircd-ratbox/branches/RATBOX_3_0/Makefile.in (File Modified) - ircd-ratbox/branches/RATBOX_3_0/aclocal.m4 (File Modified) - ircd-ratbox/branches/RATBOX_3_0/bandb/Makefile.in (File Modified) - ircd-ratbox/branches/RATBOX_3_0/bandb/sqlite3/Makefile.in (File Modified) - ircd-ratbox/branches/RATBOX_3_0/configure (File Modified) - ircd-ratbox/branches/RATBOX_3_0/contrib/Makefile.in (File Modified) - ircd-ratbox/branches/RATBOX_3_0/help/Makefile.in (File Modified) - ircd-ratbox/branches/RATBOX_3_0/libltdl/Makefile.in (File Modified) - ircd-ratbox/branches/RATBOX_3_0/libltdl/aclocal.m4 (File Modified) - ircd-ratbox/branches/RATBOX_3_0/libltdl/configure (File Modified) - ircd-ratbox/branches/RATBOX_3_0/modules/Makefile.in (File Modified) - ircd-ratbox/branches/RATBOX_3_0/resolver/Makefile.in (File Modified) - ircd-ratbox/branches/RATBOX_3_0/src/Makefile.in (File Modified) - ircd-ratbox/branches/RATBOX_3_0/ssld/Makefile.in (File Modified) - ircd-ratbox/branches/RATBOX_3_0/tools/Makefile.in (File Modified) - - -androsyn 2012/01/16 22:05:21 UTC (20120116_2-27348) - Log: - test - - Modified: - ircd-ratbox/branches/RATBOX_3_0/CREDITS (File Modified) - - -dubkat 2012/01/16 21:35:50 UTC (20120116_1-27345) - Log: - Update SQLite to 3.7.10. release information can be read at: http://www.sqlite.org/releaselog/3_7_10.html - - - - Modified: - ircd-ratbox/branches/RATBOX_3_0/bandb/sqlite3/shell.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/bandb/sqlite3/sqlite3.c (File Modified) - ircd-ratbox/branches/RATBOX_3_0/bandb/sqlite3/sqlite3.h (File Modified) - - -dubkat 2012/01/16 05:43:30 UTC (20120116_0-27341) - Log: - fix typo in example.conf and example.efnet.conf - - reported by Brad Smith - - - - Modified: - ircd-ratbox/branches/RATBOX_3_0/doc/example.conf (File Modified) - ircd-ratbox/branches/RATBOX_3_0/doc/example.efnet.conf (File Modified) - - diff --git a/ChangeLog.1.bz2 b/ChangeLog.1.bz2 deleted file mode 100644 index 3ccf6cb0411e67588a99561d946ea964dc5744e0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 46956 zcmV)lK%c)tT4*^jL0KkKS*X^vw*g{k|A2mXN&tKR|NsC0|Ng)K|NdbOe|_)(00H*b zqyTgSagQ$dpxb4o24D|7E4JS4>dkxr0000yN|Kb6f%e{e;~#WuZ=MYUv%7G4Umo~a zhF}L0KuEr?v7zh007)7E00000(a-<@0015!0000KGynhq00000>AlYD00wV>dY4%g zaO}5$1OOX=001m-^Z;p4N!{77S8P*AP<^A-;aEE64`{&2pWP5Ls_jhM@+q>ZSXWidkeECGZ z&g-elwDg1L*nQpF?+>?fuLL_8ovKcKhr17RHBJb2cXr7*gieD9Y|evH9)RnQKKFnC z006Zr3$s;f!a&;G00MODG!Rk(J@>(rn!&=;b>%~js{ z-gJH2Uu{&Kaiy`_*z3<4l~8G`cppF%3o5T|ecuwN-#0Hzr`A-vy>EH8Uiwf06X&5T zb9(mYv#&!J%Zh#Xyz-P@oj&%iF3#rIr(=8Kp6^~7Xb=z(K$-~CMu8`iX@N3?*qWZ2 zr0MGyp8UO$Q1gDgVA_2n-rR(CXj`hn8ZsdGHo+7lEz6*5sVoo zMn-EE3Tre(n;J;idKzgVhT1W#@RD1jFR2f zxkd?w!EBot)S8ORHA$hCrfri$HY`{Tla;$IX)2a%6&l8}T8k3P8fMmJnwBe3vTYTx zZ7DRhNl~pr&5dZbHpUE-6+tL|0)lgUv2e69QtNLgL?W23yd}yfW*Qb5A<|IHmk%Xq4G)7LP$)>9h{+elu z|J1Ch9XGoMRL`RSw{K+t-VZo;^-!>>PV){vlkXGRiLDpE7HpoN^V7140~V{|jpu4z zMTj{o*_Us19U@mgd9ZJERqbE9KTJ8b_t~JwQW-vt*Sm!q3bp98gxRiY-B8kBDdlEKdshXZ$#w^24oCHwVcXk=OGpdtR1G{! z$-%Myv+5b!%!zT->|Fcdy7vDj-|SVLuD5}u*+{42U^jRQMLkv-)rYZu+(5If3W+{% z)*KS*ELx^d;=YBX$qm0|ocUus=@+bO^p&k|VFoOgvfzP6c7ona+V((f@M4<7g-C_sRPD>-W9$KUcSny(prRDyWiVCa=4=)4uEN@b!COilnR=HIhRQ zpZGtM^7G;K`h2xl$xxJ`1rsLGW)vzKWdmjK{J&j=WB`$>%7=e^H65^`di9(BSD#Y$=W}1@ zG4=Iz9_@tKzBVl6n&CLIw;WY?tM66qSk-wb zv8gR`*EkPqvJu+=!k~~-GZ!-#0>c+1azQgO%)wHZUWf2|^T!3x)tV^l-;K`aB4(zL znKQNyh)*ouu$Ghw%#V-Y<<6pY;+$%pw@~A`n<;49xz}FXsECEUaufl<*D*=Yecd=s zk|*19mlZKU*7mZ>2n2CBi#u`6P-;w95f_#=igJcGt@G)(cS@j37)kMX1!8Nu*|NLSoXJAZ?6MX)T~EX(~2@Ya0?& zZ5XWvHZ`%VYD{9pkZq*IQK*VGBV!n`tZZP$Ak`6!Y*>*sL{YRA6&pr2i%?>v3MkP< z+g#s~eKx6HU=<7lY19-6^_Nc4MT$UxM#f=~S(z2Znw!sBWDgs7w1f5hSN=Z5<9)q7 z^V)!C)pQ~ad{@lr3M8e9APR7NNUgVNDb>_D4ro)70I>;zfFN_wd0UMjpTLBUB-xH|w!w@>V(a{29$x#CoNFsy;k}BVJvlJ|`6{Z&umF;ZDkp(K0Av(@DN#>(7c7tuI9XBl<4$S_B?$~v9*oJl zk7G}R_j6F7kY#|EWzC3nHqm|!X$rxH?8u@+J&%nC{(X-{zY zMzYsU8ZDnH<5yk<$qHyEoHKkBZf@?lRnoj%ykfDAXQmpp1yXWmdJu822p(8{ea!Ll z!-Kwg^uuke>9;@IbQA$kyhR7r12YFBA*7&bOV+}gMFU7E0+9fU6ZwB!MGs^YLOQ4c z2m$|(Z}9ryU*!hh_lR-+RAOQNV^Lp#NBQe^})U|EXs&h_UvtqM@)T-Ob>*3Q|L#nxlytj6) z#V&g^8QYiJ&sREnRa$a#wv_d*#B(dO_hrnEUA=XOubxt8v@oUgncY2j-i{81658Iq zdKJTTCh~1m_R9+u3*&r6ixrA$b31q;RKsA^Wp{DOmonWX^D8dNzL}*|#`d>KO>?E# zY~bt0MA*KTQ0;FT!P$;el`5x@GN$*5yw2lB#KT)oiAQiFLG=>(&7Gk-MUZ;xo*vLu zV4U5Pms366bEIL#N#1TIhil##GUR5l-fQE}%LMcTuL zg>!wgLiYnG(AQ#=oF;AVtfjkTTN8Y*m7f5+uR3QdI-Ysv)#2T-ZOw0H?sn>_d4}n3 z6;r)kdn^^)j_FmL^LncqTJJRuyc2|)P1iohH#fYF^pSIT@Fg#ACi65bQ^-!UVO{Lz zIlJu{T!QPsNp-k$9L(7>GhNw+j%9`u%Lr8FZB*{_$*TmqvR+)yzDVoIPXR}}oo`|+ z8>Ec&nQ6#*ok^QKIW6L6X8P&w2fc$0nhk7XkngXl)o!h;M>S-*T6eQfBSylcZt$?q z=U(--yvj7^DWQ)q4>H=L(mGk&GiPRP&QT*DW!?g+_P8?Z3~?1o@My}~BvUhvI;9M) z%$q@PPCDMI#+Bc7&E9rp=4Rc{?VH0^T(?u*+-hazs~4iRBu&!6kEdRzl#;4lZ>g~I zW<<`_WoK;N??}wrs->K#9NrtMrrVrvdgg3rRrZ_7tb04zHPcS2hO<3e)~A{Vw|BJ# zccV!%g^LaL)%KZ-1$6CZhg!6;D}qMwUpbzV!q;V?ZSB?N1PqYNSlY(9vzL@Ow;g$h zj|(&00_F6>r&007K6T?cZXgwZr=Q}f^aWp=M7dtNkxK;U8rRpwI(%%Qh>yn*}0lASeb^?GHy_2 zOkTGah(XD5AtYOX~#L`m#TO^J|V7nR&e#MCK8MV7|98kWy%8JiXf2j zGZiW$Oqj|{z(vXvhy+E3p_r>o!)nf&Af8u==Po(Zwz{36RmB9 zRV~fDbT2fVyK2nktEDG%45UdlZv`t8BNbLet3s~xZ#PJ$h)4|CsRJLryw?CL^ZWni z07OL(JcdJ8VEJaNuWwL0fWSZy3Mm0JC^V{wB%wGD(fH98FUxJlA*|bR+|@zZDWFId zvc4H6@v;g?>rUTI+UZgVC*Y5C_=5i6>+beK`f#KRNYc@SK#=4if}T5Kk9iNZKz?Gs zB~=d|{W;H<%eS`%-44GU!^CI)UC^132EmC_6RCK-~hyBONGDOeGBP6gfzr89QZdqwmZgCHFyrw;?~)& znXwM6k|?%=ygItZLAetnFDVmH#X7fYqFqY{1d|Cy_6=0q3AMx#!XcSjtVTJzfv5|T zV&+Os%`rxicWt>{-J~aR(Kd@j(-F?3Qba{FU{hkGuxk<;iW)`(cXmB*Cl18(!c58M zaeM7>wlM$G~|vf0b{_k<3x_BhTmd(4)Kx{`fv5K&3?ddG-A7Tfe#a{QXDFuf1^nwm(&V zb}v@3SQfMgq*|ze(NO}TQV6YV5l2`=Xed*u!Ju`A0xq$D3XZ7^X%z_D2vc`Sk_`z$ zzyifsOa*ks?=HZ(oaxu7YXUjK0T@7-AdrZN;#y7aT%^fK5e16`P+Ywu?q1HLtCM8j zZkf+Uo7Xt5Zp3#@&0X+4B6gR^oJA9?FKV-NZB1}dPY@(|aM*U{!0Q64uPlyMJ!Mr9 zdqA#dSv$89%s0(mn({o59LD!UJ zC_$?pCp+eyxk7gkIX7dR+dZ{&i)Hro0tk~EcM=VuMgcJvyKCmIz8<=bC5k3#BNSxC zqifpT-MNz(D8?wW&fKhN=flgvWXY^-St6cw*@{X^HVqqG+n8GzL!GFzdCqSyYCR`C zcy(8b3nEalx@hSXr>Ko1YiUqwywIvh(+mM~>*IulK_izpCo>15X9 z12|F$@e&-`SVW?wi=CROMvg}r?OV$dLf94|P+6j0#4xJb%n3GB4rSQ^UW3>{BSh`u zzK5{xsr9V;&u@f#sZyQ`^w-I+iUH<*hQw3o)n1;rG^=R--?RLG$1U{fk55l%_AkHT z@A@e~UBgPuxiLb)mP?jNgx*{=h$0G*omwByOLd^JNyQXaYhtiD7_66Tb?5RF31~@S z(>#VXu_CajG+DAqg6gyiS{Y)$K=l7FFCYR0L{BfU{T>}FA1@p4&fD$BMMZZXW^Z1- zmbkL5`w67bGP>Z)wpHmik_#s0sMWS*ryOpMOpKZ831JBi#5bm$W5Xs;>~&Qt$rD?> zOb~|ob9v(0D-Cddd3VC!VFqSWEj_HbUoL9Fk(4_3h9)jmiw)Tad#I#O;MoCt2HQ9oTz@#+NDCV9+u-9)P z?T(4(;rrvi(S$?*0Fy?0T94e<=lZq!v+Vx8hhJX@_oH`TKeI?tKvJhv6bh*&0U#2H zK~K!BC+&A5-}G4|@C?Ig_VyoTYk8Bw4N{077&9H{%$z&^o^*S8b>2b=vVWQbJiW8; zk6rnnZM|cg&ilP{epjJ2LWnTzz%vUUI!uC4a6%YeaN9Q!HE}g&XCzeS|BkE3nG4u!VCcR2q_t_A&t(GIFRRCf_%Q1*bOUW-Zw|UPWISm_@u@dQWC)JzYFy(a8_5ij{eNv5XqGB&<6) zb6xed)!okpjWj5mv6(efT}Nhh^xCnUncmF{Xg6MM9ns6uW!_=R%)4l;>dNlNfjl!ko0tlvS2_vHk~3(|+pVV0Ge<1* zcT2L>D$_3;mTd8`NG5V>?%eR{rp5Ic3trnIjdk}5+`Gz@vpDAB1!nHBX?I^#&rV>+ zS$UKvnOv_i_1|v3kcKyvI;&`_Hw7sLaqOqa)ZX-#7F=lE8Z(!3-e-AjUoKT&)Q{W; z??1f28xjh>-VY>{=!EwV;;rQsNnzx!&uUWv+N@jA!C8~1my#V+S##M2@^KOD5ALw7LuF1Dw$hStHHcb^5@5PI;8yP0JGzj^n zj?F?FV&y}#+sFQ`N_?${z_xnZmyuGDt=qPD@oZ@dm_JnBUt7~KF&cbo+ITeDoMIpy z8Ap?^3e**k7aE9pvfDasR;uHkDC2AS&R(R!4x`a({yx`ho{zf;)=PO>uzFW>PLHYW z7}Ukys?S<1>`WrX$(r)@qm&D++dt#(+h5PU!)-?Lq1q%L$o(xmzOFIC%8EeR|4g&vzm3Lf0{JKbTe

63pCF(k{`=Ph+ez;hZwD?zuys09Gh67?RpUDLNIh|_&PZ0Mq($c4a?eC zUBWC<`YXigHK*A%h!gv}ZD&CgRj#}E1l9S{j4pUMDW!WiflopMlZ72A*Xm)~Htzj) zuMvJMkYLg?z_YHjQ%tKY6(z`0AQgfX!?0!!&n&@QNd!1iS9jtJziRwC(^(5@48wa* z?ILKp+g}^Xl~90x=w;Otqz<}HA*P?l$wM9L)i0@XCa)!XSkr(cg0mlwMGx-kRO z(HfINd;#0{s9i*2^k7Y*JSgON*V((-SM)buEjc~f8+F*DGNaMAapkl0^Z0B33gBn= z+5S8)cJQaNo)qLA)aJ&0I%VpfmGx@E_F$ylM}|;Tgl6z(AXL+JDza6qqjC+YzSGW&9Y=*dukvUcR#%Fs@6GTufHe26ofbP$ zdTSf9`f@pLQ8xmR_irZ$NC};0PXdz_Uks{T-Ga_g9eLCS(raF=Q?E2{6QLd^(-@^L zw<@mzbhS(u_A4GOuZ6PP_;_n*(>$B#JesfU_`T>>>Mr%eEX1$(F0eIe;<0|*#C^5% zp!*2B|6l5H{r#gw*1A*E#Y6bc{-sm^wITY4C{W4@k$WBkt9H99Q6A&FwF0gDW6$N! zwNy>2Y5VEt^!2wrH_rHH*u%i5eVEmnhx2}k?juh6{O81qok|arV|RkU0kdt!^RE9- zKP+RLc7H8iUp;)=4Fg&*+G>9qDt?^u3pq^%kMPKYr0KHLcR#i7K`c7ebhGj6kLi)A z`-VR0*LCMmHH8jDF!p!1(>(=+RCusbYG zxW}`WPfBkmuz*f+r8&y|Uw6Vd58B>U#Xn+a_urQ0%dzd@nx8M%uWsJAP~Q$&{dD;p z)3t$W?1`Peex!|kxm@jW|JD|F_owLoJNaKcrx?P44FyISsLNJS$cxV))#Lu(Wns^xdfaE$$kc=}Q!2 zX$-2KDz4RPl-EwQUQe0cuZi)c zHdP&w)HRHTgXQ8LlaJ}?_Tu>!wSf!`BfdPD%{^;c{kqRKk@XwGi+lagi2FKY*XQn^ z7yKUjbf!V=ZaI!0|C%?L8i5M!!;TtSJ zseNDXty{jWTJgOdhZd`q*2X@+d+S?m^jV+s`*yR5r&;z!MHc=SRzTHNb{>bBd(68+coDXo z9klx7S00-h{2vghwyw@8=d0kPnr^r@E(Av|j&O1Je5?A_H}*rmzcqYjn(ZLzgYGjA zA6=b4Vdu-xh7|j$X@~@~j-D_Cojk{nf7*Vw>88g^_%eMbP099O%C4~?$k4HmXOZ;u zwU6Yge#I7IJAbuweb_9KqQnhb^m?r+x9PWRNsnz5vxOtxUj9;#+g6{Am$Uag@E6n; z(=c}bJU(i~FeJ$<@l|qOs*E;>VvbaXAhNEmt`Yj)QZEzEs}(`6#qSs4AK_m!Hb?riO-HFqFfvu7)l{Fv&3J{<_(b>t+Gch(HKL6sYJnYZ6IP^dWNdFh}G-P~_NHKL4n+;(^#@&;KB&468(1vfLV zGS$m&!O9vbvW4w-6{w056-Y6sR2%^14fk7b@AA;rAbpZ~fDSbBHr`EIAh@N8~+(t$S^jZmh=ReH#Bf@v5y*+=lxsW3y4 z3hc$4DODq0jL$2{7V}>OqWQxEfIgNB!l@T4Vx-|wOcf|P8jbPCg?jL!JoT22FLb;? zQzalT?xw}78;(?UjDya6u$mB=D=fjd#dzxr>&ps-vYbB;ytDY~>!k+Q=bCGATG5;I z_)};Eh*eCW$ZT^TXK2@0`f{*%KEgJ#hv9BioT#bjQ>-XDLp6-`@^GY966fixupas; zm+Qm4aCc-^y++#Qo_F?fYl`CUk3R76%{*(d8rC*q${dl!+9iiF#B}!eeGR9Ek@v2t({3f@5R_e3n_*UBfZ}jT(8kZ4)s>>SS6Yu-eJoH5`5j@ zIgKdr&^~mEFTyBTxqw>dORr-(t%E^pF5A0j3NqlDuBFv&$)&0Xri*Q<=C|kh|I z*?RQH)taEIt3M9(V!F*Rs<8jN5?GA;tBAcEmV0*T=JZ<53%Bdt@w7FUuG;aEg{E!|9u&okeemgCxM0XS7s+ssT*{S<~eRBYX)r)4TN{U28o`OksNB~w$FJz{ZHwhZit0yM{3n)Qz=+XO+-Lf^aT%jAQCfQK%g==O zF!*NJcTBb+gql8ENC3kAUIEw#Jpo5$W4fZ0BnDL{QC6EaH}(1jA1?AnBCYcF2_GGl zde;rlzf^pfVx4t=bfd+ z*e7o-{CKx1cB!DCBhwsjIK-{JbZVBe%i}Qy6e$FqcOJRcEKpogYDLIl)b_Po$k5em zY^d%efOVtv7k~*t@FPs952A8dV2>72;6}s+*TnJ?q4lX+A;zPHOL}Eg(IAGu0CG>z z4GyNsZi-6Z1`fD(Yc~TsH=P8>5T`Af3#uX7-In^p`)T{ zT@D{DoURh%NBsBh|5asu-#@Y?JvQsU;!k|bd6n?!0FNKhIMbsJ;e}9Kgzgb_+J>S0 zN~Eaod8PcMo9lO``_n7z)H@uO`p%4?V`@bNx5BIL^%fjp?`rGK^c?28GmCh|dUlYh z$<>bb63=8+X>|d)s)6C#yZv;Vzld(bzC34JP;_)}f~n{pp^BAd#a_qgY2Pv2?QxS*D#Wft zu+>m6Jm5c)+={=2OZF<~#n~fn%;H3}l?H^WvZ{4g4lE%g;Z&4qTTt^ZCk>qKj&!`P z*wCu}OJr>$)1I4#70))_s?rOjk= zt>7L4h#`vEQ}8M-c43^avg$5i%dEve+YpUT&mtn<@@KXuSB`CeLjr~MUNNPu99eDA zY(_L&>c3X11O>|`8;a=QuB$lRU6gHQ(6tDqdvAuI6p`&XRfwq`4iU@Hv1AS)NN@-f(oiR(k85)Wt z(cd=R;$(uVmFQU^!Bvhjq4A6*4%CNUDYev78{-3`j&e?-1+*^YVl{1bwX11w3@l-^ z4K(#=XhWjhL$2D{E6T~t-I~R9w)|F>wMJdC_G}FwgCtsv&0AY|gC%)UYUbI})~%w( zvuPAnB!}U&D0iBY?nQWxCyHZ$?A4-&S$Vcv?{2k*OF$YJ#n(Qt(W00V@7Zc&q~{ll zK^ce~n91hK1~)f{$@h@{+T@~v!h%+q)obB}?IRtC--+I=tomjrt=C6u;-d$pUNYTz z*Lq6ZOm@L^@QX3&wKI)&;52f+HN<$cXI994t;@N(*B!Jw6t=TP(@1yhqe-ODc6#)f z`6~8N&+fcZF^BrIr2!uwh1h>1*#Eij^4AA?N8j25AtaJ2y5Y;O({>uu*TS*)XuVIh zw5PV?_V~p{;=MlG>q=Z5*3lMQtp8nXEt|hpi^{#6x2erB{T+i~UXlUT#AAT)!`@f!*BNJ+Sm1EF-YsIHE z{e7NjKHT{?_FK1Vz%H-7VSB*9A&$aB*KTT|``ZjD-qC@X`NrZLH9+%1hboGgh-UP6 z2u>Pk&O4SX!`0~5w^*`Divzg(cc^j+GNTVyZN3xXx(;*~(Q%CIemK&-d^*@oc zMw>Rht$pFIc2Quzj#^&D=uXBVuUZYr$hwjgs%2!t*zG{u7fp=)O5&5!+ncsU=`2hO z1I6sU|6dA8=%ZGl4C=MLr%tUHBRW-_WM+O-m&`3nn)%{h99kbw7y^hK$^@ zr6A-^u(8M9&1I3hGVhy_h$fYO%Jn6^#1=w(`YnGd-keS`^|+Q>XeX6hl^!=^>&r=T ze=6jAB03#rRbf?Xt*=!E3WtTne?bl%Qdh8MZ(e$XMb?$3_VlasO6hg4uLIaFx95?F z((SwB@U!*#&+}DG;d-2q-ZHmwwmhU+_rryt>BX72TxFXhtTFQMEH$rohkDs?w}bg8 zgHpFq2}(=9ftzM9LNP$lyZcuMF>KZaXZ4JBj{q^K4y|ISQ)(s+9L_ zKj(Yj#fAl)UI_&E?RA^e+@`F3({BjtU&1Ugcpt_3+g1Xz;&%tpmIjB(xA;1_aa%Md z#d=CY!Rqy8@3p+vHLFqUcPjmSNcMeRA8i+(hnxL};=vFg(>czLCZ6ka{SRc_{+8ouz2ZJN z-Yr|43kOR5Q4%-#!s_?Df8$)tV_(39sCJL7R&Q1`C^95D`Aq9?tyjt{^NpO_Ma%D_ z3dyU!xC-$b22KIFh+PP&4{J2-7iUA6($QTM6BJs}b6U&N7J50u|E~A`@j(VrPzU#A zL&uko>e_9CtOEOT4r822`Mc{6*iltP&))v`?!Vpquk7~G=QsTMnwV`-6hbrp(q?A| z`-^8<)F%ZsKigAn?o$A&&7~+QN37wRb#peMYFv0q!$gUrxpgZ4U*?*gg$L*URH-#t zpNRvll|Bdd(L$cu{>O9cjPIRc_JjO>orL*>tkG3?hZ2ef2_TS3C=K)D;mF5`SK&A)pEIQy_ZhsYE8MUSoa>~9<2R;LHvk-AOIuz&>wj< zAC~w29MlQKA6%SIiPh&J_sh@iX5b&D4rTR|rx*wGkUfw4KR=(@`#t@?AMbm2|2&?z z(I4(8njgFSK7XjF_?o)-v%&1UI-)@zxD-#`K>+^a{|XDgUak82*X&)bbt@6k-9(!% zZkaGyzqAQyw?I`Z#mt2~P<=w#}yPcLW?&lJX zw=J%1c-}HE4Rs`Imh5i1iPWW%<;rc;y4Q8OjLf3kw=jz)T&~F6q?572N!c zvB;rJ7Ugp})TI`=xsw(k+{}|db4zAGToz(Nnz2U4tg)P_VPRJb9ESmRoTFFgV1^GA0l%Ld>QTU0u6X)h#;XwC7Tc5dk>jZOuQ5(Ord+6XL3V@`DIiHoi--Pbu_u2C9s+qL`K`p;ah(aGzJR^l|6(B`R(gv#@|l()#snFzVDjepV{@h z_TJBpf4cG8qc6iBh5vv2^Ir(R;H&(2>giL`y#GT#?)W#qmHj=udAIUa|Gv9l`7*#> zyf^NTzoWH0sgVG>tox#U(e3?zzV^C;R?Vg(c!}$e7_Sv{9rDgIg46#aPzBYE6qq#T06Rrj{U%_+-*jpo#fp zK>r`f{C;ixzn9niy?(1$l5Q`1-uJ!ld!PU!Cg7q5Y-0|NOw9X2sUiu0RaI40ReSHd zx`JBSE$;2#W@cw@kp!H^+sTqil$6e9cJA)(?)$@u?&+D98*|-a$-BG0$ioDK|A9zmwP*2Y6=i{TI8_6l39zFYcA43wL(c3NEVa_yk0Z?I)u;QYOj; z3PrBryv<)v9?oNF+RUrzY5#BA|Aiih=;MC}ZbwC|LUc}#e}4y1`o7QA_3P`>L{&{i zM9$3{)tl8q#*6}3f*{Fagc36#0~-Ytl^RSEXvHRx5fO-yMqr>tqQ*>=fhM5|49t`n zF%oJ@D58ywOp{9iG}U(3axA5dqiDLPO&CNGBncsyAd*^0Xq6DfGet%SkRpEu-Nq=C zswP+%FwD#-8EekqK}1xcm?pgHT zwv!0_ZJ)1v^Dfd@$^>bwa@@#8hByo)l1rA!Y{?}cM0@m~#UD&aBiU>>@ZYCy3D>>m z_vdlsKQW~*Bd=<=nm-za5K;7$g*NqlGKGF6KS?wt8DeL={hKrgm%BApGjnb!DKltQ zsv=D#LaqB~39A>B8JBfYQr&G^FVD)bL2g))e`(FxxcTq6h|@!JXXV}9%)hyk=4r{A zbfwiubd#c{T!IiOxoAwyRMh3jmXaSlLAhi!hlL~&DRV`(*=5Qt%&C<#KZ=^CS>@i5 zjyq%e_!lni2w z`nQsn!e6BZw`XxsL58G0mz}mK@bfDI{w&5aR-4(H8Dr=-65IMS1rSG*N~ho30|HOk zw#sswmWyiVcnmpKvm$`&voxYU=}`v|%*vDM@MWHuI&5Gy<;fs|EYxKyI!rDy8Hp#! zWoS>5k}Q%erl;u-*u{zfWhpEP*_j0Xl5wG_WqEX@ZfrARYM3X56Jn=*!hqIb6q8&5 zxM{~ct)qkn=>vg4Od>fzz=8n+=r{@m(g+nv8sG_l!l5p}WC*a)0UQZAK*$$V)_@I$ z6$Vm(X310vf%nSf6yh)~z=ygz4&7~+Nifjg*KW@I;@Y*kUIuekuKimHJC{()$g*S* zv(Vf^musD1ctX|(umuQkm5NEgQFRtirVOvh;%a^ucEi_h9Q%l{I!HACKu9DK=0r)@ z3q&VLL^dUeH_~5=zbhY3oj1<cIRUS>F;P2QK-5FhMcxr*q@@1#Pq>Hm2%XB_SZe2NQzGvZ)m< znFa>ujLQB<+TM^T#b4H2vo=gW62`@W=2t|EHgNjB-g0bGEj1Nh#pIpd;*Z0}54Y4S z5J(b5M+qWKkk{~RFl>n|HlyJfM*~OIH8v#^h(d$uM4iOaLz*$rqBDrXxr z2xdV5RY0o0jakMl`c|V>*@?X^c(_}k$g`5T(7#9wV+}z$fJ(xLQGmB5wl}5DEJCTe ztnC}#G|gE+!L&W~%iyDJUq{ms;g5adN2FGL;_>{mx$09rW4~qNW0AFKi0jQLn`pVW zO|mw)qjnSxv$?-X5O}%~9VX;DUcvIwps=qO#46kod@Ju9*~3MZseHpYw5}w>>9Y&b zM$4VAi`30s+0E8BGa`?r)NP8|mBX`eYGO8%){;Rr%L={&cD|wL&0N-@(Vvy0V1HOdnJckkGwC$}SvekpgbzQX{6zqoQHRhT?`U2ADAa}MK13c3_ z1vT96Z-ykks|PD=89~DIP4G1^YJh}GS;bID=L3gbcPd4~Ju0E0Xad_g^(?bIo!5-xu0S~pfth+SkxUp= zvR9Dmu<%JY6x=JRAc%F)i1=U_v_bxXKjr9&Un2A=DfKaLGies5enB zLUkCcO%>c9Gq%)Bh0WI9Xzt2z6yg1RUw=w*QO~r^Cb9eqe+HE_0%iEyaz&yK^H(Ti z^(Ycf3i>SgZ%~=}t+tzH)+M_$lcLdS!pemd!bR^vxk$-UMcT8Psf}*dT2;*)RIZAq zk22#+KEcx*Ju?Fnpo@l9#Ee*Mj4hyT+&M88vYmDtyx(NeF{W@}QQ^qnY^=Q>TX)ff z@@EiFwqEzXY`di!~Ahko1_b zSOjQ8Dc!P4zH@v~oT|yT1C142oG8h(YI3nbwpEMT*nQ!^r7#X=C|hP5(R9VKtF0u> zPKOtXvnr}Qy>}5N*G8RSEs!LZHVe7{m=D!ay_{?N*S=o4BxUURf60G-rhuhUZlKu% z%26;GfpvsJ7r?vX91geI|uHbOj1)q7O^Fky_l@$(-O$n|Nswuk@$sx$rCd5ACQ0`Aaa0Ky}dnj zo#(FfnI&I=aZk~oM++-SR#t4blbBhCyTc=ZOZ{C&=m{J2>gc-kqFAFglCi2arTPuU zqf(H>giKKH>3`8N*Oi1EEAe0D$CoV#O z>m2A;VE_mqQf;|C4phiVpp-( zJMRoLVkFeikW4a9VqlXK83FPQph*OgXPe=SaR%(n^cB&#^Yj2>EO4>A5FG)8e=Y6LghC=9q#)T1g{N&%6%gVPWbo71oZ|5D z%ohjE=$B_MjWk`mcGhpAx`;R-i!#i_ckVZH+6Bht@XX?8m|l`0)80#g?(HED2@!-E z2uw~uWCF-q!qlL&O806-CWde-gWvkNtHLNyB}uRXs6DeK2q+K~8BDUKl$oY!hS^bN zq}Vq6PHhj0RJ|7>M*whqgyaCwx=mx&0n!j|P%s{j0$>s#LO-rPfjtW#Z~!wcokKw= znUo#(-{4x>rj2O>4x+BKE{y`Zg#)O7r$x?rUWRo4qts0=G$qrm$4!J8I=X;~2!x<3 zdqb6MOv4~0zzZ{gge+9^jsJr)LxDp|8h zN>ITp%L2g4QY3^)1Tb|^pI!Ig(DUVV8>!hC03ccpm=ASOgbfaj^rUsbHwHO6^b#Zp zlTuYuTCr%hDvMNAlUpXEXxb{pv};DRT7rS4LZy0byaXX&;Kw}dqG%3IrOzH@h(0jH zLx5!lRt3S30|1c-1SCWy9AI2jWK#seMlk~vSONq|MU)s)1VF}79!HZN+CbcVCs5Mq zU^?pKIijO5?YJSr933PjmrBK@N@`iGwwjijnxtW2AqZJk5?BZbSr%0++HERqwA86- zQ&UqaQl^zDwA#x|)Y^(b5)jBj!bnI+LO_L5rln;|O_r53w5h3Vsimf+rEIjNO_el) z23RE_VIh=&2nZ5F78XPxAR!_W76MjMGSa1{)YPR-rlm@mM353nK*B;263EIm&e1lJ znAnJ8hAtucKyl?fO^Sq;IE zOa^%lW=T_@@qz8YfyYm4uB1qolLOR)bnYX*%60(*Gr6cp8Bzd%z<|L+90L{1Lj+_c zBw!Xm#uUIp6vUh%GZ8Grl#!$vScGCzCBT)G86YK+LIM~w5TqOh$uVIifP{c$g@BP^ zu!2kz1;YWbSi!}Wz=XsSC?Xh^Syn+MVGRir7;WOn$tMOQAyizY$VD^Pw+5u!jl9;>G6a&nph2YRGc@Qr6F|swC^0O| z7f{e37QRE6R|58UXa~u1G~c^xXOM(rgXZ@#n6-E%5bV z=^@`(4r|U-1$0V?6H2X`^sCp?DA0rkBp8g^yXW_cZic$}^g7%Er#qe`q7o-FDny_$ z;>0x~SgxS#ooIwKOg0fI>&xly;of=B8+{%WbOV(R-dZougb@AK2a4H<`w*Bz&RlbV_Mc$8})9HOtD1#zI z7z7Yb?BKm#RWVgDG9|VfZ6Zk~-uG7e>#(n3ejIc->8?Rt=o6%-Kyi!O(4F>iSapJe zDgr7FI`!o8x4q~}2_#7*l1aeY3@#8LXoz>_eE6#Y2n5ItDoh~KEI=y^C=xIzLIKkR z1Hm9OFL*#Pk!eulF;NI$P?0iSNs{99t#o(qO-gCX3 zrKqT?sa5t1jdw-pCq6bjbJv~_282d{N&uiFO?A)+aUkReSwVFwYC}@G!&Gf%hcRri zon9o!GBRGrf`}x7L64sM<_r~8RYIm)ZKRY)KzbquE_UZ`K_XCrf*~a)R5;&2opS;B z!3Jz$4m#j#n5v}|;dZ@uOU|=h72`%LzBkd4F|G6GZ_V9#tQc7Vy}ATZNmq`lh(Uz4d0lS@Ma<}Pij zw(g5qL^rnWu^h0c2+MOI;gMA>7fM98NS8`!RZ~!9s`TD5oPJw}>H=h-PP?}YzU*9O zqntVR|iunrgJ>ZcJ2Egp8PN%LEU=RCPI{y3+?E7O46b$_wahn zOe#$_hGiOC8)ar?>#Md<#LXa5sXgshqb5 zT{j4`+T0!ru5r8GglIyiMey93|{xV}BTJo{{U6%Ma$`VlJbQNU$F02dx7*K z2E!9t3lq~?-7eE+_p@on_V`{|pb3Nb^Y61iUe!)x$+ls%+h~$WB$M(OZPVdT0C^(5 zKpuU(ymr~>m>t|q36f%aPC?rf4Pa(tjGj9YF%nZyB%uTnH{X5c=Y6RU1_(gzuIdmw ztGc7Qx~i&@m z^Y6b-)^5#WnV9Ba`lhuy*FZX_swZR){e3!loqF}zgb^@A&D~v^^SpVlI_fF+ZS!ga zNeweJEeuIPbm`;Q%bi>6RaH^d%AkjIYoZ9i(Gv&&zP8T#Y%m4(*f0bF0YXUh#K49j znKJ_ucw+7NK-CRXK}1PQ5YW-teEkEBaHlVz0nuK3x$)rWoi=ePCPjE(;@@dTgo8%KMv9FlzF6N)@HB1R!@7kjpvu;a&N2cnh=*{Rgh|kExzlmdI_eq{ zg9}rsbZbF`LwbnxlBgJ!sv0OCPX1nX%6j_v)yJPhs;d6)KTY??7t#F>JIjB6w=cX{vi~=3X?>c?oVulZ$>mT(du4~7 z8^8giE4hOb%X3%b2v$bG_dpAgJ)r-lQmg(fuhGKI= zOA~sRL_`R}1ONfNfSte{v!n^XJ^T0D*b}5FzOvr~v;cwEzH=aS+XU;-!10*Z37w2G zYLjygu4|n#l4dlwbFMO~;vU=LuRU{4_2(YDcH`H*XHJvZGg3kdOA{>-ET&Y=8k0_i zHfSm!haTMmsRdOyL`{_ffGAK6YS*)6@HBb|u#HA{ST}r+c1=J*T-8+5>5+$7qt$35 zIJ#aA;D&YIT9GL!U9EUf`Cm!)B>cB~%254Irs3g7x|9tH6qL*pMJ3P+*UJw(en8&f zd7>XBK96sIe?9l!{d{|#eEOf-FX)7Tm?44)7^xHdENxuXNvfG*s*_2xNv3LT47D)P zwkuN#+CSAq{#5~9Fxj&*vjrfUM4^T&t;oA;vfVXyY1@^})R~tyE1jC9EW*%InL#UlmHXor7SmYdQ1q2bPgTaf~u;l9ZkDz?X%om`Zv)N$pgnt zzB~BOgRpm0BgO&aw#Tl(HMp9w0Jf=DS`{-=Caoj6C@kLgqrBdeM4?Nr*y;i?q)e6P zuG;hSR{NGU7K}u+1yBb+E>AsSHB_Ef9zAg1U;)V7A|SvC#xZSo;rPznYDq1zHYAl` z0{~G2PGF(AYK)6n=>x3}vp~DPgmx$pk_sUtl1M{a>rM&Tc8QsTGZQc(A|c(~-PzsU zl}bIHX#@w*05Y5eKrj(4P4ACh$a+iS43MP?h#S5Sma?@5iY-P?K}H^ji6*8Ry7=_< z?ai-lGkv$6)r&H*W>Bi3RY-St*roVH3!&ix4FUniZk|24^VgrZrv7*tC!AS{kXebX zV`~$S0PU92^rm#BA|a_O5V#DEa1k495H>_XphTvTp8lHj?rkIC7}T%c z++bnjodzV00s)J0JiEKQJG;BPyOY3e$O~W+^$@AT1Q!7}$2T?SoNRTYAYecvS9fg! zh=^t&hS&^({s;i~p8K>aWh6-;Z3!{w2p^we02oAFsg1DBjkAEnlmTAo5Y6ipH`Q8{ zr6Q3L5fIGEs;ZNsr3hPqnc8(giJ(D2rqmjo&(F`E$I|hHe+(35Fi*h~?`0B_kuumx zB#D6LIE~N%H})j`#7BY$ZI$lz9zau4i)_F=p%?_fDMBM)N9X6?etthGQ3Uel2-eF8 z8%j^rOC*s+x)mkMf>eo^bx0Xbgr?ml992>*6oMjX66v-cLU*uW6Z9VWl8OiDnJ?HC-NgzbmL9lTYUi*TEq%3wXWL@|)wrIng`A|WyZ%m&^>=Z-p^JzYjfCN^tcErCVM!`Zi( z(!fL_ioq5!WPn_=c3m#Ja_z@CH5n<469ke3DfY!D1f?pHnl&;QHB(GEspQzbYoeDs z%SoE#_mj%+bMqa457fxL@n^n$m+hBfetg>-Ah~ijm2o@Wi7Q*X_1x=kw_pRWT*y+8 z@!^&HOTef~fCv~VxCy@fQ4^{GuN(2h>7IDgjzHXsAR$U@s)3H|+aMXfyF}JR%)nZ% zgbaY2jSfIYu-b!5?RGkv>{XS`&;h;o*YFn5jqHdHMbQNRNk7b}r7_Uy!P`zKfd-Bd z4w`Gk0FbJPtf-1zxrYpst!qIrI@XPPqw-&FIrv9Vc}IKk_4PU5vt}oKU{!PzW2Mwv zgJFG7Z*Ltsy;=qcAD#*_1baXMJm&yDk&OZg0!#^}@C1-4L&BaY1;~L2$FC zT(dK?uxM9x0Iom~)h9rRw15E9O(~1E7TCLobr@z)$*|G%Kp!)~gCYiw!5=s0qMvBm z^@HO~#uZqAq!o5ymVBTAML~dqu7C|Or8K?sjF8X;Hl}mP5y|ouh!z!OmP$-GlQP(K zd)+r~z1KshZn`0Bu4|_*cHW)u9Vb(EJGwit#+#g(=ja~OBArozg_d?^ge&Jp1ke$Uay|~)5blLe4Qr8)fxBAX&Ii? zG%Y*V*}f!|Ev0ilGe=4}GU*1b9?YD{x;1Ym@Pj#&9b}q8uClJ2g}Q}Uaw|!*QnISd z;wwbuHpTQr06#(?B@h66c5}V?0B}za&(s6T=?WY7%z@{=Beq}%c^7g@TXcJdy^mtP z)&B7V>Gz6@pRbPVrw&Zdq9fm~&vZbatN;%?KJgdoWt34wDGEZ;fdbwyC=&Ip zQ4?Ibrdvx3kO>6kPm9Qb-#nYhfsX(K+WPIeAf8B&Z~!h`{ahfFO)NARTxolfNvZ_C z8E_FXpp-#r#qPwDDzK{|5ZdbE-~j;!E_0#2f~jMbQ(%Co_u%*-3;B@|^H`l}TPqVY zEuydhey75H2Z&`RYucG@H%t&_sg{V4gH-9%NzLG=5#({vA?;^&I`Hj1Czj_9_jq)n zJH|I*XjZ0}s3?|2!PVVsy6DM~5fJ!%pJ_iX&(iRZ3DJqtK0Bv%JJ@XYFr47LyETN) zt?r!*=x=RvS`9YTk0nho?)25w_U65os`p^nx!S>6b0$*UwQN1i&_vp-&9g3@JZ4`3 z5gx#RL`7Gl7toK3;{pMR3=G6|-vlTFnK>Qd;*7CrtSYgK62Y>FMMY99sSnI;C?I4ZBvj1I#U(0BVvOg8jbySF;LuoptQwZ<$W8c{m`v5;X^*!>xUsdip zNi9!u>Rj2pe^~bz!P~ap-l^P?csz&#^&=4ugnoho01yPxJum=mxI{swGiH+{76a)yc>;Pf_G7xnj8JL21P0hBqP|i0;p58oNJ0hXiwjic^U}tT#8kWplfGo_8 z$UE!h@i+jD!4dVEyXtk-9avZ450u{oZqiSR7DZqAd*jD0r85Z2hjjKV?jho z8PYF>eC8;sw+zh8tzZCjU`9~@KC>_*=yq4Wc(0w1tu(d-4f?t<>;NbLJLlGw@aLnn z2x!MZ0{x%>#6Cv)FL+E@_pr|DFSl<+rM%i4^}^cW%ZSWcLXEq<=A2ip%e!-%r#WDo z-NUpC!49Fy&bi(_(%M|5Ikz?ktGaa#c9x2vq8g-`Xp)u@7M2kfmRyQb98qxk_w;;E zJboLayXhO0B~{;_Jg0qmE3Md+?69!(-CF6zlCVCSG53;!sywq05WP|P_&9amc9<&(ewKEwb-kO8~S_kSc1dDj~u%;?_> zSSENdUNaNEu<5%DQ!hct7Z6oR6+%A4G}mX>m(Jezdi3XBW4o!ZZq~&-8+V5F?H4;7 zb`z?6YRUi7ss{w}62n_s>$SBTYiJ8+m8{D_rRKN2ClgdE#MrRZ&G6s=4@}eAR!|H;#Sm)_9E&0e-+m_*3i)NW5g?!l zgpwenzKa0+0w2F#dAedWghXRa6P`?yBm>YO&z#%%$an@4b*laT&4~Bdh`99wI%|vK z^>xT0qT4t}!UWd)KG-V_wN*|;sV_4y;T^1qA}BMcw%IFld?^K#5{C!^&G9xE`6B9) zRLMw$2J8Tb%=y0j`9ANsQjTm#f&}M?1fmeO%89LGoMw15MNe@SZcdRk53_t7>XBqu>#;kpM4ZAOHk(BD)%&G%qdub?=?Cu6V##q$A@n3M09X zU<>Qdr2OHgIDiEwD-*4091Y-$jNYMi~<^0i{m)k&i z{17_5^=6Zb5qcJZ8|NOcI?Di^2aiM#k$zVYuSoFEbOFCReVt@{E9HCVzQk?yd7lH+ zee{G^CG(wt?ETHOT0l(Q(pT>zm%`u3X!@ zY1^FMce`b*E(dMhdWX&5CaPMjilzyQg{r8?sz!!bmS9OBl1x>$(jQsv%c^hO9!b8; zL?>IznaOHug-F>A*x~LOHg#W!Vhd|(*j(8Lvov1(kEi3t7YW0 zonR#`pj_iJE?)s3PyirhzVELH?-+Aozh4||oOR<%wA;rd6_YU;P>PF`GE_*|))hHI z(N0r*YBzRvUhTa3Ya<}@j~l%=z20`x2}BvBOsT0Luw_v1upW3X+(~<(*5C-DsYG`H0#-7Krh>T6nhas)<&-L*Bt$oUuVNJ3 zx-P_|j;X-|&EGf0-bpY3@hAkrF$d2g0qa(3(L@kSQtW_-4WXVY~!m%+c6s1DqsJQ+xUrAp+D&LIr_C&ktz>fQoxwSb}PKdnb!en2M zXtZOT&Fs}7JZ?gk(OUe|BO_KrnYnYjF9h7W$vb&yf=)JdNTf!Wc(!HT3(GZ>vg@D# zz5oVP#<9ofbLp5kQ15?U^jFn=UM(-SpB^#Nk&y)o5hF8#ro|OfW~y7F+?EreL{b#$ zrOh%?rADS?5+<9fWhxAr6HI-9u6*))-zTV>z-EV;jUKxvrmD9qw#juj!!R0GHMz>9 zVDbidkr2QFD=Wi)LImEU=aYmCF%UkJ(F425z(@p=OdB=;rf1JQ&ZvME981oKcja2h z6bXn1Q~->Ya{xo@z53qlh$#TuBps=ACIL&^IeyL(YZFMQg<1q_-EDlSy{rfdp>uQ> z5n?kT&Pg}67os(7{P*Hr=gmNaGW{Nix*mHNb~GFL*=6Y;2oFl!X*im3x}DlWc${`C zy|m{b?(@7JS($U4;hf}WJ5El~tJ=3t+1*?=j-y+$aTbOdrl_dHG9qX_)lf};Y5A%l zf_&vXKqoS({`7Guo|2uQL*)t{Q|%)2B0N9=)_3Tl!7Ng)6MDnJPS7SHms zf88|yr3a6dHj@xYnbrQ{D zxwNEQ+`D(8bu4zahKV`Jb`9P_hSa9cz8p6nU1n^}cH1*7ZIh;zo9lY6NG5L+eYw3x z+Pbpt=-%gbyL-J`wVbL}TeZTKhB;2u)hA!o;a+)t+%FxuJm%(N(8}GGcLub`A$hVe z(af&FNb!BZ*pq^59%1Xr;I40-%WE%k`gYZ2Wvbi;!q-(pPTbi}d$W0ioaqs^?Ovwu zwd-BFp1hY?HM7jABOex3+L_EJlCigfW$e&2M9o0ZQ>&Y;leIgqT?>t;vv+#t+}l~U zgwHymI*z2?NIkoAGgx%USaY9URvhET*v(4MTHG^g<<|BKp|e|OWMpP5yqcARzauha#n{~aDS1g%#C1TuDyw5$UEODF5R3?Zn*3&x#p~h6^=67{5BBvScO>5d` zUvW2WJ?hmKD{xTmqAEhIc{Y!#+B^lYZD|(nUW?*=9zXdZ9K~6P|VHIQ%fE`(Z>z- zZD)1&Wu_R`b4oe6lJhQWrDp+GO9Nw$-BOUyLiJv!8`nL@Xjzv$y0*J?EPa~f(7ve~ zEb83t*~&AV`6(OP?v5$yHKyqAU1OArr6Q}P^;L`2U1b?cOtRYL)YPS&Z%J(-)Ov2I-QApfV;JKnupH#LRGSylY*kS0xrJS4s%AsG*Gg8ElN5=iYb{81 zt!qV~QBu&tk)N|q)9rn~tEpljr~i-p?7!Q8ZiD@k_y`}b`ZfI**ZxHQx8E(V?f;YY ze)nJ>OLgs3P-G$^57VP-#^8GJ8jYU@|}HP&F7FB5CYlvJZ~;;OHM*zcL@+P2$x>eROBh zn048sHJU5NKw0R>p2FXH`5^ZCR4R9<9zHoMU>ZEN1HW#0Z9fC%d`Ss>9)aQIJazUn zk3Na<6Ulx-0tgB8Z&T;ftdIQt^kh%h*%QUcax9+v2Z6*NgZsH5LIdkm{=fadulm2Q zTmq-?bFcb;voiABaCP7{!_ORZ9!eAfIs+{x@M=tY)lQ+vaq2j6!RK0o$E zOo!;2>2zcSfrd*DuzgEjqKF_tt!x(IlqZ#R0R-fLho~xf(LoDI`kvx^j!z!Eb$mhD zGB|$}NB_(!A6+lrrO(&FuEu1YgzbC*n+eiGZiDU9Z^xpN9gg3qT!GRAP`6q zDm6}?=>Y;D+Q<8{)lTq17e1bG_m}344hbfX&0p_P^Z``}gKph-KpVVYaFjq%CsqpH z@los_m>vWnB2tEQkVn9JNBdf;u+|l1! z%lNt|{G;%ahyOTxA9?tWhQ;ou;qAEmxZHXBZda}P@%8Dlf`k8>ANS(SIv)e}9(Fg& zR=F!vFPoMku{IGTOJyaPBhTlz>qigJg38w@8e_8eU{QreN-Uv_d{@?BY zi+>^gzi;?{kFWk;?6>@*-|hV+|0Ujk$}1-}^ZT8*LuFl=j_j+>Z-R};@b9hemTjz-iN!>iv*?YF8=Q8%v z+B~Tz(mRPD59>q$-g$Jowz|z*Rw>lsFO~T%w>4z%R~sR;>YeK9(X+XEM`w9;^fIq0 zhPejI%Bpxbv984xEU_--ABq7H?3`LcaDRrmYQB7VQ+ij$AMNrH;Qx3vq4?TuWkdleQ4mr8^2Nvf9-@QpT-#60|H%L43seCGwFMCZ zBfX#mADgIdPS}JWm_KnqgPxh`fDlqbh&kgy8B z>ATxX4r>H(>Ah0iJ~mX`L8MMk7z?5hK1M>76tw$(_#63BVE)At@lqAZ8++P@O}s%{h{x-UjKIwSrG35(ngN3c9b!c^^-2Q0ocJ0=!H%sJmo`IJoVD= zSaXIbc(myA{Hz14DcjY|6M#MA!HPI_EUS5<+_0i(_Puqy?(A`*!#U1$Zg^grH!W>w z)Df?!XG9C9`68x+^%axxHYhwk0|Ky`$c7M149Ljz9-kv<0DsbS{=O61dq`z5&bwkM zw#O$j-|qOt`J?*w4{0>5=p#A5r7Q?Hctu8gfN+ zPcl5m8V{vY?BYIT_J`&s_tmD%XS;@gapA_!XRZO$^mpvQJ_!fOU(H=HTe-=jT+v-B zAn}+bDM3KcahS@g1#OWV#0I|iRUYB+W%-$OA!#o8c%%vnI0h(y2cSs_9WxG?HJO-6 z5{E!y8vA_xkm_-KO!=P=Z&6S63r8*2WUD_LnkoK|r*k)t;mO-$E6GIGja6mn;S~}H zc=py^9FN?G%m#hJ8hRaIdA&2-`VHdy?9EB5LzQ-yP2WTO5r=g?yP2Pp@R^Vt`!EB_ zl|qCHB0jylQ}sa7K9v;GQh$mE>XiEA1JrLmr}BO%2Oa)@Ns-1l8-5)-x{e%63Bs#6 zVU4!#?&MB^NG`0ya6}*q1GkH^OQNJFN+*QDV1Nv5WKLxJWmCBbefq^sK$b__r6|iI zsjn-N?5Y~k5BQRsk0>esxm8#GzQ0qm?a%;Rds(;B(?R7RC%2Bzk@PU_$UZ7~6h7~M zxMUtPI6Iy~^!)E&#zEI;)kQk`F1pZJifJ~LHqE=r+|153o6kHSpFod7dFoDfQ}}34 z;77Rur`I;}d^(ZmD%f;9bPaRYG3yRNgtxCJXsw;NdMZ2vDlh;^wEDFd&Ov^>+$k6bXNfs}wCg@fCnYZFw5pF0?% zFxO9qugjD3`~E%;Pdp-6ti=sVYFPU(!;OLI0lTe+@WZAUM9O4u=C9-w5K#5xs!(Kg zudI8T4%+K$(`|Lz3V_!ec^dRyW~`s%iXqwqpxr2)P%zvru=yZH_E|Zu9UF6CosWP( zI{;vCr)^hToq$EcQUC8un^bCBn8GSFLIe5j>)RjO&yT1lRXG#I z6d?706Dho~15i;+M?dcTb>x1(eg$L{6BINQ(OyMl$}b?l4v2hm@r4=pZ#c|TAn2LHte^8WpmF?4)FRT>qQgh`Yo ze!0uVLB5#v^WgM9jW`hdAOqC*oYaOvk^z^xpN!$ZgTSXj73`*M#VMb00Sk+ z0Kkz;K_Q^F8(T)A+QzMlqiQXx)LN?++iL|_+SskMnzbcpts1f>N+CkDlmWB}yt;>? zYc6r-Q>W?EOSd`Bun$Q`Yev|)ImRo#(SyXP$6PWBL_X*Q7q!wyYy;)nuCfr=kPS#F z*^@87Y`Ng$hjb1|<8Cy${IvGmu(Ab?6x@9ms~0(~5Md3dA38dw==s~7M4_6D}#P(h9tJYa1+igh6Ipm^T_HwYKJ z`}7lqA{mf?(}*+I-#;Xf<~-m#@O(S=z}}3Atzm(_9x6`i{810_iS+h#LWrV}b*Q4L z9@@;y0<%W#yS!%ycXyDAm}2uIFtYYQ+KeRYK%cSZ<%oQX}!J{+0DZfw4f#~yxq4ee%>+BwVa05@gp2u=Mg8TY)=UCq7+Tffhq zGH}d@ni?5uCo(b4T|#2CItM2TSs3m$(Yu|%p-B$J-Db^6F$t8-)z#R$w&XMfh?wUx z-qo4!^q^2jFlNQVvI-<~F%Ol11V|#T!K;Hg6u7F}&yjsTy8?f@4T9D(W-sL@Ab}A9 z7q#F96G}43fRW-pvL5Rn?Sbnrhwu-=zq>XQuT17B!@&F_@v!+UdGyZjPsmt{rIiI0 z6GZ^5%n(4(P!btV`yZZjVdO}^3OvB05gcj}6mh`^)CPAj*nepX4IFjs2j+9pqUOWz zR6A{>TN)IJ{*w;Z=_yJm#VJ*_`WCAS9%6|E#Heq5u9)#$``ati9QDZI@(FwSOOrgk z`OPP-h@vZ$z%wK0Gc*KB*%nF$$*Wb)7$2d=B(nuz1SuZuw%rn0+bja zj}j6e+5Q=UoUMrK>pib_EOE&dEKPJijHnICK~0)!GOJhaJ~UnEL&W)P}i zB+IBKPNDI2Cnymh;oe@aj* zWb+vK@a8_J;$#6`Q72KMR&?h zr+z%~F~ERuiW(yW6Q4&;&<)aIY8^!p1e!*etIBJwd@&u(GqT;*P-K{x;T962xhSE; zCtao}4?kbI4MapG zW@yk!MUzr#Eg+%W6@A0&i2&A$@4R4&9k4g{9|Y_Ny5E5>?!(eYj|l%L z3LBf=NDzAZpDs)}+sEOuZ?AR<;{^S>hg%?fsRV^756k&~F2Z$>Bhcjzm$D_|9B+#`A)AdONr2NrqJWfEX1BF-b?g0mtJKVb59CUDspNO+M{VAqI{<#$ zXRoeYTJyCCJ7yTz(S5$}FK#&z^*bW_=wK(jH^3JIK)(P^h6JW*tPz2#2viI^@r(Gv z^@j#I6(kSVKsFvQ19>O|IKlN{^_~yv0Xz5-LnRRTmXoO0wB0idQNl0J}niXLcnoBdRJ3TiT~_NaI=*jU*8MS-79nmG)q`EJAfB#ako1HWu9%DwXL zfK_{WcqssgGT-0a0p0BnHmFRa)zmK}9ustd2g|BkLd4)9XyFc`;4__4%YCAbl4QWU zL39|p1i}?-#u0@IX;+)(Y_%*BMVC2&@-7V*ldbd{vy-69Y#B0L!;Q@5%>X{-7`fe1 zPHxEL3&pFfAl=s{jf=JF`LA;xd^*Qj!XGqsop}5Pa ztPUotfk!Sbs%_HWuDzLo<~a2z+avQZJFnIGYy;lGP!w0gGktb+KXRD{GWok1u9t+S}kZCC+cQrnMKB&FConseaq~Bg^KT&35^L z0yger3L;XV+F)F}^7UqW!w1j0f_@kA9Ev?Q z^y^t@;qZm#62wBL*<}$DWAEu{%K0-b2=!AkkJ9CW)TMROwv%zRIHg5yxEENBa2Zv@ z2uROLEjC;kFlhmcAd6(=fq-S#G@%bb#vESIUvEMj6tU}fAh~fPeI1vxvvra@tYKIr zm@q}=R65Gcz_2rDnKp8eMNp*16fo2|q_#)z`pMDa0_#9IdB?by1CsET5PE}2m zJ#N^g3FZQo-ZF18#I_i1c^J~NU0%%gExv#z&6(c9OBv0{iaRpYqdtu}uOmzmeVl#QHgNNAHyZDbb9 z3#)W-TrX1wh(ngT>PFAemWCOEiwd@;u`QQetj$d&%n=C9y9CKf88g!DlNVep8VFuU z^j5acg!d#=vd4z!k^Pi!(h(5?;vhg5d0Jl2(*V`5!LnjM2qB1Rdn5qB`P@A!s`%LD zMgLMLeDj+b{Bbdp^XgQ8pIuZ(_pp`a!qA9Q_1QbA_kpQyE+y@NqKYbYl$Xk$qRxmH!adVd=xyp7dA$ov%{~bO4xEhaG zJk4#aBfY#s5<}_f)asp&W82bH3FyAZ_shn%;g#5f%1t zvmB!YOq>P7A;?On1vi{8x9$0UH}3Q)PgiG5MR#h#s)j2IeuISMym)lmr2)4#NXf-B z&aYtN;4BcvTr(oR8JIaJ zB`U3CAkZRG3bZ2OC>fZhLqZt@oB#j-6PnjGXsDw=F1Idfu4|grqia-&l2sy&3N$W4 zA(Da^jbjn6R_55zv9{%Fn{=S7b5|{mv1;YD8(QKakwB#eLMB4FDA1V-lv9#}LqZv3 zqmsE{36STQZIAiLb`&)$Na0|jBPEd$5Cj>>37$GPzv8F^?ccm7!aJ~J982I${=5_U z;RDP*eE?U4KNnH2sWVY;^HJ>n?mV~v1Ss4`w+A219zZp^k5jsQyScfvp0n_DaogAh zZmyM0pPA0IC*ub(>K<>C@EoFtuiaDa)LkoSO9nDoy6r9`WQ{j%#_ktpdI12;Hbl;o`8t40Kg5JvfuzCI1 z2ivG9ec+$^;1AE`@Tm7bUCizH#yKo!s4Z z-P?08+HEprni3+MQ4GKh1EkhFlbyOh7<0Q-z6MBPzTETuHPiSh)j09@X&=2D?YO6z zhN7YasP+;WSpEtA?TO`d`V-ic4RT3-Jb4Yy;ZJ3EDZyq`cq)K(h!jVH7zlev^sX>rQZ4I!XOrS^d+hJ{!Itm7EUE-lBTDiBzc5zHCxw2KHh zqYxB?mmu{5X96oEuY9+NFAuMXVos)*Ap1h5V|e;s$+x3djR&_f6t_xM@@siA2o4tMXZ zyn{A)ItOp~qeBxFGH3az=Rqx`VOO;Hnk;A$@S6X>8)*msUg~`Su5dZ)b03akF2+KC}>Gq6X zkGs9ed(9kJ?g-YAJMCK?t-i~*lgM*yt#!;1IxgfES?masZ z$$ASa0rK19NV=QXV1XEJEqMdyW@le-l_YS=EP<}CxC8F(2b!KcV*`Nr z{pc7-KZYOoMiF1dnVSK{>pke9v5=GI2nS_d{$?Ql2F5C=_(ntkryn;A9%1BoDtetp zQ?Zyt1xw`|C_-d(%-r5KlWBis8u=meh6-P=&!<#Z@BXElaz9@EOhb_KbMuveaL+kP z;(&|EbLs8t*F5yfBf&YeuToLZO?g4LWMuQ4bUe2|oyhae>KdH=u4o#LZu`CIBni}9 zTvJk4Cnj?;iJ^I%jY))55ktoJy^cn-^mN`{JP&5y1_Af>BOLTfAg*UoWs>=I%GljE zE!n!RhU%>qFt<%bZcgs9#;Gg;qIYgmT9;+jT(?Zp(#|o-G+~BUIuk~Zi|C=qC$>dX z7hH4me42l#Y3_?~m9m$V%r#60jvQPAS76dBh(el%!Djp6N*yEa=-Z`$6Hde85` z`at&d&QDN%yYP_Eo+R#Q!6`(ce4#QEDnloh$U|2dtzjt=0g~8Iw5R|E8$%;mqk&vtw zEt5+$rDU>cmL!Uint~Dygd&PS!5FldiVTDd)f-P;YXk<04nS8kWVpza0;*DmRe~bi za64EC^X1Y`-RaDnH3MkOoQF!^Nf;=b2QAGpk}fP4aybO!YRI>nT5?R*E{He6&QMYg za&#mFw>JSztjq?a961sSaRzy9W(&ykb5npajPLvIK#->!NEitlul-EYl~PkO!|;P0 zxMz#zU{egP0^%|zR%R(xmfa^>yLVfb4RDg}(%G&@Ia69Rz(f&dB-rLQW=z|d6$5|AJgCclm~p#<1`Obj_o0$%}C zMRcLel=`%`NyfgppmeTIRhHA~kI%w!!fd(LE|2BoH_*WNYxLx8iv?neqA07hxWVEP zJG);H0g@;bAmoCSflEL{14@MoP&pwACp$y!>6t_rk+eM}G7-sr2|R)@*&V=d3M7V2 zRTu$|2I}_`v>G&DM%>jkYt1>*opHQ&(400T7&F!;ehf5#5DsUUz0+R;&J$#(SybK_ z9U_95ifOARVgi*JBMCfFJld$nQhO8^<`|<@d)PnVQ+xk2f$!Un`X- z+{AO@MzkLKFgJ*G?k9j4Kei6Ud(@twfd{V$e3btpIo9jI==#EckFWL88np%d_e9Vi z%?}6WO1~ew3VGeGeV5`q5!130w9PE+83^f;0+A)2DA8dvW16;Xj|>=x@ZS@j(<9 z*QkP=S?!~DZ*1~8x*)%s_2XT(@_FKbpto;iu>{fg~ zQ|cOTK9e~ACUJlq06{Pe07MuNIsIau2dA%q?Jyg`gcMPlbLJmor_soHEIV^h6$I4& zy9t_5XcXJ@Jw-lex%GWqpGSuiU%du=i@68yn=n_X`(d8n2kMe4+pr+y{d0%%Tl4BF zd~`bydS3Upg8x8Mr3xvcg-HtTL?Be64k=P1;evo+zW;aK?#9b%rm?hD5&LD* zW{ss0MM#7wR{qF{sO{wZZQAJ{NP->w$BR-TT>_6IpATnXNd*QY-h$x*j);U2H{-h8 z+1KLg_eDfW_qeiHpNsw#m*=ws{_>D(hv#u~37Nrl2{B81Y=*pXaGV{mRlwkx{0Y@~ zu42Y3&wZz^uT8vif-!jJisOd z+U4dv>%IH8sBxWSH^$|uskACHkh=Nekw*#OUbTYHOy8jHZ=w=V%riPw!q>7;9P7qz+Ft7w=EpkIc{s0 zENHY;beRcBLT`A6p{1pzryz*x0DFb23BD zb8mekB=Me2?Yn^ah-j!I;am{d&bw@HB&1A{fU2sz&%${-- zrXI*_2FQgfNP$=u?_ zc!O?lJnMAVjdJnL$oJMA=I$tF?U|@`H4auUB0X$op?7V|+Qp5`%I7@n?;FQ7Z)r^b zfT(~ygU4A|fEe?tg0N{w!gK%tN8cl~Ju$HXh&vHAYGf4M)kXXDWAO>6Zvpdu!y{vUH_dBby zobzlX&=~+bLH#8_{O|G(!hTN!^!@NlCj0L7A0X9!Zb*4U+x3%&2*sR4j7JulfPY~koOPCiYg|eMj|MO zz8OMBgL7Rh6EB{-h%3Zwl<(qq-!lxse2%N;LLp#&s0ml-%Khi#tKxu4XnyWh7U`(- zKL_En4Ev6}`PFR*rg!Xc6yd<{+W2X%aoGs>=IO+q?WUA+I-O2Aj@&Cvt|hp#NRMsg zZ5Pq%oZ)syH8aOGI-E`HqARu*n`&!Ca@h$@64WmkxMnz{REj`cY0^fpZ8(`SQ6vEX zY7HtQr~n?aprffl5p#z&Zwv@{Inl(GcsJVr7YCU3AfLmh^HC8|F;atT7K<99i$Pj2+Job0YV z9!E{+F2<9mY>-$e`gnNQ4)|_B;!Jp;Ac4F=*RLmjoA_g}xcG6jM$g)gBwK|J2X*Lk(iKNj2z43WFfWc2m?BEFf_zn zrji_r&gqb5;EH32Ba8~;WM)b)7VDjry-DShLNHPs?}BWf^4d6JGCXuTpnCoaA8>0m zuRlYNP~C&ca}XImC#lvs?w*itY$sgDUw@+edgq(WJv{s52_Kd?_S;cpny4i$Yt@7} zM>CrJVNt~s^&{ryxtJIMpDe6@7k5*AM?aeM>FX>y9&^_4DkP9kOTBy!_}&$FXMP*J z5c5dX%gDx{k&7|HiBSt&g6Tv@rfUx*`hLGQ@X*+yO8~;m4BeHrTF^$dnvELN7E-Dp%7}H} zztBfWvd@-#?ejfxK`#dH(I0;1y#y|P=zi~GHMoF#@Sj2W!C(Lb2?G$I@-6`Ba{gFp zYLr%h4%_3OhAaA@e&X{q0FQg|@*~WB0egp98EaA67=lS6?i9Fj6xRMc^S^l4C(luy zMx-t6*hH2Txu}*1N;Vj1HkfG{84E~IYFZxxeuCN={8at<{p$+$u{Q8idFH2r|xdIeJ zpz}TW(faZLVLw@qZt1s04?bAxD3tqx6z%wJ>gBR zC*iav7-=A4Vlk)qW8o*AN%H&C6Nn$Xzz-fuzruI!#_vcqm=%y_W{(&jx#*(3RP@&T zahR#ST6G2$#ycY&fLBgh`MQ#VX{m{cyZp{dAc^Ys`yXu}a&gAt!GiJv0&b-{rvAd7 zj^X5}2a$4khx%>%&rfUVv3>@f^DM?8c=tco3`3s+wNT^(-hq(xE@j!3R4Owl43H!; zZOp1w(^3hv4NRG;k``ssR@b?%yO{IeeA==)xxbb)8nIK-L>L3+SOYBUDrO`+VUJ8O zD=RQx#tpWyHs2hI0nBkTHD&a-);sfne?@O^s+}1~{(*|(eTxK%2{PC8>$n>*j&y*r zz;Y}J#2~dW&_M(VlR?G-s36nHpnrr3O@yO6;>^&POlU1em6LH|87ND$9GH~e7y$;S zoguvj4DX!Mq#8^E1`=c?kckK}!wF786w7qGQ%g!}W~Z8Ur7KfI03iclIEE&60!$Fx zvmiu_u^GUyNr09|WG*h75ld2`Q`cK{c`m6G<%QD2U91}6h zGQ()?fgEBnaFOF95e#&dfMWq9B@km6B#^LWfKsuEies!CSV(}AOkk2q8H8dP1ma;` zn@u$-Q?sfwb#+~uR$@4q*eozG!cc@5n1%$fW+R40P-2c|-uMCH?FR!#xac+6fTSoI zd^7u`H6;v4u`jQw`5gz@73PJuL%xlo>Epl7O+_2bL`gUzjzUA7WH;}@F!h`m4rhUb zFXz)*D1CkpVnR>g+iZU8)=y(IDZ=7f#_EvkgsP@e&cthAr~a1<&fL}mcW&62rn`~U z);2ubQN=}ZoVI{J7~z|=94>a+J-0CQ;NuVT#=WmHbQVea<)On&hDQz4Hw!SE4}V`t zYO-a%3;a#KT+XXRY}Y3AM)vSR``n|#t|y&TMoI>ksy?bh!4S%2CEN^6uSCzLCr!I= z-ZtAmF&%h0dE7^l5MVlz;PD{@9YDUei<3Uay?Px93(3dmcMlzaIeTKBumHM{^mFsw zVC<+zFlK8s1VuX#Z{vqzN7P~tK5fgP`*dTs3`A~Ja6u8sP^1Jy-ybx6P~N%`OeQUa zE(>I`SoDo_&bFRg?;-cHQHs#3itB5k=>YD5y|pE#fnpmnMk3LZ2}LCsqBhZ2ul4Uu;0tuybSl#cH~Bpo@f(cw|VQ4+>uJcWa>jcCpj&g9U_eU z4(WB5t2eEUiBM6Y;&mPu1@7sGGnf)iru)0O`#Zam=T~eo__sLiwp%utxSOnon;E^g zmpz_o!rar~${cTZAr$x_yp?!@Aq@ESMLs`O7g!@JBzpF6L6r>BXWPI28{ z*k^W0NxRItIl!J=;g?6R$>)C3!|{=LnK|kSR7-a^nMqMnj)`N*+?~cCKkCcvl z6D_4xP;nQIZq#W3T1_)YlC9c`MFBDdu_Q_n?+*}xosN07;g4IJWBEO>FOQjd7-|5B zAmI3KdP4K3e{bE+eoIH%DC2M3^d09)I`_Y`;;#;Vo(#eL8uB-X6Z6k6$7e)XK6Bx} zv*kNn+OO?CuVqbIf+1U z&<R-|;zcy``Es%` zt!qKCN2bsdo{p#ib8%n8U(eKCgy^QypV$%H`Fv8q?ff%Hkc7}wI)8m&I$+c#`(uZ{ z*ue8qL_AUoNh+}*KUAhljR2GjKu{E*P=v4)q(cc+BMhVJA>x<{)KfJKfo&NY-f32= zp`dgUK!&sq2h?(V$E=;=QD^kQzGLIlRjm$U;T~b5z4d+=ubQH7g?fE;x~A2bra(O9+TWim3z$2#`n$tbqg=5+RKKoFBAOP#ZESxPoBt;(vF4KUv6UBm4~O@Ik+O z+~{~Vr(sM{Fwp>e$M7T*L_cCV5r^F45$z!cJbw@#$EvTl=WhpGb4ms2^XGl-;)X&= z%ud^|R5?L7b8rmI(+&-(D{AMQHK4Zz*6paL=~4rvHj!yJnW>55M%-ZawQ4q8O~yQL zC~V$@)MSx{v<9Trk_fz#p{NBVDV*WzLr9E-va59S^5>ckXv!2@?V1TCMJuN^*qcc(u4=Q)QwO=j>tt9kX? z&P^v0JG)Ez<7Hk`l@_A{wN(`V7&}R|#{IOZ@uwP!jE^HZ()ELW_-zSXNb?51SZ_RB zS>uGa-m?@Dd3+DEiJ@#6@^H^?6Rty551u%@y~D8=@g9=xj*9|>DB>)g_(j>vPS>TpeQa8d9omg{EY1UiBs7D z_k{{UY3M_MWWj;IsiW0B!WCr!2GJqoe!aS>J7_c(Ux(H1p-p7uhTC(|a*s~DS}{lnoWw8*WpN4IJ$w5^G^cz6>D>PN zhw#j_VVc9O^xq7L-)(ZBiR_XH2eS8|SbUWeb$)(0MLf?)6NoYl%*p7zw+`byVMOWd zQS^kf#8WfSZ2FM_#vg^sf}U8MN%(e)2kFva@W zFF2s&Nr6{j%oz}!0O();-b%f^-k*;rJ11_o8JK@Sz&avHG8}bRkv$Fs-{cMEKf}&$ zKcWo2bG=}Zg_3Hg=}?N{yo{YgVkZ&QGhExtSmumP$bOhj&gdrICj@f~ldd%BprGSe z=(B9H#H5fdKtn*DAo)MH!P*bK>Ot4-+~9|W9Ki_Rer@d+Zs&7N%+WMUt%mOIDb$jP zu%y`#6L#1(&%F58X*{^@eZPN@2W~{h`s0-ncpy!H{O6MW{kx~i&vEGs|FTjfs_B@3 zc;qo%*hYOR8inQeCMakT?j4A!{8Q{6D*Q7J(5CjZU`gt8zL4BHL|OV^Z?Tj-$ZoJf z0W7*g5qJ?qIX_5g57Nnb^1#<@9Yd?}jFMm3gS#&s)p8HrvOK%%R_uEo@6zsR$SM2e z(xK9Nb(6j)=QI83hu6Pp>ai;O&{yP5!bQbs$d9i{k#YHXqN_mkJl~~$&%__Qe)ZoR z&{kU-{%QpdS1fjPzgo;U6Z!o6j1Ln7^G>4(P&FAVkYu`!td6RA0PtDk^)vWOs6t5A z9BrAg#IR7Au4`1uJ^1|Kn}?$A`R%JxAPphYoc-RCzTB&!br{`bqU|(ise%C_2#`h8 z&-Dv5FN8B9Ej1f?`sD@ggfJpzj3AE&F=#&qnioaP|Q+ zh^v56P6#9efrB8yE(U~zO$R0z0&fT{ofkQIHgK!)J3wZBVImfPfSd@4NeQb49s|*K zP~XWlfIXxPvQyll_PPPwApj81@@r8L6tHPMD55l<$%YQIA*Yo{a&bmS#wuX_i2=0c zbCLrFC5$jKY>%J!huj|r$o+FL6hxGtHQFflJ=~M$HK*xddvH3R8QEG)G}kBY9HSx1 zAw=47P{%RA#es$@CuHyR;`KCOOd@yBdqAg;u_|@)*jIa$%RZoonYWR%*%L=|)c!t+ zvRFEv#tGQ82VVH7MYFr*1n~3YO6zNo&(Hc@xbx046S(V*7ek=HFbIcAnUE4%J|eVU zg!K@_Ssrzxv&Uy*)MPjwnfqEY0N!L`;r{;{3!&(rfrr~dc=qDmUjiOjeBY%>?_^{U z0SB*cJtr?6oPX<+ogr~dH~WG|v>%+%9@PQW^rEj^&tIvr)ze&C+e!|z zW>3=}MxzZ995aCl78uS9v&L=?DmNbgX7lRjf>XG0?U^2y5i_oJZ-+qr4^MNnXu~np zfHWhe@A`Rq;kclhI(Z&GNt5?sTbJn_Bw+v$+)V?~fPxB(fnn#a{a}a=wq7H?Wl(L7 zHA+rv7fg{5P+>Y(e@owz=zi zr#3NAaTUX{(?~~N=`$;i=KZ^#d?zn*?XqqZb zMz(2DwG~RGQLMvaBqmad5+MjA7s2M_(4YKjCvGxh$ZMLOJxz>i*)^%yFEq2JLdHUT~L9{N4gUAO2ek*skT zMHM6yi3Jo>o)#Vxz-%*eW@0TS=K@IEuCH+yT@+@qERkCph=p33cNMJ9=hj<>uq!vL zN9^9`Za%EGUd4-sps9w&Zf%h53Q6OfdCQ!ajx`)fdt6>oJF%>UVk&D{q!3Qe(o6DF z&~%!C{_OGXvL8$XI#1WXj+!=4XU-yMibD=KW0t_ABhLVzQ&whc#0P#%NRwZ)7vE2lkih3o7Gm~@+M}P% z#%j;W(^Uik@xu?R1NivZKFECA<@7Nr3Dgk6V4*5p>+Av^<*`CQKF)wn{;qlG`5%8u zCxd|5#C4xb5taUZ=0ICY59UNK%_)rTT#4xU?WJFLn^Vi;+XrPdh$Zfj1n zB|Mi-j>lGX<{69PLzh@xgHG3z`9%`~r;Wb75%p3$02DpI*hLWZ*n59)c=SIw+}rfv z^*xC=Pjxg7Zhqb%VG81MGwoCfH7Jd8*l94b5l>_55C)J}5ArrNbb}NVIiaY>kl2tc zzzl|qEOJ+aL8#La2pKAvwBZ>!mMfbhL8}Vt=ye)%5jW{O9trp;c!J_~lbqSXvx#!&B0!vsv>{I)#tkxRX{#?EEPH9wRLj z0VMIsXBb;ENiNU6@B`{4nu?&4O_^!-%vjI`I}o>{UkapPjaD+@u`jV}iGb>ung}yE z-N2HJZhD%RYuXk9vW|99k~Je}VTSnrB3u%h@S-ZY=}2_r zJu5LA#RvNyX0oFriQ()i)mISQ-xjb7Fl&MkRHVHKmKR_*Wsz=AMwwgc&zsG1Mhj6w z>oBY)A4f+~NE+8lB}^SC6&XPe+m;0jl=0DYRdqF&%j>A3(7Wkem$B5>Xx2g~j|EDR zf|nt%v^(*pwS}#pZSP548t*L-yO5gcygt~A=S9a_V)&K*5a;Scfr(hxIk6_AeP(hHccBE2T0Vb8OJ%BcMb2yo=h822x=_K*E zaJ?rZ+2v@%6;@zX8f2<&RnkPPA~FH8Ocw*7@EQYfmyjsZ?gvmhrMmCYo}-#_`*Y6K zj;X41PKAl?3CF-fu8Ix16eKt$!oQLgMWIq0C6SRPF4T~%L&HP3?~C&0hTuVYjlV|% z5b^6PE1E>NQ@d*J*)t?oX)v-zLk5(@&lqUX0H&P_%!Ve6OiT~~3E3`ym0F#^_BUrJo25H{IY)#`%xAoXvhc(7&2FAdMBX}7`k1=~8)J>i|>Zw#SX#t6t zK7d^WC!kow1y(Ky3ZB7W2IA9pJximy{(3QFVgOMB#lo~xO`A2SSqD^MiXjnT#Tg?? zF(wHXKmnL!T~pB2sz$(DjmjE@NdV1I!3hKe5Tp{W#}3I|KO8yH=TLN>Z9-9(Gpx+4 zvL)gf?;(Q+yjP$R3+aQgwnx@I%?I;*MQgIb&P}!sOjJOC+y}kYc-omrT z4?k=k<>j^qyvK0^C7lHU9=1^XVPGyDxD&hRe}NH3PFQz?h&Qtzl%9|R#GC=5>!Z)- zwL^44=N=Aa<=3n9%P}yi(n!%W zmqE|4Fac8pMKB0IZu!S4@5r}>dw`CKP2P6e;EXh(e$*Y$81ujx+pQ7VpsI+N>TZun z%m?M?&pf{62~7{j6C{eOFmVW}YP`?Lk6$gk5LCnQC**ci0|XP(-t&wi#T<3jf#CMf zpe7*KyJ$3WMv!~p9~qwcn%4oN<(ZxlbR(hn#{xMR0SE^Vyj398BCQ|-U@QuWkN`M@ zsE$Ia^+5cSC9@`H;NvY+t84AhbcJ^U!qX%qPraLF<{zVQE~ZW&@3efs&?Un`HiYO> z83ZAg9EO9kDnT(`bB}RcF5-_uBGU4eyz=q$riw3JyWd{^74P0S*cNP3vWX zAICP-g@u1ByQG!&VF)0iT+-4j#)9!rM-V2g z7?B|?2EdAR=rG|=e!W92=%0*wqdQu$df+pDRYZJDDoK$GCTlYZ!%1ryzrKP$WJ zgy+TemtTqe2kYhRH{M(Le!F}!)R5WLpqM{DD|6(iBIq-RL4ZLtE63S54|;_A_WX9}kAkf`1RFptmvV=qL7CdY^{#(0nZ@?L=pPkT zca7Fs+7fCaJf}7=FLr~@+<|kyqc1cYneA9CXM-r#1n^C}zXi_LG14krou=YuIe~2g zr;jT+y)z=x&Q9zi;pIzm;D!|rM5G6?vcBT=AhNkP12ij!D)o^<4l))Q+}yqz883iHk^ir(B{mFvR!ecbm+)=$Bjj{O_j)aZfTt5yk%D% zpv7@PK}0B+iX_V++Zr_QPOVAELIK)=OmJ}necxtGW>OrLAPEX!Duhe}IV}Yg6ad30 zk|jcgdjOq43(E@Ems16YnbhoLh$2_99}VN#AVAwT9|aB)3RRVWL|B(Z*nY`XqtXQB zNp%#cJ%u(XAfe^TV4!+{dA~l~o(|KWgoro_VYPjZ)|+NTGwdoUlL@{qnVQ6(d5zlnmTP+ zxIhq0QBe{Gk6|asWRgG_RfZx{o}qoaEfqUukRkzqYdTBbD!gEBxW@Bal9RLT~-u4Rrl_nnVLg z{8VA7gUbxpAl!jWTrz}$B#J--)PU$B|AYd4U`0J30m#&#hM`B{)2RMj$GlSw0lc?w zgm*}Df*-7R<2Tk=PHQbyt!l-8e5t&F+EmG2-1yS%Ct#Cz%RP2N^4vO0_dZIya$1gd zPF~w?pNAvY*vz&3u|CJplMDsS`6v(nJsiz#o@8sB&3Eh1UbDmA ziZwN65pP`f=Uhw_HqNGsCf79G#}wTBO`14Q2Qk~Zen?GNR0gL#1=?sq{CWCM?{liH*Q z%0t`0VbOPh0pA{n@Is;h@vdyCK6=u4_wzp_>oDrAcr;KbHX3F0sl8*bNwU<$kF$lm|}jWPfmQ4Uw{x3rNetvH6ermWL<1P4(Hv@3G48J zS;by=E@;?a-{hbsP0mFBd#Oz}&ibfFm4q=n`U}xhc zEBwT9@-y+in53jV?D3v{Fw1!;3QEmp>MoD*H#P)XRXR~f8dOKsAOI^u5bs1Ct~-mm zCLjQaE%@aNsnMF!Dsh^={@PQRbZ-Bq`lqqLa&w1W7*X`V(>~Jw8}VvJxsRw1yEM1;Cc9V#|pauSaRyZ9a;q^c-AU^xpu|AN1I zG)>Ko(lQZ?6q<}_Tr4Xy`C#@5)jM&nGk33_nhF#F$t%r@Zw0~6CjYP3&l+=MUlFy} ze3(fXAthM`fT(2ils1tMXV2F!jm`P&cl3^3HG9B6l!3bWaDM{?%*DotyStpJ2}m|J z{WGpS^6K7WNY|a)n&ef=LENkJ${5NnamepbyH9ndy3UQ`5M4@P>%t5`=N;Vm0q%M?hm1e9tU9PdKJE^muzXE4~3rqf-U+K%N!E4}{tv$FMa&G0Bi%3W5hxegtI$m101mJmvf+ zoRE#5aX)adGLy0!@WL?Oe2;SG(CeL@`tgtP^gc2^^e7X_$a376Ev}7X1x%G?+c6hh zETxLAm4Ljb+^r^`YxH>e>6gACUbYEDlqE!w!l*c~aMgU-11FmV3QWpGqh8pSun`nZ z)dYZKOcvlEz(hgzxyLhxa1v1h0~b&(XZ%guPST_s`2S<)+u081j;E(!^f`a_{tvjq zD2GT)4#FPKC?`O3vU*@Zc9WzxlqdchpJ!vZYN`V0`~Cy_NFSIs3Yqo<47=@YKu_^K UkM@m7Pya>SkxmpODmATbz{rn5p#T5? diff --git a/ChangeLog.2.bz2 b/ChangeLog.2.bz2 deleted file mode 100644 index be144130ebc54d07c8b6f22d7c2e4785a5ee2d55..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 25779 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 CCu1)F From aa645de5ed84eb17963af60cfd732d3e4153aea2 Mon Sep 17 00:00:00 2001 From: Aaron Sethman Date: Tue, 27 Jan 2026 15:12:35 -0500 Subject: [PATCH 02/32] Not using SVN anymore --- SVN-Access | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 SVN-Access diff --git a/SVN-Access b/SVN-Access deleted file mode 100644 index e3e05990..00000000 --- a/SVN-Access +++ /dev/null @@ -1,23 +0,0 @@ - -The ircd-ratbox subversion repository is available for anonymous access. - -The stable tree(3.0.x) is at: - -svn co http://svn.ratbox.org/svnroot/ircd-ratbox/branches/RATBOX_3_0 - -Or if you prefer the bleeding edge stuff: - -svn co http://svn.ratbox.org/svnroot/ircd-ratbox/trunk - -Of course at any given time the SVN tree could be broken. If you are -planning on using the SVN tree you very well may want to be on the mailing -list, you can subscribe at: - -http://lists.ratbox.org/cgi-bin/mailman/listinfo/ircd-ratbox - -Direct bug reports to: http://bugs.ratbox.org - - - - - From a33e377706bd8e3f0e517de03c39cba9081c8f1b Mon Sep 17 00:00:00 2001 From: Aaron Sethman Date: Tue, 27 Jan 2026 15:41:45 -0500 Subject: [PATCH 03/32] Remove Win32 related support. I'm not going to try to support this junk anymore. Sorry. --- libratbox/Makefile.in | 3 +- libratbox/aclocal.m4 | 2964 +++++++----- libratbox/configure | 2412 ++++++---- libratbox/configure.ac | 22 +- libratbox/include/commio-int.h | 6 - libratbox/include/libratbox_config.h.in | 6 +- libratbox/include/ratbox_lib.h | 66 - libratbox/include/rb_commio.h | 4 - libratbox/ltmain.sh | 5879 +++++++++++++++-------- libratbox/src/Makefile.am | 1 - libratbox/src/Makefile.in | 16 +- libratbox/src/arc4random.c | 76 +- libratbox/src/commio.c | 45 +- libratbox/src/helper.c | 7 - libratbox/src/select.c | 21 +- libratbox/src/unix.c | 5 - libratbox/src/win32.c | 642 --- 17 files changed, 7096 insertions(+), 5079 deletions(-) mode change 100644 => 100755 libratbox/ltmain.sh delete mode 100644 libratbox/src/win32.c diff --git a/libratbox/Makefile.in b/libratbox/Makefile.in index 6de6654c..0161e1ef 100644 --- a/libratbox/Makefile.in +++ b/libratbox/Makefile.in @@ -235,6 +235,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXTRA_WARNINGS = @EXTRA_WARNINGS@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ GNUTLS_LIBS = @GNUTLS_LIBS@ GREP = @GREP@ @@ -253,6 +254,7 @@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -336,7 +338,6 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/libratbox/aclocal.m4 b/libratbox/aclocal.m4 index 08692465..74de421e 100644 --- a/libratbox/aclocal.m4 +++ b/libratbox/aclocal.m4 @@ -22,9 +22,8 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.]) # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1996-2001, 2003-2019, 2021-2022 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -32,36 +31,30 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.]) # modifications, as long as this notice is preserved. m4_define([_LT_COPYING], [dnl -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. +# Copyright (C) 2014 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# GNU Libtool is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of of the License, or +# (at your option) any later version. # -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program or library that is built +# using GNU Libtool, you may include this file under the same +# distribution terms that you use for the rest of that program. # -# GNU Libtool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of +# GNU Libtool is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see . ]) -# serial 57 LT_INIT +# serial 59 LT_INIT # LT_PREREQ(VERSION) @@ -89,7 +82,7 @@ esac # LT_INIT([OPTIONS]) # ------------------ AC_DEFUN([LT_INIT], -[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT +[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl AC_BEFORE([$0], [LT_LANG])dnl AC_BEFORE([$0], [LT_OUTPUT])dnl @@ -113,7 +106,7 @@ dnl Parse OPTIONS _LT_SET_OPTIONS([$0], [$1]) # This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" +LIBTOOL_DEPS=$ltmain # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@ -133,26 +126,43 @@ dnl AC_DEFUN([AC_PROG_LIBTOOL], []) dnl AC_DEFUN([AM_PROG_LIBTOOL], []) +# _LT_PREPARE_CC_BASENAME +# ----------------------- +m4_defun([_LT_PREPARE_CC_BASENAME], [ +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in @S|@*""; do + case $cc_temp in + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} +])# _LT_PREPARE_CC_BASENAME + + # _LT_CC_BASENAME(CC) # ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME, +# but that macro is also expanded into generated libtool script, which +# arranges for $SED and $ECHO to be set by different means. m4_defun([_LT_CC_BASENAME], -[for cc_temp in $1""; do - case $cc_temp in - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +[m4_require([_LT_PREPARE_CC_BASENAME])dnl +AC_REQUIRE([_LT_DECL_SED])dnl +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl +func_cc_basename $1 +cc_basename=$func_cc_basename_result ]) # _LT_FILEUTILS_DEFAULTS # ---------------------- # It is okay to use these file commands and assume they have been set -# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. +# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'. m4_defun([_LT_FILEUTILS_DEFAULTS], [: ${CP="cp -f"} : ${MV="mv -f"} @@ -194,20 +204,22 @@ m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_CHECK_SHELL_FEATURES])dnl m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl m4_require([_LT_CMD_RELOAD])dnl +m4_require([_LT_DECL_FILECMD])dnl m4_require([_LT_CHECK_MAGIC_METHOD])dnl m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl m4_require([_LT_CMD_OLD_ARCHIVE])dnl m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl m4_require([_LT_WITH_SYSROOT])dnl +m4_require([_LT_CMD_TRUNCATE])dnl _LT_CONFIG_LIBTOOL_INIT([ -# See if we are running on zsh, and set the options which allow our +# See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then +if test -n "\${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi ]) -if test -n "${ZSH_VERSION+set}" ; then +if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi @@ -220,7 +232,7 @@ aix3*) # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then + if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -231,14 +243,14 @@ esac ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except MSVC, -# which needs '.lib'). +# All known linkers require a '.a' archive for static linking (except MSVC and +# ICC, which need '.lib'). libext=a -with_gnu_ld="$lt_cv_prog_gnu_ld" +with_gnu_ld=$lt_cv_prog_gnu_ld -old_CC="$CC" -old_CFLAGS="$CFLAGS" +old_CC=$CC +old_CFLAGS=$CFLAGS # Set sane defaults for various variables test -z "$CC" && CC=cc @@ -291,21 +303,21 @@ no_glob_subst='s/\*/\\\*/g' # _LT_PROG_LTMAIN # --------------- -# Note that this code is called both from `configure', and `config.status' +# Note that this code is called both from 'configure', and 'config.status' # now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, -# `config.status' has no value for ac_aux_dir unless we are using Automake, +# 'config.status' has no value for ac_aux_dir unless we are using Automake, # so we pass a copy along to make sure it has a sensible value anyway. m4_defun([_LT_PROG_LTMAIN], [m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl _LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh ])# _LT_PROG_LTMAIN # So that we can recreate a full libtool script including additional # tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS -# in macros and then make a single call at the end using the `libtool' +# in macros and then make a single call at the end using the 'libtool' # label. @@ -437,8 +449,8 @@ m4_define([_lt_decl_all_varnames], # _LT_CONFIG_STATUS_DECLARE([VARNAME]) # ------------------------------------ -# Quote a variable value, and forward it to `config.status' so that its -# declaration there will have the same value as in `configure'. VARNAME +# Quote a variable value, and forward it to 'config.status' so that its +# declaration there will have the same value as in 'configure'. VARNAME # must have a single quote delimited value for this to work. m4_define([_LT_CONFIG_STATUS_DECLARE], [$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) @@ -462,7 +474,7 @@ m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], # Output comment and list of tags supported by the script m4_defun([_LT_LIBTOOL_TAGS], [_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl -available_tags="_LT_TAGS"dnl +available_tags='_LT_TAGS'dnl ]) @@ -490,7 +502,7 @@ m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl # _LT_LIBTOOL_CONFIG_VARS # ----------------------- # Produce commented declarations of non-tagged libtool config variables -# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' +# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool' # script. Tagged libtool config variables (even for the LIBTOOL CONFIG # section) are produced by _LT_LIBTOOL_TAG_VARS. m4_defun([_LT_LIBTOOL_CONFIG_VARS], @@ -516,8 +528,8 @@ m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) # Send accumulated output to $CONFIG_STATUS. Thanks to the lists of # variables for single and double quote escaping we saved from calls # to _LT_DECL, we can put quote escaped variables declarations -# into `config.status', and then the shell code to quote escape them in -# for loops in `config.status'. Finally, any additional code accumulated +# into 'config.status', and then the shell code to quote escape them in +# for loops in 'config.status'. Finally, any additional code accumulated # from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. m4_defun([_LT_CONFIG_COMMANDS], [AC_PROVIDE_IFELSE([LT_OUTPUT], @@ -563,7 +575,7 @@ for var in lt_decl_all_varnames([[ \ ]], lt_decl_quote_varnames); do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -576,7 +588,7 @@ for var in lt_decl_all_varnames([[ \ ]], lt_decl_dquote_varnames); do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -592,7 +604,7 @@ _LT_OUTPUT_LIBTOOL_INIT # Generate a child script FILE with all initialization necessary to # reuse the environment learned by the parent script, and make the # file executable. If COMMENT is supplied, it is inserted after the -# `#!' sequence but before initialization text begins. After this +# '#!' sequence but before initialization text begins. After this # macro, additional text can be appended to FILE to form the body of # the child script. The macro ends with non-zero status if the # file could not be fully written (such as if the disk is full). @@ -614,7 +626,7 @@ AS_SHELL_SANITIZE _AS_PREPARE exec AS_MESSAGE_FD>&1 _ASEOF -test $lt_write_fail = 0 && chmod +x $1[]dnl +test 0 = "$lt_write_fail" && chmod +x $1[]dnl m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT # LT_OUTPUT @@ -637,7 +649,7 @@ exec AS_MESSAGE_LOG_FD>>config.log } >&AS_MESSAGE_LOG_FD lt_cl_help="\ -\`$as_me' creates a local libtool stub from the current configuration, +'$as_me' creates a local libtool stub from the current configuration, for use in further configure time tests before the real libtool is generated. @@ -659,7 +671,7 @@ Copyright (C) 2011 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." -while test $[#] != 0 +while test 0 != $[#] do case $[1] in --version | --v* | -V ) @@ -672,10 +684,10 @@ do lt_cl_silent=: ;; -*) AC_MSG_ERROR([unrecognized option: $[1] -Try \`$[0] --help' for more information.]) ;; +Try '$[0] --help' for more information.]) ;; *) AC_MSG_ERROR([unrecognized argument: $[1] -Try \`$[0] --help' for more information.]) ;; +Try '$[0] --help' for more information.]) ;; esac shift done @@ -701,7 +713,7 @@ chmod +x "$CONFIG_LT" # open by configure. Here we exec the FD to /dev/null, effectively closing # config.log, so it can be properly (re)opened and appended to by config.lt. lt_cl_success=: -test "$silent" = yes && +test yes = "$silent" && lt_config_lt_args="$lt_config_lt_args --quiet" exec AS_MESSAGE_LOG_FD>/dev/null $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false @@ -721,32 +733,46 @@ m4_defun([_LT_CONFIG], _LT_CONFIG_SAVE_COMMANDS([ m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl m4_if(_LT_TAG, [C], [ - # See if we are running on zsh, and set the options which allow our + # See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then + if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi - cfgfile="${ofile}T" + cfgfile=${ofile}T trap "$RM \"$cfgfile\"; exit 1" 1 2 15 $RM "$cfgfile" cat <<_LT_EOF >> "$cfgfile" #! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +# Generated automatically by $as_me ($PACKAGE) $VERSION # NOTE: Changes made to this file will be lost: look at ltmain.sh. -# + +# Provide generalized library-building support services. +# Written by Gordon Matzigkeit, 1996 + _LT_COPYING _LT_LIBTOOL_TAGS +# Configured defaults for sys_lib_dlsearch_path munging. +: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} + # ### BEGIN LIBTOOL CONFIG _LT_LIBTOOL_CONFIG_VARS _LT_LIBTOOL_TAG_VARS # ### END LIBTOOL CONFIG +_LT_EOF + + cat <<'_LT_EOF' >> "$cfgfile" + +# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE + +_LT_PREPARE_MUNGE_PATH_LIST +_LT_PREPARE_CC_BASENAME + +# ### END FUNCTIONS SHARED WITH CONFIGURE + _LT_EOF case $host_os in @@ -755,7 +781,7 @@ _LT_EOF # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then +if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -769,11 +795,9 @@ _LT_EOF # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" \ + $SED '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) - _LT_PROG_REPLACE_SHELLFNS - mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" @@ -791,7 +815,6 @@ _LT_EOF [m4_if([$1], [], [ PACKAGE='$PACKAGE' VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' RM='$RM' ofile='$ofile'], []) ])dnl /_LT_CONFIG_SAVE_COMMANDS @@ -988,7 +1011,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], [lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then + if test -z "$LT_MULTI_MODULE"; then # By default we will add the -single_module flag. You can override # by either setting the environment variable LT_MULTI_MODULE # non-empty at configure time, or by adding -multi_module to the @@ -1006,7 +1029,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ cat conftest.err >&AS_MESSAGE_LOG_FD # Otherwise, if the output was created with a 0 exit code from # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then + elif test -f libconftest.dylib && test 0 = "$_lt_result"; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1024,7 +1047,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], [lt_cv_ld_exported_symbols_list=yes], [lt_cv_ld_exported_symbols_list=no]) - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS ]) AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], @@ -1034,8 +1057,8 @@ int forced_loaded() { return 2;} _LT_EOF echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD - echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD - $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD + echo "$AR $AR_FLAGS libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD + $AR $AR_FLAGS libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD cat > conftest.c << _LT_EOF @@ -1046,7 +1069,7 @@ _LT_EOF _lt_result=$? if test -s conftest.err && $GREP force_load conftest.err; then cat conftest.err >&AS_MESSAGE_LOG_FD - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then lt_cv_ld_force_load=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1056,32 +1079,27 @@ _LT_EOF ]) case $host_os in rhapsody* | darwin1.[[012]]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[[012]]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + darwin*) + case $MACOSX_DEPLOYMENT_TARGET,$host in + 10.[[012]],*|,*powerpc*-darwin[[5-8]]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + *) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then + if test yes = "$lt_cv_apple_cc_single_mod"; then _lt_dar_single_mod='$single_module' fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + if test yes = "$lt_cv_ld_exported_symbols_list"; then + _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib' fi - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then + if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -1101,29 +1119,29 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + if test yes = "$lt_cv_ld_force_load"; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) else _LT_TAGVAR(whole_archive_flag_spec, $1)='' fi _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" + _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; + ifort*|nagfor*) _lt_dar_can_shared=yes ;; *) _lt_dar_can_shared=$GCC ;; esac - if test "$_lt_dar_can_shared" = "yes"; then + if test yes = "$_lt_dar_can_shared"; then output_verbose_link_cmd=func_echo_all - _LT_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}" - _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - _LT_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}" - _LT_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}" + _LT_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" + _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" + _LT_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" + _LT_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" m4_if([$1], [CXX], -[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then - _LT_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}" - _LT_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}" +[ if test yes != "$lt_cv_apple_cc_single_mod"; then + _LT_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" + _LT_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" fi ],[]) else @@ -1143,7 +1161,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], # Allow to override them for all tags through lt_cv_aix_libpath. m4_defun([_LT_SYS_MODULE_PATH_AIX], [m4_require([_LT_DECL_SED])dnl -if test "${lt_cv_aix_libpath+set}" = set; then +if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], @@ -1161,7 +1179,7 @@ else _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi],[]) if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then - _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib fi ]) aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) @@ -1181,8 +1199,8 @@ m4_define([_LT_SHELL_INIT], # ----------------------- # Find how we can fake an echo command that does not interpret backslash. # In particular, with Autoconf 2.60 or later we add some code to the start -# of the generated configure script which will find a shell with a builtin -# printf (which we can use as an echo command). +# of the generated configure script that will find a shell with a builtin +# printf (that we can use as an echo command). m4_defun([_LT_PROG_ECHO_BACKSLASH], [ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO @@ -1210,10 +1228,10 @@ fi # Invoke $ECHO with all args, space-separated. func_echo_all () { - $ECHO "$*" + $ECHO "$*" } -case "$ECHO" in +case $ECHO in printf*) AC_MSG_RESULT([printf]) ;; print*) AC_MSG_RESULT([print -r]) ;; *) AC_MSG_RESULT([cat]) ;; @@ -1237,35 +1255,37 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) # _LT_WITH_SYSROOT # ---------------- AC_DEFUN([_LT_WITH_SYSROOT], -[AC_MSG_CHECKING([for sysroot]) +[m4_require([_LT_DECL_SED])dnl +AC_MSG_CHECKING([for sysroot]) AC_ARG_WITH([sysroot], -[ --with-sysroot[=DIR] Search for dependent libraries within DIR - (or the compiler's sysroot if not specified).], +[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], + [Search for dependent libraries within DIR (or the compiler's sysroot + if not specified).])], [], [with_sysroot=no]) dnl lt_sysroot will always be passed unquoted. We quote it here dnl in case the user passed a directory name. lt_sysroot= -case ${with_sysroot} in #( +case $with_sysroot in #( yes) - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_sysroot=`$CC --print-sysroot 2>/dev/null` fi ;; #( /*) - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"` ;; #( no|'') ;; #( *) - AC_MSG_RESULT([${with_sysroot}]) + AC_MSG_RESULT([$with_sysroot]) AC_MSG_ERROR([The sysroot must be an absolute path.]) ;; esac AC_MSG_RESULT([${lt_sysroot:-no}]) _LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl -[dependent libraries, and in which our libraries should be installed.])]) +[dependent libraries, and where our libraries should be installed.])]) # _LT_ENABLE_LOCK # --------------- @@ -1273,32 +1293,34 @@ m4_defun([_LT_ENABLE_LOCK], [AC_ARG_ENABLE([libtool-lock], [AS_HELP_STRING([--disable-libtool-lock], [avoid locking (might break parallel builds)])]) -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +test no = "$enable_libtool_lock" || enable_libtool_lock=yes # Some flags need to be propagated to the compiler or linker for good # libtool support. case $host in ia64-*-hpux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set mode + # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *ELF-32*) - HPUX_IA64_MODE="32" + HPUX_IA64_MODE=32 ;; *ELF-64*) - HPUX_IA64_MODE="64" + HPUX_IA64_MODE=64 ;; esac fi rm -rf conftest* ;; *-*-irix6*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - if test "$lt_cv_prog_gnu_ld" = yes; then - case `/usr/bin/file conftest.$ac_objext` in + if test yes = "$lt_cv_prog_gnu_ld"; then + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" ;; @@ -1310,7 +1332,7 @@ ia64-*-hpux*) ;; esac else - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" ;; @@ -1326,19 +1348,56 @@ ia64-*-hpux*) rm -rf conftest* ;; +mips64*-*linux*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + emul=elf + case `$FILECMD conftest.$ac_objext` in + *32-bit*) + emul="${emul}32" + ;; + *64-bit*) + emul="${emul}64" + ;; + esac + case `$FILECMD conftest.$ac_objext` in + *MSB*) + emul="${emul}btsmip" + ;; + *LSB*) + emul="${emul}ltsmip" + ;; + esac + case `$FILECMD conftest.$ac_objext` in + *N32*) + emul="${emul}n32" + ;; + esac + LD="${LD-ld} -m $emul" + fi + rm -rf conftest* + ;; + x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. Note that the listed cases only cover the + # situations where additional linker options are needed (such as when + # doing 32-bit compilation for a host where ld defaults to 64-bit, or + # vice versa); the common cases where no linker options are needed do + # not appear in the list. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *32-bit*) case $host in x86_64-*kfreebsd*-gnu) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *x86-64*) LD="${LD-ld} -m elf32_x86_64" ;; @@ -1347,10 +1406,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) ;; esac ;; - powerpc64le-*) + powerpc64le-*linux*) LD="${LD-ld} -m elf32lppclinux" ;; - powerpc64-*) + powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1369,10 +1428,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - powerpcle-*) + powerpcle-*linux*) LD="${LD-ld} -m elf64lppc" ;; - powerpc-*) + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -1390,27 +1449,28 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) *-*-sco3.2v5*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" + SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -belf" AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, [AC_LANG_PUSH(C) AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) AC_LANG_POP]) - if test x"$lt_cv_cc_needs_belf" != x"yes"; then + if test yes != "$lt_cv_cc_needs_belf"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" + CFLAGS=$SAVE_CFLAGS fi ;; *-*solaris*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in yes*) case $host in - i?86-*-solaris*) + i?86-*-solaris*|x86_64-*-solaris*) LD="${LD-ld} -m elf_x86_64" ;; sparc*-*-solaris*) @@ -1419,7 +1479,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) esac # GNU ld 2.21 introduced _sol2 emulations. Use them if available. if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" + LD=${LD-ld}_sol2 fi ;; *) @@ -1435,7 +1495,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) ;; esac -need_locks="$enable_libtool_lock" +need_locks=$enable_libtool_lock ])# _LT_ENABLE_LOCK @@ -1444,9 +1504,22 @@ need_locks="$enable_libtool_lock" m4_defun([_LT_PROG_AR], [AC_CHECK_TOOLS(AR, [ar], false) : ${AR=ar} -: ${AR_FLAGS=cru} _LT_DECL([], [AR], [1], [The archiver]) -_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) + +# Use ARFLAGS variable as AR's operation code to sync the variable naming with +# Automake. If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have +# higher priority because thats what people were doing historically (setting +# ARFLAGS for automake and AR_FLAGS for libtool). FIXME: Make the AR_FLAGS +# variable obsoleted/removed. + +test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr} +lt_ar_flags=$AR_FLAGS +_LT_DECL([], [lt_ar_flags], [0], [Flags to create an archive (by configure)]) + +# Make AR_FLAGS overridable by 'make ARFLAGS='. Don't try to run-time override +# by AR_FLAGS because that was never working and AR_FLAGS is about to die. +_LT_DECL([], [AR_FLAGS], [\@S|@{ARFLAGS-"\@S|@lt_ar_flags"}], + [Flags to create an archive]) AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], [lt_cv_ar_at_file=no @@ -1454,11 +1527,11 @@ AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], [echo conftest.$ac_objext > conftest.lst lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' AC_TRY_EVAL([lt_ar_try]) - if test "$ac_status" -eq 0; then + if test 0 -eq "$ac_status"; then # Ensure the archiver fails upon bogus file names. rm -f conftest.$ac_objext libconftest.a AC_TRY_EVAL([lt_ar_try]) - if test "$ac_status" -ne 0; then + if test 0 -ne "$ac_status"; then lt_cv_ar_at_file=@ fi fi @@ -1466,7 +1539,7 @@ AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], ]) ]) -if test "x$lt_cv_ar_at_file" = xno; then +if test no = "$lt_cv_ar_at_file"; then archiver_list_spec= else archiver_list_spec=$lt_cv_ar_at_file @@ -1497,7 +1570,7 @@ old_postuninstall_cmds= if test -n "$RANLIB"; then case $host_os in - openbsd*) + bitrig* | openbsd*) old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) @@ -1533,7 +1606,7 @@ AC_CACHE_CHECK([$1], [$2], [$2=no m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$3" + lt_compiler_flag="$3" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -1560,7 +1633,7 @@ AC_CACHE_CHECK([$1], [$2], $RM conftest* ]) -if test x"[$]$2" = xyes; then +if test yes = "[$]$2"; then m4_if([$5], , :, [$5]) else m4_if([$6], , :, [$6]) @@ -1582,7 +1655,7 @@ AC_DEFUN([_LT_LINKER_OPTION], m4_require([_LT_DECL_SED])dnl AC_CACHE_CHECK([$1], [$2], [$2=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS $3" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -1601,10 +1674,10 @@ AC_CACHE_CHECK([$1], [$2], fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS ]) -if test x"[$]$2" = xyes; then +if test yes = "[$]$2"; then m4_if([$4], , :, [$4]) else m4_if([$5], , :, [$5]) @@ -1625,7 +1698,7 @@ AC_DEFUN([LT_CMD_MAX_LEN], AC_MSG_CHECKING([the maximum length of command line arguments]) AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl i=0 - teststring="ABCD" + teststring=ABCD case $build_os in msdosdjgpp*) @@ -1665,7 +1738,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl lt_cv_sys_max_cmd_len=8192; ;; - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -1708,7 +1781,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl sysv5* | sco5v6* | sysv4.2uw2*) kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` + lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*[[ ]]//'` else lt_cv_sys_max_cmd_len=32768 fi @@ -1716,22 +1789,22 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` if test -n "$lt_cv_sys_max_cmd_len" && \ - test undefined != "$lt_cv_sys_max_cmd_len"; then + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else # Make teststring a little bigger before we do anything with it. # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do + for i in 1 2 3 4 5 6 7 8; do teststring=$teststring$teststring done SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + while { test X`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough + test 17 != "$i" # 1/2 MB should be enough do i=`expr $i + 1` teststring=$teststring$teststring @@ -1747,7 +1820,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl ;; esac ]) -if test -n $lt_cv_sys_max_cmd_len ; then +if test -n "$lt_cv_sys_max_cmd_len"; then AC_MSG_RESULT($lt_cv_sys_max_cmd_len) else AC_MSG_RESULT(none) @@ -1775,7 +1848,7 @@ m4_defun([_LT_HEADER_DLFCN], # ---------------------------------------------------------------- m4_defun([_LT_TRY_DLOPEN_SELF], [m4_require([_LT_HEADER_DLFCN])dnl -if test "$cross_compiling" = yes; then : +if test yes = "$cross_compiling"; then : [$4] else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -1822,9 +1895,9 @@ else # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated +/* When -fvisibility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) int fnord () __attribute__((visibility("default"))); #endif @@ -1850,7 +1923,7 @@ int main () return status; }] _LT_EOF - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then + if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null lt_status=$? case x$lt_status in @@ -1871,7 +1944,7 @@ rm -fr conftest* # ------------------ AC_DEFUN([LT_SYS_DLOPEN_SELF], [m4_require([_LT_HEADER_DLFCN])dnl -if test "x$enable_dlopen" != xyes; then +if test yes != "$enable_dlopen"; then enable_dlopen=unknown enable_dlopen_self=unknown enable_dlopen_self_static=unknown @@ -1881,44 +1954,52 @@ else case $host_os in beos*) - lt_cv_dlopen="load_add_on" + lt_cv_dlopen=load_add_on lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ;; mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen=LoadLibrary lt_cv_dlopen_libs= ;; cygwin*) - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs= ;; darwin*) - # if libdl is installed we need to link against it + # if libdl is installed we need to link against it AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ - lt_cv_dlopen="dyld" + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[ + lt_cv_dlopen=dyld lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ]) ;; + tpf*) + # Don't try to run any link tests for TPF. We know it's impossible + # because TPF is a cross-compiler, and we know how we open DSOs. + lt_cv_dlopen=dlopen + lt_cv_dlopen_libs= + lt_cv_dlopen_self=no + ;; + *) AC_CHECK_FUNC([shl_load], - [lt_cv_dlopen="shl_load"], + [lt_cv_dlopen=shl_load], [AC_CHECK_LIB([dld], [shl_load], - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], + [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld], [AC_CHECK_FUNC([dlopen], - [lt_cv_dlopen="dlopen"], + [lt_cv_dlopen=dlopen], [AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl], [AC_CHECK_LIB([svld], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld], [AC_CHECK_LIB([dld], [dld_link], - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) + [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld]) ]) ]) ]) @@ -1927,21 +2008,21 @@ else ;; esac - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else + if test no = "$lt_cv_dlopen"; then enable_dlopen=no + else + enable_dlopen=yes fi case $lt_cv_dlopen in dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + save_CPPFLAGS=$CPPFLAGS + test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - save_LIBS="$LIBS" + save_LIBS=$LIBS LIBS="$lt_cv_dlopen_libs $LIBS" AC_CACHE_CHECK([whether a program can dlopen itself], @@ -1951,7 +2032,7 @@ else lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) ]) - if test "x$lt_cv_dlopen_self" = xyes; then + if test yes = "$lt_cv_dlopen_self"; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" AC_CACHE_CHECK([whether a statically linked program can dlopen itself], lt_cv_dlopen_self_static, [dnl @@ -1961,9 +2042,9 @@ else ]) fi - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" + CPPFLAGS=$save_CPPFLAGS + LDFLAGS=$save_LDFLAGS + LIBS=$save_LIBS ;; esac @@ -2055,8 +2136,8 @@ m4_defun([_LT_COMPILER_FILE_LOCKS], m4_require([_LT_FILEUTILS_DEFAULTS])dnl _LT_COMPILER_C_O([$1]) -hard_links="nottested" -if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then +hard_links=nottested +if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then # do not overwrite the value of need_locks provided by the user AC_MSG_CHECKING([if we can lock with hard links]) hard_links=yes @@ -2066,8 +2147,8 @@ if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no AC_MSG_RESULT([$hard_links]) - if test "$hard_links" = no; then - AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) + if test no = "$hard_links"; then + AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe]) need_locks=warn fi else @@ -2094,8 +2175,8 @@ objdir=$lt_cv_objdir _LT_DECL([], [objdir], [0], [The name of the directory that contains temporary libtool files])dnl m4_pattern_allow([LT_OBJDIR])dnl -AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", - [Define to the sub-directory in which libtool stores uninstalled libraries.]) +AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/", + [Define to the sub-directory where libtool stores uninstalled libraries.]) ])# _LT_CHECK_OBJDIR @@ -2107,15 +2188,15 @@ m4_defun([_LT_LINKER_HARDCODE_LIBPATH], _LT_TAGVAR(hardcode_action, $1)= if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || test -n "$_LT_TAGVAR(runpath_var, $1)" || - test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then + test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then # We can hardcode non-existent directories. - if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && + if test no != "$_LT_TAGVAR(hardcode_direct, $1)" && # If the only mechanism to avoid hardcoding is shlibpath_var, we # have to relink, otherwise we might link with an installed library # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && - test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then + ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" && + test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then # Linking always hardcodes the temporary library directory. _LT_TAGVAR(hardcode_action, $1)=relink else @@ -2129,12 +2210,12 @@ else fi AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) -if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || - test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then +if test relink = "$_LT_TAGVAR(hardcode_action, $1)" || + test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then # Fast installation is not supported enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then +elif test yes = "$shlibpath_overrides_runpath" || + test no = "$enable_shared"; then # Fast installation is not necessary enable_fast_install=needless fi @@ -2150,32 +2231,82 @@ m4_defun([_LT_CMD_STRIPLIB], striplib= old_striplib= AC_MSG_CHECKING([whether stripping libraries is possible]) -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - AC_MSG_RESULT([yes]) +if test -z "$STRIP"; then + AC_MSG_RESULT([no]) else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then + if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + AC_MSG_RESULT([yes]) + else + case $host_os in + darwin*) + # FIXME - insert some real tests, host_os isn't really good enough striplib="$STRIP -x" old_striplib="$STRIP -S" AC_MSG_RESULT([yes]) - else + ;; + freebsd*) + if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + ;; + *) AC_MSG_RESULT([no]) - fi - ;; - *) - AC_MSG_RESULT([no]) - ;; - esac + ;; + esac + fi fi _LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) _LT_DECL([], [striplib], [1]) ])# _LT_CMD_STRIPLIB +# _LT_PREPARE_MUNGE_PATH_LIST +# --------------------------- +# Make sure func_munge_path_list() is defined correctly. +m4_defun([_LT_PREPARE_MUNGE_PATH_LIST], +[[# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x@S|@2 in + x) + ;; + *:) + eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\" + ;; + x:*) + eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\" + ;; + *) + eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\" + ;; + esac +} +]])# _LT_PREPARE_PATH_LIST + + # _LT_SYS_DYNAMIC_LINKER([TAG]) # ----------------------------- # PORTME Fill in your ld.so characteristics @@ -2186,17 +2317,18 @@ m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_OBJDUMP])dnl m4_require([_LT_DECL_SED])dnl m4_require([_LT_CHECK_SHELL_FEATURES])dnl +m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl AC_MSG_CHECKING([dynamic linker characteristics]) m4_if([$1], [], [ -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; + darwin*) lt_awk_arg='/^libraries:/,/LR/' ;; + *) lt_awk_arg='/^libraries:/' ;; esac case $host_os in - mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; - *) lt_sed_strip_eq="s,=/,/,g" ;; + mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;; + *) lt_sed_strip_eq='s|=/|/|g' ;; esac lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` case $lt_search_path_spec in @@ -2212,28 +2344,35 @@ if test "$GCC" = yes; then ;; esac # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. + # and add multilib dir if necessary... lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + # ...but if some path component already ends with the multilib dir we assume + # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer). + case "$lt_multi_os_dir; $lt_search_path_spec " in + "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*) + lt_multi_os_dir= + ;; + esac for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else + if test -d "$lt_sys_path$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir" + elif test -n "$lt_multi_os_dir"; then test -d "$lt_sys_path" && \ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; +BEGIN {RS = " "; FS = "/|\n";} { + lt_foo = ""; + lt_count = 0; for (lt_i = NF; lt_i > 0; lt_i--) { if ($lt_i != "" && $lt_i != ".") { if ($lt_i == "..") { lt_count++; } else { if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; + lt_foo = "/" $lt_i lt_foo; } else { lt_count--; } @@ -2247,7 +2386,7 @@ BEGIN {RS=" "; FS="/|\n";} { # for these hosts. case $host_os in mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ - $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; + $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;; esac sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` else @@ -2256,7 +2395,7 @@ fi]) library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=".so" +shrext_cmds=.so postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -2273,14 +2412,17 @@ hardcode_into_libs=no # flags to be left without arguments need_version=unknown +AC_ARG_VAR([LT_SYS_LIBRARY_PATH], +[User-defined run-time library search path.]) + case $host_os in aix3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + library_names_spec='$libname$release$shared_ext$versuffix $libname.a' shlibpath_var=LIBPATH # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' + soname_spec='$libname$release$shared_ext$major' ;; aix[[4-9]]*) @@ -2288,41 +2430,91 @@ aix[[4-9]]*) need_lib_prefix=no need_version=no hardcode_into_libs=yes - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH else # With GCC up to 2.95.x, collect2 would create an import file # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in + # the line '#! .'. This would cause the generated library to + # depend on '.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in aix4 | aix4.[[01]] | aix4.[[01]].*) if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then : else can_build_shared=no fi ;; esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # Using Import Files as archive members, it is possible to support + # filename-based versioning of shared library archives on AIX. While + # this would work for both with and without runtime linking, it will + # prevent static linking of such archives. So we do filename-based + # shared library versioning with .so extension only, which is used + # when both runtime linking and shared linking is enabled. + # Unfortunately, runtime linking may impact performance, so we do + # not want this to be the default eventually. Also, we use the + # versioned .so libs for executables only if there is the -brtl + # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. + # To allow for filename-based versioning support, we need to create + # libNAME.so.V as an archive file, containing: + # *) an Import File, referring to the versioned filename of the + # archive as well as the shared archive member, telling the + # bitwidth (32 or 64) of that shared object, and providing the + # list of exported symbols of that shared object, eventually + # decorated with the 'weak' keyword + # *) the shared object with the F_LOADONLY flag set, to really avoid + # it being seen by the linker. + # At run time we better use the real file rather than another symlink, + # but for link time we create the symlink libNAME.so -> libNAME.so.V + + case $with_aix_soname,$aix_use_runtimelinking in + # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct # soname into executable. Probably we can add versioning support to # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then + aix,yes) # traditional libtool + dynamic_linker='AIX unversionable lib.so' # If using run time linking (on AIX 4.2 or later) use lib.so # instead of lib.a to let people know that these are not # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + aix,no) # traditional AIX only + dynamic_linker='AIX lib.a[(]lib.so.V[)]' # We preserve .a as extension for shared libraries through AIX4.2 # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + ;; + svr4,*) # full svr4 only + dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,yes) # both, prefer svr4 + dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # unpreferred sharedlib libNAME.a needs extra handling + postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' + postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,no) # both, prefer aix + dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]" + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling + postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' + postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' + ;; + esac shlibpath_var=LIBPATH fi ;; @@ -2332,18 +2524,18 @@ amigaos*) powerpc) # Since July 2007 AmigaOS4 officially supports .so libraries. # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ;; m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; beos*) - library_names_spec='${libname}${shared_ext}' + library_names_spec='$libname$shared_ext' dynamic_linker="$host_os ld.so" shlibpath_var=LIBRARY_PATH ;; @@ -2351,8 +2543,8 @@ beos*) bsdi[[45]]*) version_type=linux # correct to gnu/linux during the next big refactor need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" @@ -2364,7 +2556,7 @@ bsdi[[45]]*) cygwin* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=".dll" + shrext_cmds=.dll need_version=no need_lib_prefix=no @@ -2373,8 +2565,8 @@ cygwin* | mingw* | pw32* | cegcc*) # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname~ @@ -2390,27 +2582,27 @@ cygwin* | mingw* | pw32* | cegcc*) case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' m4_if([$1], [],[ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' ;; - *,cl*) - # Native MSVC + *,cl* | *,icl*) + # Native MSVC or ICC libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' case $build_os in mingw*) @@ -2426,7 +2618,7 @@ m4_if([$1], [],[ done IFS=$lt_save_ifs # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` ;; cygwin*) # Convert to unix form, then to dos form, then back to unix form @@ -2437,7 +2629,7 @@ m4_if([$1], [],[ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ;; *) - sys_lib_search_path_spec="$LIB" + sys_lib_search_path_spec=$LIB if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then # It is most probably a Windows format PATH. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` @@ -2450,8 +2642,8 @@ m4_if([$1], [],[ esac # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname' @@ -2463,8 +2655,8 @@ m4_if([$1], [],[ ;; *) - # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' + # Assume MSVC and ICC wrapper + library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; esac @@ -2477,8 +2669,8 @@ darwin* | rhapsody*) version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' + library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' + soname_spec='$libname$release$major$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' @@ -2491,12 +2683,12 @@ dgux*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. if test -x /usr/bin/objformat; then @@ -2510,12 +2702,13 @@ freebsd* | dragonfly*) version_type=freebsd-$objformat case $version_type in freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' need_version=no need_lib_prefix=no ;; freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' need_version=yes ;; esac @@ -2545,10 +2738,10 @@ haiku*) need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes + shlibpath_overrides_runpath=no sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -2566,14 +2759,15 @@ hpux9* | hpux10* | hpux11*) dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + if test 32 = "$HPUX_IA64_MODE"; then sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + sys_lib_dlsearch_path_spec=/usr/lib/hpux32 else sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + sys_lib_dlsearch_path_spec=/usr/lib/hpux64 fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) shrext_cmds='.sl' @@ -2581,8 +2775,8 @@ hpux9* | hpux10* | hpux11*) dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; @@ -2591,8 +2785,8 @@ hpux9* | hpux10* | hpux11*) dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' ;; esac # HP-UX runs *really* slowly unless shared libraries are mode 555, ... @@ -2605,8 +2799,8 @@ interix[[3-9]]*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -2617,7 +2811,7 @@ irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; *) - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix @@ -2625,8 +2819,8 @@ irix5* | irix6* | nonstopux*) esac need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' case $host_os in irix5* | nonstopux*) libsuff= shlibsuff= @@ -2645,8 +2839,8 @@ irix5* | irix6* | nonstopux*) esac shlibpath_var=LD_LIBRARY${shlibsuff}_PATH shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" + sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" hardcode_into_libs=yes ;; @@ -2655,13 +2849,33 @@ linux*oldld* | linux*aout* | linux*coff*) dynamic_linker=no ;; +linux*android*) + version_type=none # Android doesn't support versioned libraries. + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + dynamic_linker='Android linker' + # Don't embed -rpath directories since the linker doesn't support them. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + ;; + # This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -2686,7 +2900,12 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) # before this can be enabled. hardcode_into_libs=yes - # Append ld.so.conf contents to the search path + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, + # even though it is searched at run-time. Try to do the best guess by + # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then 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;s/"//g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" @@ -2718,12 +2937,12 @@ netbsd*) need_lib_prefix=no need_version=no if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='NetBSD ld.elf_so' fi shlibpath_var=LD_LIBRARY_PATH @@ -2733,7 +2952,7 @@ netbsd*) newsos6) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes ;; @@ -2742,58 +2961,68 @@ newsos6) version_type=qnx need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes dynamic_linker='ldqnx.so' ;; -openbsd*) +openbsd* | bitrig*) version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" + sys_lib_dlsearch_path_spec=/usr/lib need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[[89]] | openbsd2.[[89]].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + need_version=no else - shlibpath_overrides_runpath=yes + need_version=yes fi + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes ;; os2*) libname_spec='$name' - shrext_cmds=".dll" + version_type=windows + shrext_cmds=.dll + need_version=no need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' + # OS/2 can only load a DLL with a base name of 8 characters or less. + soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; + v=$($ECHO $release$versuffix | tr -d .-); + n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); + $ECHO $n$v`$shared_ext' + library_names_spec='${libname}_dll.$libext' dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH + shlibpath_var=BEGINLIBPATH + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' ;; osf3* | osf4* | osf5*) version_type=osf need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; rdos*) @@ -2804,8 +3033,8 @@ solaris*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes @@ -2815,11 +3044,11 @@ solaris*) sunos4*) version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then need_lib_prefix=no fi need_version=yes @@ -2827,8 +3056,8 @@ sunos4*) sysv4 | sysv4.3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH case $host_vendor in sni) @@ -2849,24 +3078,24 @@ sysv4 | sysv4.3*) ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' + library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' + soname_spec='$libname$shared_ext.$major' shlibpath_var=LD_LIBRARY_PATH fi ;; sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf + version_type=sco need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' else sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' @@ -2884,7 +3113,7 @@ tpf*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes @@ -2892,8 +3121,8 @@ tpf*) uts4*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -2902,20 +3131,30 @@ uts4*) ;; esac AC_MSG_RESULT([$dynamic_linker]) -test "$dynamic_linker" = no && can_build_shared=no +test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then +if test yes = "$GCC"; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then + sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + +if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then + sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec fi +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec + +# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" + +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH + _LT_DECL([], [variables_saved_for_relink], [1], [Variables whose values should be saved in libtool wrapper scripts and restored at link time]) @@ -2948,39 +3187,41 @@ _LT_DECL([], [hardcode_into_libs], [0], [Whether we should hardcode library paths into libraries]) _LT_DECL([], [sys_lib_search_path_spec], [2], [Compile-time system search path for libraries]) -_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], - [Run-time system search path for libraries]) +_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2], + [Detected run-time system search path for libraries]) +_LT_DECL([], [configure_time_lt_sys_library_path], [2], + [Explicit LT_SYS_LIBRARY_PATH set during ./configure time]) ])# _LT_SYS_DYNAMIC_LINKER # _LT_PATH_TOOL_PREFIX(TOOL) # -------------------------- -# find a file program which can recognize shared library +# find a file program that can recognize shared library AC_DEFUN([_LT_PATH_TOOL_PREFIX], [m4_require([_LT_DECL_EGREP])dnl AC_MSG_CHECKING([for $1]) AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, [case $MAGIC_CMD in [[\\/*] | ?:[\\/]*]) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR dnl $ac_dummy forces splitting on constant user-supplied paths. dnl POSIX.2 word splitting is done only on the output of word expansions, dnl not every word. This closes a longstanding sh security hole. ac_dummy="m4_if([$2], , $PATH, [$2])" for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$1; then - lt_cv_path_MAGIC_CMD="$ac_dir/$1" + if test -f "$ac_dir/$1"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"$1" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + MAGIC_CMD=$lt_cv_path_MAGIC_CMD if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -3003,11 +3244,11 @@ _LT_EOF break fi done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD ;; esac]) -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then AC_MSG_RESULT($MAGIC_CMD) else @@ -3025,7 +3266,7 @@ dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], []) # _LT_PATH_MAGIC # -------------- -# find a file program which can recognize a shared library +# find a file program that can recognize a shared library m4_defun([_LT_PATH_MAGIC], [_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) if test -z "$lt_cv_path_MAGIC_CMD"; then @@ -3052,16 +3293,16 @@ m4_require([_LT_PROG_ECHO_BACKSLASH])dnl AC_ARG_WITH([gnu-ld], [AS_HELP_STRING([--with-gnu-ld], [assume the C compiler uses GNU ld @<:@default=no@:>@])], - [test "$withval" = no || with_gnu_ld=yes], + [test no = "$withval" || with_gnu_ld=yes], [with_gnu_ld=no])dnl ac_prog=ld -if test "$GCC" = yes; then +if test yes = "$GCC"; then # Check if gcc -print-prog-name=ld gives a path. AC_MSG_CHECKING([for ld used by $CC]) case $host in *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw + # gcc leaves a trailing carriage return, which upsets mingw ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; @@ -3075,7 +3316,7 @@ if test "$GCC" = yes; then while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` done - test -z "$LD" && LD="$ac_prog" + test -z "$LD" && LD=$ac_prog ;; "") # If it fails, then pretend we aren't using GCC. @@ -3086,37 +3327,37 @@ if test "$GCC" = yes; then with_gnu_ld=unknown ;; esac -elif test "$with_gnu_ld" = yes; then +elif test yes = "$with_gnu_ld"; then AC_MSG_CHECKING([for GNU ld]) else AC_MSG_CHECKING([for non-GNU ld]) fi AC_CACHE_VAL(lt_cv_path_LD, [if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" + lt_cv_path_LD=$ac_dir/$ac_prog # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 conftest.i +cat conftest.i conftest.i >conftest2.i +: ${lt_DD:=$DD} +AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd], +[if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=: +fi]) +rm -f conftest.i conftest2.i conftest.out]) +])# _LT_PATH_DD + + +# _LT_CMD_TRUNCATE +# ---------------- +# find command to truncate a binary pipe +m4_defun([_LT_CMD_TRUNCATE], +[m4_require([_LT_PATH_DD]) +AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin], +[printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +lt_cv_truncate_bin= +if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" +fi +rm -f conftest.i conftest2.i conftest.out +test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"]) +_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1], + [Command to truncate a binary pipe]) +])# _LT_CMD_TRUNCATE + + # _LT_CHECK_MAGIC_METHOD # ---------------------- # how to check for library dependencies @@ -3202,13 +3480,13 @@ lt_cv_deplibs_check_method='unknown' # Need to set the preceding variable on all platforms that support # interlibrary dependencies. # 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. +# 'unknown' -- same as none, but documents that we really don't know. # 'pass_all' -- all dependencies passed with no checks. # 'test_compile' -- check by making test program. # 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given extended regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. +# that responds to the $file_magic_cmd with a given extended regex. +# If you have 'file' or equivalent on your system and you're not sure +# whether 'pass_all' will *always* work, you probably want this one. case $host_os in aix[[4-9]]*) @@ -3221,7 +3499,7 @@ beos*) bsdi[[45]]*) lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_cmd='$FILECMD -L' lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -3235,8 +3513,7 @@ mingw* | pw32*) # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. - if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then + if ( file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -3256,14 +3533,14 @@ darwin* | rhapsody*) lt_cv_deplibs_check_method=pass_all ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; esac @@ -3277,7 +3554,7 @@ haiku*) ;; hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD case $host_cpu in ia64*) lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' @@ -3324,7 +3601,7 @@ netbsd* | netbsdelf*-gnu) newos6*) lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; @@ -3332,8 +3609,8 @@ newos6*) lt_cv_deplibs_check_method=pass_all ;; -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +openbsd* | bitrig*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' else lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' @@ -3386,6 +3663,9 @@ sysv4 | sysv4.3*) tpf*) lt_cv_deplibs_check_method=pass_all ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; esac ]) @@ -3426,33 +3706,38 @@ AC_DEFUN([LT_PATH_NM], AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, [if test -n "$NM"; then # Let the user override the test. - lt_cv_path_NM="$NM" + lt_cv_path_NM=$NM else - lt_nm_to_check="${ac_tool_prefix}nm" + lt_nm_to_check=${ac_tool_prefix}nm if test -n "$ac_tool_prefix" && test "$build" = "$host"; then lt_nm_to_check="$lt_nm_to_check nm" fi for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + tmp_nm=$ac_dir/$lt_tmp_nm + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # Adding the 'sed 1q' prevents false positives on HP-UX, which says: # nm: unknown option "B" ignored # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) + # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty + case $build_os in + mingw*) lt_bad_file=conftest.nm/nofile ;; + *) lt_bad_file=/dev/null ;; + esac + case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in + *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" - break + break 2 ;; *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" - break + break 2 ;; *) lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but @@ -3463,21 +3748,21 @@ else esac fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs done : ${lt_cv_path_NM=no} fi]) -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" +if test no != "$lt_cv_path_NM"; then + NM=$lt_cv_path_NM else # Didn't find any BSD compatible name lister, look for dumpbin. if test -n "$DUMPBIN"; then : # Let the user override the test. else AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in *COFF*) - DUMPBIN="$DUMPBIN -symbols" + DUMPBIN="$DUMPBIN -symbols -headers" ;; *) DUMPBIN=: @@ -3485,8 +3770,8 @@ else esac fi AC_SUBST([DUMPBIN]) - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" + if test : != "$DUMPBIN"; then + NM=$DUMPBIN fi fi test -z "$NM" && NM=nm @@ -3532,8 +3817,8 @@ lt_cv_sharedlib_from_linklib_cmd, case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL + # two different shell functions defined in ltmain.sh; + # decide which one to use based on capabilities of $DLLTOOL case `$DLLTOOL --help 2>&1` in *--identify-strict*) lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib @@ -3545,7 +3830,7 @@ cygwin* | mingw* | pw32* | cegcc*) ;; *) # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" + lt_cv_sharedlib_from_linklib_cmd=$ECHO ;; esac ]) @@ -3572,13 +3857,28 @@ AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool lt_cv_path_mainfest_tool=yes fi rm -f conftest*]) -if test "x$lt_cv_path_mainfest_tool" != xyes; then +if test yes != "$lt_cv_path_mainfest_tool"; then MANIFEST_TOOL=: fi _LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl ])# _LT_PATH_MANIFEST_TOOL +# _LT_DLL_DEF_P([FILE]) +# --------------------- +# True iff FILE is a Windows DLL '.def' file. +# Keep in sync with func_dll_def_p in the libtool script +AC_DEFUN([_LT_DLL_DEF_P], +[dnl + test DEF = "`$SED -n dnl + -e '\''s/^[[ ]]*//'\'' dnl Strip leading whitespace + -e '\''/^\(;.*\)*$/d'\'' dnl Delete empty lines and comments + -e '\''s/^\(EXPORTS\|LIBRARY\)\([[ ]].*\)*$/DEF/p'\'' dnl + -e q dnl Only consider the first "real" line + $1`" dnl +])# _LT_DLL_DEF_P + + # LT_LIB_M # -------- # check for math library @@ -3590,11 +3890,11 @@ case $host in # These system don't have libm, or don't need it ;; *-ncr-sysv4.3*) - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") + AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw) AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") ;; *) - AC_CHECK_LIB(m, cos, LIBM="-lm") + AC_CHECK_LIB(m, cos, LIBM=-lm) ;; esac AC_SUBST([LIBM]) @@ -3613,7 +3913,7 @@ m4_defun([_LT_COMPILER_NO_RTTI], _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $cc_basename in nvcc*) _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; @@ -3665,7 +3965,7 @@ cygwin* | mingw* | pw32* | cegcc*) symcode='[[ABCDGISTW]]' ;; hpux*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then symcode='[[ABCDEGRST]]' fi ;; @@ -3698,14 +3998,44 @@ case `$NM -V 2>&1` in symcode='[[ABCDGIRSTW]]' ;; esac +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Gets list of data symbols to import. + lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \(.*\)$/\1/p'" + # Adjust the below global symbol transforms to fixup imported variables. + lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" + lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" + lt_c_name_lib_hook="\ + -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ + -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" +else + # Disable hooks by default. + lt_cv_sys_global_symbol_to_import= + lt_cdecl_hook= + lt_c_name_hook= + lt_c_name_lib_hook= +fi + # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +lt_cv_sys_global_symbol_to_cdecl="$SED -n"\ +$lt_cdecl_hook\ +" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\ +$lt_c_name_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" + +# Transform an extracted symbol line into symbol name with lib prefix and +# symbol address. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\ +$lt_c_name_lib_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -3723,26 +4053,29 @@ for ac_symprfx in "" "_"; do # Write the raw and C identifiers. if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. - # Also find C++ and __fastcall symbols from MSVC++, + # Fake it for dumpbin and say T for any non-static function, + # D for any global variable and I for any imported variable. + # Also find C++ and __fastcall symbols from MSVC++ or ICC, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ +" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ +" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ " {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ +" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ +" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx]" else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + lt_cv_sys_global_symbol_pipe="$SED -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | $SED '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -3764,7 +4097,8 @@ _LT_EOF if AC_TRY_EVAL(ac_compile); then # Now try to grab the symbols. nlist=conftest.nm - if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then + $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&AS_MESSAGE_LOG_FD + if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&AS_MESSAGE_LOG_FD && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -3777,11 +4111,11 @@ _LT_EOF if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT@&t@_DLSYM_CONST -#elif defined(__osf__) +#elif defined __osf__ /* This system does not cope well with relocations in const data. */ # define LT@&t@_DLSYM_CONST #else @@ -3807,7 +4141,7 @@ lt__PROGRAM__LTX_preloaded_symbols[[]] = { { "@PROGRAM@", (void *) 0 }, _LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext cat <<\_LT_EOF >> conftest.$ac_ext {0, (void *) 0} }; @@ -3827,9 +4161,9 @@ _LT_EOF mv conftest.$ac_objext conftstm.$ac_objext lt_globsym_save_LIBS=$LIBS lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" + LIBS=conftstm.$ac_objext CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then + if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then pipe_works=yes fi LIBS=$lt_globsym_save_LIBS @@ -3850,7 +4184,7 @@ _LT_EOF rm -rf conftest* conftst* # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then + if test yes = "$pipe_works"; then break else lt_cv_sys_global_symbol_pipe= @@ -3877,12 +4211,16 @@ _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], [Take the output of nm and produce a listing of raw symbols and C names]) _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], [Transform the output of nm in a proper C declaration]) +_LT_DECL([global_symbol_to_import], [lt_cv_sys_global_symbol_to_import], [1], + [Transform the output of nm into a list of symbols to manually relocate]) _LT_DECL([global_symbol_to_c_name_address], [lt_cv_sys_global_symbol_to_c_name_address], [1], [Transform the output of nm in a C name address pair]) _LT_DECL([global_symbol_to_c_name_address_lib_prefix], [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], [Transform the output of nm in a C name address pair when lib prefix is needed]) +_LT_DECL([nm_interface], [lt_cv_nm_interface], [1], + [The name lister interface]) _LT_DECL([], [nm_file_list_spec], [1], [Specify filename containing input files for $NM]) ]) # _LT_CMD_GLOBAL_SYMBOLS @@ -3898,17 +4236,18 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)= m4_if([$1], [CXX], [ # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then + if test yes = "$GXX"; then _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; amigaos*) @@ -3919,8 +4258,8 @@ m4_if([$1], [CXX], [ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -3936,6 +4275,11 @@ m4_if([$1], [CXX], [ # (--disable-auto-import) libraries m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac ;; darwin* | rhapsody*) # PIC is the default on this platform @@ -3985,7 +4329,7 @@ m4_if([$1], [CXX], [ case $host_os in aix[[4-9]]*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' else @@ -4019,21 +4363,21 @@ m4_if([$1], [CXX], [ ;; esac ;; - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) case $cc_basename in CC*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' + if test ia64 != "$host_cpu"; then _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' fi ;; aCC*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' case $host_cpu in hppa*64*|ia64*) # +Z the default @@ -4070,7 +4414,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; ecpc* ) - # old Intel C++ for x86_64 which still supported -KPIC. + # old Intel C++ for x86_64, which still supported -KPIC. _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' @@ -4102,7 +4446,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C++ 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -4215,17 +4559,18 @@ m4_if([$1], [CXX], [ fi ], [ - if test "$GCC" = yes; then + if test yes = "$GCC"; then _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; amigaos*) @@ -4236,8 +4581,8 @@ m4_if([$1], [CXX], [ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -4254,6 +4599,11 @@ m4_if([$1], [CXX], [ # (--disable-auto-import) libraries m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac ;; darwin* | rhapsody*) @@ -4324,7 +4674,7 @@ m4_if([$1], [CXX], [ case $host_os in aix*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' else @@ -4332,11 +4682,30 @@ m4_if([$1], [CXX], [ fi ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + case $cc_basename in + nagfor*) + # NAG Fortran compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac + ;; + mingw* | cygwin* | pw32* | os2* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac ;; hpux9* | hpux10* | hpux11*) @@ -4352,7 +4721,7 @@ m4_if([$1], [CXX], [ ;; esac # Is there a better lt_prog_compiler_static that works with the bundled CC? - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' ;; irix5* | irix6* | nonstopux*) @@ -4363,12 +4732,18 @@ m4_if([$1], [CXX], [ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. + # old Intel for x86_64, which still supported -KPIC. ecc*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ;; + # flang / f18. f95 an alias for gfortran or flang on Debian + flang* | f18* | f95*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; # icc used to be incompatible with GCC. # ICC 10 doesn't accept -KPIC any more. icc* | ifort*) @@ -4388,6 +4763,12 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ;; + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -4407,7 +4788,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -4485,7 +4866,7 @@ m4_if([$1], [CXX], [ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi @@ -4514,7 +4895,7 @@ m4_if([$1], [CXX], [ fi ]) case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: + # For platforms that do not support PIC, -DPIC is meaningless: *djgpp*) _LT_TAGVAR(lt_prog_compiler_pic, $1)= ;; @@ -4580,21 +4961,25 @@ m4_if([$1], [CXX], [ case $host_os in aix[[4-9]]*) # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global defined - # symbols, whereas GNU nm marks them as "W". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi ;; pw32*) - _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" + _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl*) + cl* | icl*) _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' ;; *) @@ -4639,9 +5024,9 @@ m4_if([$1], [CXX], [ # included in the symbol list _LT_TAGVAR(include_expsyms, $1)= # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. + # it will be wrapped by ' (' and ')$', so one must not match beginning or + # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc', + # as well as any symbol that contains 'd'. _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if @@ -4654,18 +5039,18 @@ dnl Note also adjust exclude_expsyms for C++ above. case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time + # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then + # Microsoft Visual C++ or Intel C++ Compiler. + if test yes != "$GCC"; then with_gnu_ld=no fi ;; interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) + # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC) with_gnu_ld=yes ;; - openbsd*) + openbsd* | bitrig*) with_gnu_ld=no ;; linux* | k*bsd*-gnu | gnu*) @@ -4678,7 +5063,7 @@ dnl Note also adjust exclude_expsyms for C++ above. # On some targets, GNU ld is compatible enough with the native linker # that we're better off using the native interface for both. lt_use_gnu_ld_interface=no - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then case $host_os in aix*) # The AIX port of GNU ld has always aspired to compatibility @@ -4700,24 +5085,24 @@ dnl Note also adjust exclude_expsyms for C++ above. esac fi - if test "$lt_use_gnu_ld_interface" = yes; then + if test yes = "$lt_use_gnu_ld_interface"; then # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' + wlarc='$wl' # Set some defaults for GNU ld with shared library support. These # are reset later if shared libraries are not supported. Putting them # here allows them to be overridden if necessary. runpath_var=LD_RUN_PATH - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' # ancient GNU ld didn't support --whole-archive et. al. if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else _LT_TAGVAR(whole_archive_flag_spec, $1)= fi supports_anon_versioning=no - case `$LD -v 2>&1` in + case `$LD -v | $SED -e 's/([[^)]]\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -4730,7 +5115,7 @@ dnl Note also adjust exclude_expsyms for C++ above. case $host_os in aix[[3-9]]*) # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then + if test ia64 != "$host_cpu"; then _LT_TAGVAR(ld_shlibs, $1)=no cat <<_LT_EOF 1>&2 @@ -4749,7 +5134,7 @@ _LT_EOF case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='' ;; m68k) @@ -4765,7 +5150,7 @@ _LT_EOF _LT_TAGVAR(allow_undefined_flag, $1)=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4775,7 +5160,7 @@ _LT_EOF # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes @@ -4783,61 +5168,90 @@ _LT_EOF _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi ;; haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes ;; + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' + ;; + interix[[3-9]]*) _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_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' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_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' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no - if test "$host_os" = linux-dietlibc; then + if test linux-dietlibc = "$host_os"; then case $cc_basename in diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) esac fi if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no + && test no = "$tmp_diet" then tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag' ;; pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group f77 and f90 compilers - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -4848,42 +5262,48 @@ _LT_EOF lf95*) # Lahey Fortran 8.1 _LT_TAGVAR(whole_archive_flag_spec, $1)= tmp_sharedflag='--shared' ;; + nagfor*) # NAGFOR 5.3 + tmp_sharedflag='-Wl,-shared' ;; xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; nvcc*) # Cuda Compiler Driver 2.2 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes ;; esac - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C 5.9 - _LT_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; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_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; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 tmp_sharedflag='-G' ;; esac - _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi case $cc_basename in + tcc*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic' + ;; xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -4897,8 +5317,8 @@ _LT_EOF _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -4916,8 +5336,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4929,7 +5349,7 @@ _LT_EOF _LT_TAGVAR(ld_shlibs, $1)=no cat <<_LT_EOF 1>&2 -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot *** reliably create shared libraries on SCO systems. Therefore, libtool *** is disabling shared libraries support. We urge you to upgrade GNU *** binutils to release 2.16.91.0.3 or newer. Another option is to modify @@ -4944,9 +5364,9 @@ _LT_EOF # DT_RUNPATH tag from executables and libraries. But doing so # requires that you compile everything twice, which is a pain. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4963,15 +5383,15 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi ;; esac - if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then + if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then runpath_var= _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= _LT_TAGVAR(export_dynamic_flag_spec, $1)= @@ -4987,7 +5407,7 @@ _LT_EOF # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. _LT_TAGVAR(hardcode_minus_L, $1)=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. _LT_TAGVAR(hardcode_direct, $1)=unsupported @@ -4995,34 +5415,57 @@ _LT_EOF ;; aix[[4-9]]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global - # defined symbols, whereas GNU nm marks them as "W". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then aix_use_runtimelinking=yes break fi done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -5041,13 +5484,21 @@ _LT_EOF _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' + _LT_TAGVAR(file_list_spec, $1)='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # traditional, no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + ;; + esac - if test "$GCC" = yes; then + if test yes = "$GCC"; then case $host_os in aix4.[[012]]|aix4.[[012]].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -5066,62 +5517,80 @@ _LT_EOF ;; esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag="$shared_flag "'$wl-G' fi - _LT_TAGVAR(link_all_deplibs, $1)=no + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to export. _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. _LT_TAGVAR(allow_undefined_flag, $1)='-berok' # Determine the default libpath from the value encoded in an # empty executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + if test ia64 = "$host_cpu"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib' _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok' + if test yes = "$with_gnu_ld"; then # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' fi _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared libraries. + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -5130,7 +5599,7 @@ _LT_EOF case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='' ;; m68k) @@ -5147,12 +5616,12 @@ _LT_EOF cygwin* | mingw* | pw32* | cegcc*) # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. + # Microsoft Visual C++ or Intel C++ Compiler. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. case $cc_basename in - cl*) - # Native MSVC + cl* | icl*) + # Native MSVC or ICC _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=yes @@ -5160,16 +5629,17 @@ _LT_EOF # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes @@ -5178,27 +5648,27 @@ _LT_EOF # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) - # Assume MSVC wrapper + # Assume MSVC and ICC wrapper _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. @@ -5240,7 +5710,7 @@ _LT_EOF ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_TAGVAR(hardcode_direct, $1)=yes @@ -5248,33 +5718,33 @@ _LT_EOF ;; hpux9*) - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' ;; hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + if test yes,no = "$GCC,$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. _LT_TAGVAR(hardcode_minus_L, $1)=yes @@ -5282,25 +5752,25 @@ _LT_EOF ;; hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then + if test yes,no = "$GCC,$with_gnu_ld"; then case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) m4_if($1, [], [ @@ -5308,14 +5778,14 @@ _LT_EOF # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) _LT_LINKER_OPTION([if $CC understands -b], _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], - [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], + [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], - [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) + [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) ;; esac fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: case $host_cpu in @@ -5326,7 +5796,7 @@ _LT_EOF *) _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. @@ -5337,16 +5807,16 @@ _LT_EOF ;; irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. # This should be the same for all languages, so no per-tag cache variable. AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], [lt_cv_irix_exported_symbol], - [save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + [save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" AC_LINK_IFELSE( [AC_LANG_SOURCE( [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], @@ -5359,21 +5829,33 @@ _LT_EOF end]])])], [lt_cv_irix_exported_symbol=yes], [lt_cv_irix_exported_symbol=no]) - LDFLAGS="$save_LDFLAGS"]) - if test "$lt_cv_irix_exported_symbol" = yes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + LDFLAGS=$save_LDFLAGS]) + if test yes = "$lt_cv_irix_exported_symbol"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi + _LT_TAGVAR(link_all_deplibs, $1)=no else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' fi _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(inherit_rpath, $1)=yes _LT_TAGVAR(link_all_deplibs, $1)=yes ;; + linux*) + case $cc_basename in + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + _LT_TAGVAR(ld_shlibs, $1)=yes + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + ;; + esac + ;; + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out @@ -5388,7 +5870,7 @@ _LT_EOF newsos6) _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; @@ -5396,27 +5878,19 @@ _LT_EOF *nto* | *qnx*) ;; - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' else - case $host_os in - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - ;; - esac + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' fi else _LT_TAGVAR(ld_shlibs, $1)=no @@ -5427,33 +5901,54 @@ _LT_EOF _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' _LT_TAGVAR(hardcode_minus_L, $1)=yes _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' ;; osf3*) - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' fi _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: ;; osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + if test yes = "$GCC"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp' # Both c and cxx compiler support -rpath directly _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -5464,24 +5959,24 @@ _LT_EOF solaris*) _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + wlarc='$wl' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) wlarc='' - _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' ;; *) - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' + wlarc='$wl' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ;; esac fi @@ -5491,11 +5986,11 @@ _LT_EOF solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', + # but understands '-z linker_flag'. GCC discards it without '$wl', # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + if test yes = "$GCC"; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' else _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' fi @@ -5505,10 +6000,10 @@ _LT_EOF ;; sunos4*) - if test "x$host_vendor" = xsequent; then + if test sequent = "$host_vendor"; then # Use $CC to link under sequent, because it throws in some extra .o # files that make .init and .fini sections work. - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags' else _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' fi @@ -5557,43 +6052,43 @@ _LT_EOF ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport' runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; @@ -5608,17 +6103,17 @@ _LT_EOF ;; esac - if test x$host_vendor = xsni; then + if test sni = "$host_vendor"; then case $host in sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym' ;; esac fi fi ]) AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) -test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no +test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no _LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld @@ -5635,7 +6130,7 @@ x|xyes) # Assume -lc should be added _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - if test "$enable_shared" = yes && test "$GCC" = yes; then + if test yes,yes = "$GCC,$enable_shared"; then case $_LT_TAGVAR(archive_cmds, $1) in *'~'*) # FIXME: we may have to deal with multi-command sequences. @@ -5715,12 +6210,12 @@ _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], _LT_TAGDECL([], [hardcode_libdir_separator], [1], [Whether we need a single "-rpath" flag with a separated argument]) _LT_TAGDECL([], [hardcode_direct], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes + [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes DIR into the resulting binary]) _LT_TAGDECL([], [hardcode_direct_absolute], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes + [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes DIR into the resulting binary and the resulting library dependency is - "absolute", i.e impossible to change by setting ${shlibpath_var} if the + "absolute", i.e impossible to change by setting $shlibpath_var if the library is relocated]) _LT_TAGDECL([], [hardcode_minus_L], [0], [Set to "yes" if using the -LDIR flag during linking hardcodes DIR @@ -5761,10 +6256,10 @@ dnl [Compiler flag to generate thread safe objects]) # ------------------------ # Ensure that the configuration variables for a C compiler are suitably # defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. +# the compiler configuration to 'libtool'. m4_defun([_LT_LANG_C_CONFIG], [m4_require([_LT_DECL_EGREP])dnl -lt_save_CC="$CC" +lt_save_CC=$CC AC_LANG_PUSH(C) # Source file extension for C test sources. @@ -5800,18 +6295,18 @@ if test -n "$compiler"; then LT_SYS_DLOPEN_SELF _LT_CMD_STRIPLIB - # Report which library types will actually be built + # Report what library types will actually be built AC_MSG_CHECKING([if libtool supports shared libraries]) AC_MSG_RESULT([$can_build_shared]) AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' @@ -5819,8 +6314,12 @@ if test -n "$compiler"; then ;; aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -5828,13 +6327,13 @@ if test -n "$compiler"; then AC_MSG_CHECKING([whether to build static libraries]) # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes AC_MSG_RESULT([$enable_static]) _LT_CONFIG($1) fi AC_LANG_POP -CC="$lt_save_CC" +CC=$lt_save_CC ])# _LT_LANG_C_CONFIG @@ -5842,14 +6341,14 @@ CC="$lt_save_CC" # -------------------------- # Ensure that the configuration variables for a C++ compiler are suitably # defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. +# the compiler configuration to 'libtool'. m4_defun([_LT_LANG_CXX_CONFIG], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_EGREP])dnl m4_require([_LT_PATH_MANIFEST_TOOL])dnl -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then +if test -n "$CXX" && ( test no != "$CXX" && + ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) || + (test g++ != "$CXX"))); then AC_PROG_CXXCPP else _lt_caught_CXX_error=yes @@ -5891,7 +6390,7 @@ _LT_TAGVAR(objext, $1)=$objext # the CXX compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_caught_CXX_error" != yes; then +if test yes != "$_lt_caught_CXX_error"; then # Code to be used in simple compile tests lt_simple_compile_test_code="int some_variable = 0;" @@ -5933,35 +6432,35 @@ if test "$_lt_caught_CXX_error" != yes; then if test -n "$compiler"; then # We don't want -fno-exception when compiling C++ code, so set the # no_builtin_flag separately - if test "$GXX" = yes; then + if test yes = "$GXX"; then _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' else _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= fi - if test "$GXX" = yes; then + if test yes = "$GXX"; then # Set up default GNU C++ configuration LT_PATH_LD # Check if GNU C++ uses GNU ld as the underlying linker, since the # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + if test yes = "$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' # If archive_cmds runs LD, not CC, wlarc should be empty # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to # investigate it a little bit more. (MM) - wlarc='${wl}' + wlarc='$wl' # ancient GNU ld didn't support --whole-archive et. al. if eval "`$CC -print-prog-name=ld` --help 2>&1" | $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else _LT_TAGVAR(whole_archive_flag_spec, $1)= fi @@ -5980,7 +6479,7 @@ if test "$_lt_caught_CXX_error" != yes; then # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' else GXX=no @@ -5997,18 +6496,30 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(ld_shlibs, $1)=no ;; aix[[4-9]]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) for ld_flag in $LDFLAGS; do case $ld_flag in @@ -6018,6 +6529,13 @@ if test "$_lt_caught_CXX_error" != yes; then ;; esac done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -6036,13 +6554,21 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' + _LT_TAGVAR(file_list_spec, $1)='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + ;; + esac - if test "$GXX" = yes; then + if test yes = "$GXX"; then case $host_os in aix4.[[012]]|aix4.[[012]].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -6060,64 +6586,84 @@ if test "$_lt_caught_CXX_error" != yes; then fi esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag=$shared_flag' $wl-G' fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to # export. _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # The "-G" linker flag allows undefined symbols. + _LT_TAGVAR(no_undefined_flag, $1)='-bernotok' # Determine the default libpath from the value encoded in an empty # executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + if test ia64 = "$host_cpu"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib' _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok' + if test yes = "$with_gnu_ld"; then # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' fi _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared - # libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared + # libraries. Need -bnortl late, we may have -brtl in LDFLAGS. + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -6127,7 +6673,7 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(allow_undefined_flag, $1)=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -6144,8 +6690,8 @@ if test "$_lt_caught_CXX_error" != yes; then cygwin* | mingw* | pw32* | cegcc*) case $GXX,$cc_basename in - ,cl* | no,cl*) - # Native MSVC + ,cl* | no,cl* | ,icl* | no,icl*) + # Native MSVC or ICC # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' @@ -6155,57 +6701,58 @@ if test "$_lt_caught_CXX_error" != yes; then # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - func_to_tool_file "$lt_outputfile"~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + func_to_tool_file "$lt_outputfile"~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) # g++ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -6216,6 +6763,35 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_DARWIN_LINKER_FEATURES($1) ;; + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' + ;; + dgux*) case $cc_basename in ec++*) @@ -6244,21 +6820,21 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions _LT_TAGVAR(ld_shlibs, $1)=yes ;; haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes ;; hpux9*) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, # but as the default @@ -6270,7 +6846,7 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(ld_shlibs, $1)=no ;; aCC*) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -6279,11 +6855,11 @@ if test "$_lt_caught_CXX_error" != yes; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + if test yes = "$GXX"; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else # FIXME: insert proper C++ library support _LT_TAGVAR(ld_shlibs, $1)=no @@ -6293,15 +6869,15 @@ if test "$_lt_caught_CXX_error" != yes; then ;; hpux10*|hpux11*) - if test $with_gnu_ld = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: case $host_cpu in hppa*64*|ia64*) ;; *) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' ;; esac fi @@ -6327,13 +6903,13 @@ if test "$_lt_caught_CXX_error" != yes; then aCC*) case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac # Commands to make compiler produce verbose output that lists @@ -6344,20 +6920,20 @@ if test "$_lt_caught_CXX_error" != yes; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac fi @@ -6372,22 +6948,22 @@ if test "$_lt_caught_CXX_error" != yes; then interix[[3-9]]*) _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_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' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_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' ;; irix5* | irix6*) case $cc_basename in CC*) # SGI C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' # Archives containing C++ object files must be created using # "CC -ar", where "CC" is the IRIX C++ compiler. This is @@ -6396,17 +6972,17 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' ;; *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib' fi fi _LT_TAGVAR(link_all_deplibs, $1)=yes ;; esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(inherit_rpath, $1)=yes ;; @@ -6419,8 +6995,8 @@ if test "$_lt_caught_CXX_error" != yes; then # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -6429,10 +7005,10 @@ if test "$_lt_caught_CXX_error" != yes; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' # Archives containing C++ object files must be created using # "CC -Bstatic", where "CC" is the KAI C++ compiler. @@ -6446,59 +7022,59 @@ if test "$_lt_caught_CXX_error" != yes; then # earlier do not add the objects themselves. case `$CC -V 2>&1` in *"Version 7."*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; *) # Version 8.0 or newer tmp_idyn= case $host_cpu in ia64*) tmp_idyn=' -i_dynamic';; esac - _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; esac _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' ;; pgCC* | pgcpp*) # Portland Group C++ compiler case `$CC -V` in *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ + $RANLIB $oldlib' _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; *) # Version 6 and above use weak symbols - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_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' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_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' ;; esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' ;; cxx*) # Compaq C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols' runpath_var=LD_RUN_PATH _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -6512,29 +7088,29 @@ if test "$_lt_caught_CXX_error" != yes; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$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; func_echo_all "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$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; func_echo_all "X$list" | $Xsed' ;; xl* | mpixl* | bgxl*) # IBM XL 8.0 on PPC, with GNU ld - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C++ 5.9 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_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' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_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' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_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; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_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; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes # Not sure whether something based on @@ -6592,22 +7168,17 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(ld_shlibs, $1)=yes ;; - openbsd2*) - # C++ shared libraries are fairly broken - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_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' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then + _LT_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' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' fi output_verbose_link_cmd=func_echo_all else @@ -6623,9 +7194,9 @@ if test "$_lt_caught_CXX_error" != yes; then # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: # Archives containing C++ object files must be created using @@ -6643,17 +7214,17 @@ if test "$_lt_caught_CXX_error" != yes; then cxx*) case $host in osf3*) - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' ;; *) _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ - $RM $lib.exp' + echo "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~ + $RM $lib.exp' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ;; esac @@ -6668,27 +7239,27 @@ if test "$_lt_caught_CXX_error" != yes; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$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; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$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; func_echo_all "$list"' ;; *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + if test yes,no = "$GXX,$with_gnu_ld"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' case $host in osf3*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ;; esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' else # FIXME: insert proper C++ library support @@ -6728,9 +7299,9 @@ if test "$_lt_caught_CXX_error" != yes; then # Sun C++ 4.2, 5.x and Centerline C++ _LT_TAGVAR(archive_cmds_need_lc,$1)=yes _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -6738,7 +7309,7 @@ if test "$_lt_caught_CXX_error" != yes; then solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. + # but understands '-z linker_flag'. # Supported since Solaris 2.6 (maybe 2.5.1?) _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; @@ -6755,42 +7326,42 @@ if test "$_lt_caught_CXX_error" != yes; then ;; gcx*) # Green Hills C++ Compiler - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' # The C++ compiler must be used to create the archive. _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' ;; *) # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' + if test yes,no = "$GXX,$with_gnu_ld"; then + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' else - # g++ 2.7 appears to require `-G' NOT `-shared' on this + # g++ 2.7 appears to require '-G' NOT '-shared' on this # platform. - _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir' case $host_os in solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' ;; esac fi @@ -6799,52 +7370,52 @@ if test "$_lt_caught_CXX_error" != yes; then ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no runpath_var='LD_RUN_PATH' case $cc_basename in CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; esac ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport' runpath_var='LD_RUN_PATH' case $cc_basename in CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ - '"$_LT_TAGVAR(old_archive_cmds, $1)" + '"$_LT_TAGVAR(old_archive_cmds, $1)" _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ - '"$_LT_TAGVAR(reload_cmds, $1)" + '"$_LT_TAGVAR(reload_cmds, $1)" ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; esac ;; @@ -6875,10 +7446,10 @@ if test "$_lt_caught_CXX_error" != yes; then esac AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) - test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no - _LT_TAGVAR(GCC, $1)="$GXX" - _LT_TAGVAR(LD, $1)="$LD" + _LT_TAGVAR(GCC, $1)=$GXX + _LT_TAGVAR(LD, $1)=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -6905,7 +7476,7 @@ if test "$_lt_caught_CXX_error" != yes; then lt_cv_path_LD=$lt_save_path_LD lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -fi # test "$_lt_caught_CXX_error" != yes +fi # test yes != "$_lt_caught_CXX_error" AC_LANG_POP ])# _LT_LANG_CXX_CONFIG @@ -6927,13 +7498,14 @@ AC_REQUIRE([_LT_DECL_SED]) AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) func_stripname_cnf () { - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + case @S|@2 in + .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;; + *) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;; esac } # func_stripname_cnf ])# _LT_FUNC_STRIPNAME_CNF + # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) # --------------------------------- # Figure out "hidden" library dependencies from verbose @@ -7017,13 +7589,13 @@ if AC_TRY_EVAL(ac_compile); then pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do - case ${prev}${p} in + case $prev$p in -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. # Remove the space. - if test $p = "-L" || - test $p = "-R"; then + if test x-L = "$p" || + test x-R = "$p"; then prev=$p continue fi @@ -7039,16 +7611,16 @@ if AC_TRY_EVAL(ac_compile); then case $p in =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; esac - if test "$pre_test_object_deps_done" = no; then - case ${prev} in + if test no = "$pre_test_object_deps_done"; then + case $prev in -L | -R) # Internal compiler library paths should come after those # provided the user. The postdeps already come after the # user supplied libs so there is no need to process them. if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then - _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" + _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p else - _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" + _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p" fi ;; # The "-l" case would never come before the object being @@ -7056,9 +7628,9 @@ if AC_TRY_EVAL(ac_compile); then esac else if test -z "$_LT_TAGVAR(postdeps, $1)"; then - _LT_TAGVAR(postdeps, $1)="${prev}${p}" + _LT_TAGVAR(postdeps, $1)=$prev$p else - _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" + _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p" fi fi prev= @@ -7073,15 +7645,15 @@ if AC_TRY_EVAL(ac_compile); then continue fi - if test "$pre_test_object_deps_done" = no; then + if test no = "$pre_test_object_deps_done"; then if test -z "$_LT_TAGVAR(predep_objects, $1)"; then - _LT_TAGVAR(predep_objects, $1)="$p" + _LT_TAGVAR(predep_objects, $1)=$p else _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" fi else if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then - _LT_TAGVAR(postdep_objects, $1)="$p" + _LT_TAGVAR(postdep_objects, $1)=$p else _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" fi @@ -7112,51 +7684,6 @@ interix[[3-9]]*) _LT_TAGVAR(postdep_objects,$1)= _LT_TAGVAR(postdeps,$1)= ;; - -linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; - -solaris*) - case $cc_basename in - CC* | sunCC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; esac ]) @@ -7165,7 +7692,7 @@ case " $_LT_TAGVAR(postdeps, $1) " in esac _LT_TAGVAR(compiler_lib_search_dirs, $1)= if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then - _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` + _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'` fi _LT_TAGDECL([], [compiler_lib_search_dirs], [1], [The directories searched by this compiler when creating a shared library]) @@ -7185,10 +7712,10 @@ _LT_TAGDECL([], [compiler_lib_search_path], [1], # -------------------------- # Ensure that the configuration variables for a Fortran 77 compiler are # suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_F77_CONFIG], [AC_LANG_PUSH(Fortran 77) -if test -z "$F77" || test "X$F77" = "Xno"; then +if test -z "$F77" || test no = "$F77"; then _lt_disable_F77=yes fi @@ -7225,7 +7752,7 @@ _LT_TAGVAR(objext, $1)=$objext # the F77 compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_F77" != yes; then +if test yes != "$_lt_disable_F77"; then # Code to be used in simple compile tests lt_simple_compile_test_code="\ subroutine t @@ -7247,7 +7774,7 @@ if test "$_lt_disable_F77" != yes; then _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. - lt_save_CC="$CC" + lt_save_CC=$CC lt_save_GCC=$GCC lt_save_CFLAGS=$CFLAGS CC=${F77-"f77"} @@ -7261,21 +7788,25 @@ if test "$_lt_disable_F77" != yes; then AC_MSG_RESULT([$can_build_shared]) AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' fi ;; aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -7283,11 +7814,11 @@ if test "$_lt_disable_F77" != yes; then AC_MSG_CHECKING([whether to build static libraries]) # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes AC_MSG_RESULT([$enable_static]) - _LT_TAGVAR(GCC, $1)="$G77" - _LT_TAGVAR(LD, $1)="$LD" + _LT_TAGVAR(GCC, $1)=$G77 + _LT_TAGVAR(LD, $1)=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -7304,9 +7835,9 @@ if test "$_lt_disable_F77" != yes; then fi # test -n "$compiler" GCC=$lt_save_GCC - CC="$lt_save_CC" - CFLAGS="$lt_save_CFLAGS" -fi # test "$_lt_disable_F77" != yes + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS +fi # test yes != "$_lt_disable_F77" AC_LANG_POP ])# _LT_LANG_F77_CONFIG @@ -7316,11 +7847,11 @@ AC_LANG_POP # ------------------------- # Ensure that the configuration variables for a Fortran compiler are # suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_FC_CONFIG], [AC_LANG_PUSH(Fortran) -if test -z "$FC" || test "X$FC" = "Xno"; then +if test -z "$FC" || test no = "$FC"; then _lt_disable_FC=yes fi @@ -7357,7 +7888,7 @@ _LT_TAGVAR(objext, $1)=$objext # the FC compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_FC" != yes; then +if test yes != "$_lt_disable_FC"; then # Code to be used in simple compile tests lt_simple_compile_test_code="\ subroutine t @@ -7379,7 +7910,7 @@ if test "$_lt_disable_FC" != yes; then _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. - lt_save_CC="$CC" + lt_save_CC=$CC lt_save_GCC=$GCC lt_save_CFLAGS=$CFLAGS CC=${FC-"f95"} @@ -7395,21 +7926,25 @@ if test "$_lt_disable_FC" != yes; then AC_MSG_RESULT([$can_build_shared]) AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' fi ;; aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -7417,11 +7952,11 @@ if test "$_lt_disable_FC" != yes; then AC_MSG_CHECKING([whether to build static libraries]) # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes AC_MSG_RESULT([$enable_static]) - _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" - _LT_TAGVAR(LD, $1)="$LD" + _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu + _LT_TAGVAR(LD, $1)=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -7441,7 +7976,7 @@ if test "$_lt_disable_FC" != yes; then GCC=$lt_save_GCC CC=$lt_save_CC CFLAGS=$lt_save_CFLAGS -fi # test "$_lt_disable_FC" != yes +fi # test yes != "$_lt_disable_FC" AC_LANG_POP ])# _LT_LANG_FC_CONFIG @@ -7451,7 +7986,7 @@ AC_LANG_POP # -------------------------- # Ensure that the configuration variables for the GNU Java Compiler compiler # are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_GCJ_CONFIG], [AC_REQUIRE([LT_PROG_GCJ])dnl AC_LANG_SAVE @@ -7485,7 +8020,7 @@ CC=${GCJ-"gcj"} CFLAGS=$GCJFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" +_LT_TAGVAR(LD, $1)=$LD _LT_CC_BASENAME([$compiler]) # GCJ did not exist at the time GCC didn't implicitly link libc in. @@ -7518,7 +8053,7 @@ CFLAGS=$lt_save_CFLAGS # -------------------------- # Ensure that the configuration variables for the GNU Go compiler # are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_GO_CONFIG], [AC_REQUIRE([LT_PROG_GO])dnl AC_LANG_SAVE @@ -7552,7 +8087,7 @@ CC=${GOC-"gccgo"} CFLAGS=$GOFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" +_LT_TAGVAR(LD, $1)=$LD _LT_CC_BASENAME([$compiler]) # Go did not exist at the time GCC didn't implicitly link libc in. @@ -7585,7 +8120,7 @@ CFLAGS=$lt_save_CFLAGS # ------------------------- # Ensure that the configuration variables for the Windows resource compiler # are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_RC_CONFIG], [AC_REQUIRE([LT_PROG_RC])dnl AC_LANG_SAVE @@ -7601,7 +8136,7 @@ _LT_TAGVAR(objext, $1)=$objext lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' # Code to be used in simple link tests -lt_simple_link_test_code="$lt_simple_compile_test_code" +lt_simple_link_test_code=$lt_simple_compile_test_code # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_TAG_COMPILER @@ -7611,7 +8146,7 @@ _LT_COMPILER_BOILERPLATE _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. -lt_save_CC="$CC" +lt_save_CC=$CC lt_save_CFLAGS=$CFLAGS lt_save_GCC=$GCC GCC= @@ -7640,7 +8175,7 @@ AC_DEFUN([LT_PROG_GCJ], [m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], [AC_CHECK_TOOL(GCJ, gcj,) - test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" + test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2" AC_SUBST(GCJFLAGS)])])[]dnl ]) @@ -7706,6 +8241,14 @@ _LT_DECL([], [DLLTOOL], [1], [DLL creation program]) AC_SUBST([DLLTOOL]) ]) +# _LT_DECL_FILECMD +# ---------------- +# Check for a file(cmd) program that can be used to detect file type and magic +m4_defun([_LT_DECL_FILECMD], +[AC_CHECK_TOOL([FILECMD], [file], [:]) +_LT_DECL([], [FILECMD], [1], [A file(cmd) program that detects file types]) +])# _LD_DECL_FILECMD + # _LT_DECL_SED # ------------ # Check for a fully-functional sed program, that truncates @@ -7749,7 +8292,7 @@ lt_ac_count=0 # Add /usr/xpg4/bin/sed as it is typically found on Solaris # along with /bin/sed that truncates output. for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && continue + test ! -f "$lt_ac_sed" && continue cat /dev/null > conftest.in lt_ac_count=0 echo $ECHO_N "0123456789$ECHO_C" >conftest.in @@ -7766,9 +8309,9 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break cmp -s conftest.out conftest.nl || break # 10000 chars as input seems more than enough - test $lt_ac_count -gt 10 && break + test 10 -lt "$lt_ac_count" && break lt_ac_count=`expr $lt_ac_count + 1` - if test $lt_ac_count -gt $lt_ac_max; then + if test "$lt_ac_count" -gt "$lt_ac_max"; then lt_ac_max=$lt_ac_count lt_cv_path_SED=$lt_ac_sed fi @@ -7792,27 +8335,7 @@ dnl AC_DEFUN([LT_AC_PROG_SED], []) # Find out whether the shell is Bourne or XSI compatible, # or has some other useful features. m4_defun([_LT_CHECK_SHELL_FEATURES], -[AC_MSG_CHECKING([whether the shell understands some XSI constructs]) -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -AC_MSG_RESULT([$xsi_shell]) -_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell']) - -AC_MSG_CHECKING([whether the shell understands "+="]) -lt_shell_append=no -( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -AC_MSG_RESULT([$lt_shell_append]) -_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append']) - -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then lt_unset=unset else lt_unset=false @@ -7836,102 +8359,9 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl ])# _LT_CHECK_SHELL_FEATURES -# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) -# ------------------------------------------------------ -# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and -# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. -m4_defun([_LT_PROG_FUNCTION_REPLACE], -[dnl { -sed -e '/^$1 ()$/,/^} # $1 /c\ -$1 ()\ -{\ -m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) -} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: -]) - - -# _LT_PROG_REPLACE_SHELLFNS -# ------------------------- -# Replace existing portable implementations of several shell functions with -# equivalent extended shell implementations where those features are available.. -m4_defun([_LT_PROG_REPLACE_SHELLFNS], -[if test x"$xsi_shell" = xyes; then - _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac]) - - _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl - func_basename_result="${1##*/}"]) - - _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}"]) - - _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are - # positional parameters, so assign one to ordinary parameter first. - func_stripname_result=${3} - func_stripname_result=${func_stripname_result#"${1}"} - func_stripname_result=${func_stripname_result%"${2}"}]) - - _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl - func_split_long_opt_name=${1%%=*} - func_split_long_opt_arg=${1#*=}]) - - _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl - func_split_short_opt_arg=${1#??} - func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) - - _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac]) - - _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) - - _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) - - _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) -fi - -if test x"$lt_shell_append" = xyes; then - _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) - - _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl - func_quote_for_eval "${2}" -dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ - eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) - - # Save a `func_append' function call where possible by direct use of '+=' - sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -else - # Save a `func_append' function call even when '+=' is not available - sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -fi - -if test x"$_lt_function_replace_fail" = x":"; then - AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) -fi -]) - # _LT_PATH_CONVERSION_FUNCTIONS # ----------------------------- -# Determine which file name conversion functions should be used by +# Determine what file name conversion functions should be used by # func_to_host_file (and, implicitly, by func_to_host_path). These are needed # for certain cross-compile configurations and native mingw. m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], @@ -7998,15 +8428,15 @@ _LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], # Helper functions for option handling. -*- Autoconf -*- # -# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 2004-2005, 2007-2009, 2011-2019, 2021-2022 Free +# Software Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 7 ltoptions.m4 +# serial 8 ltoptions.m4 # This is to help aclocal find these macros, as it can't see m4_define. AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) @@ -8027,7 +8457,7 @@ m4_define([_LT_SET_OPTION], [m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), _LT_MANGLE_DEFUN([$1], [$2]), - [m4_warning([Unknown $1 option `$2'])])[]dnl + [m4_warning([Unknown $1 option '$2'])])[]dnl ]) @@ -8073,13 +8503,15 @@ m4_if([$1],[LT_INIT],[ dnl dnl If no reference was made to various pairs of opposing options, then dnl we run the default mode handler for the pair. For example, if neither - dnl `shared' nor `disable-shared' was passed, we enable building of shared + dnl 'shared' nor 'disable-shared' was passed, we enable building of shared dnl archives by default: _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], - [_LT_ENABLE_FAST_INSTALL]) + [_LT_ENABLE_FAST_INSTALL]) + _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4], + [_LT_WITH_AIX_SONAME([aix])]) ]) ])# _LT_SET_OPTIONS @@ -8107,7 +8539,7 @@ AU_DEFUN([AC_LIBTOOL_DLOPEN], [_LT_SET_OPTION([LT_INIT], [dlopen]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `dlopen' option into LT_INIT's first parameter.]) +put the 'dlopen' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -8143,7 +8575,7 @@ AU_DEFUN([AC_LIBTOOL_WIN32_DLL], _LT_SET_OPTION([LT_INIT], [win32-dll]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `win32-dll' option into LT_INIT's first parameter.]) +put the 'win32-dll' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -8152,9 +8584,9 @@ dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], []) # _LT_ENABLE_SHARED([DEFAULT]) # ---------------------------- -# implement the --enable-shared flag, and supports the `shared' and -# `disable-shared' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-shared flag, and supports the 'shared' and +# 'disable-shared' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. m4_define([_LT_ENABLE_SHARED], [m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([shared], @@ -8167,14 +8599,14 @@ AC_ARG_ENABLE([shared], *) enable_shared=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_shared=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) @@ -8206,9 +8638,9 @@ dnl AC_DEFUN([AM_DISABLE_SHARED], []) # _LT_ENABLE_STATIC([DEFAULT]) # ---------------------------- -# implement the --enable-static flag, and support the `static' and -# `disable-static' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-static flag, and support the 'static' and +# 'disable-static' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. m4_define([_LT_ENABLE_STATIC], [m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([static], @@ -8221,14 +8653,14 @@ AC_ARG_ENABLE([static], *) enable_static=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_static=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_static=]_LT_ENABLE_STATIC_DEFAULT) @@ -8260,9 +8692,9 @@ dnl AC_DEFUN([AM_DISABLE_STATIC], []) # _LT_ENABLE_FAST_INSTALL([DEFAULT]) # ---------------------------------- -# implement the --enable-fast-install flag, and support the `fast-install' -# and `disable-fast-install' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-fast-install flag, and support the 'fast-install' +# and 'disable-fast-install' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. m4_define([_LT_ENABLE_FAST_INSTALL], [m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([fast-install], @@ -8275,14 +8707,14 @@ AC_ARG_ENABLE([fast-install], *) enable_fast_install=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_fast_install=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) @@ -8299,14 +8731,14 @@ AU_DEFUN([AC_ENABLE_FAST_INSTALL], [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `fast-install' option into LT_INIT's first parameter.]) +the 'fast-install' option into LT_INIT's first parameter.]) ]) AU_DEFUN([AC_DISABLE_FAST_INSTALL], [_LT_SET_OPTION([LT_INIT], [disable-fast-install]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `disable-fast-install' option into LT_INIT's first parameter.]) +the 'disable-fast-install' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -8314,11 +8746,64 @@ dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], []) dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) +# _LT_WITH_AIX_SONAME([DEFAULT]) +# ---------------------------------- +# implement the --with-aix-soname flag, and support the `aix-soname=aix' +# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT +# is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'. +m4_define([_LT_WITH_AIX_SONAME], +[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl +shared_archive_member_spec= +case $host,$enable_shared in +power*-*-aix[[5-9]]*,yes) + AC_MSG_CHECKING([which variant of shared library versioning to provide]) + AC_ARG_WITH([aix-soname], + [AS_HELP_STRING([--with-aix-soname=aix|svr4|both], + [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])], + [case $withval in + aix|svr4|both) + ;; + *) + AC_MSG_ERROR([Unknown argument to --with-aix-soname]) + ;; + esac + lt_cv_with_aix_soname=$with_aix_soname], + [AC_CACHE_VAL([lt_cv_with_aix_soname], + [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT) + with_aix_soname=$lt_cv_with_aix_soname]) + AC_MSG_RESULT([$with_aix_soname]) + if test aix != "$with_aix_soname"; then + # For the AIX way of multilib, we name the shared archive member + # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', + # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File. + # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag, + # the AIX toolchain works better with OBJECT_MODE set (default 32). + if test 64 = "${OBJECT_MODE-32}"; then + shared_archive_member_spec=shr_64 + else + shared_archive_member_spec=shr + fi + fi + ;; +*) + with_aix_soname=aix + ;; +esac + +_LT_DECL([], [shared_archive_member_spec], [0], + [Shared archive member basename, for filename based shared library versioning on AIX])dnl +])# _LT_WITH_AIX_SONAME + +LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])]) +LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])]) +LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])]) + + # _LT_WITH_PIC([MODE]) # -------------------- -# implement the --with-pic flag, and support the `pic-only' and `no-pic' +# implement the --with-pic flag, and support the 'pic-only' and 'no-pic' # LT_INIT options. -# MODE is either `yes' or `no'. If omitted, it defaults to `both'. +# MODE is either 'yes' or 'no'. If omitted, it defaults to 'both'. m4_define([_LT_WITH_PIC], [AC_ARG_WITH([pic], [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], @@ -8329,19 +8814,17 @@ m4_define([_LT_WITH_PIC], *) pic_mode=default # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for lt_pkg in $withval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$lt_pkg" = "X$lt_p"; then pic_mode=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], - [pic_mode=default]) - -test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) + [pic_mode=m4_default([$1], [default])]) _LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl ])# _LT_WITH_PIC @@ -8354,7 +8837,7 @@ AU_DEFUN([AC_LIBTOOL_PICMODE], [_LT_SET_OPTION([LT_INIT], [pic-only]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `pic-only' option into LT_INIT's first parameter.]) +put the 'pic-only' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -8377,7 +8860,8 @@ LT_OPTION_DEFINE([LTDL_INIT], [convenience], # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2004-2005, 2007-2008, 2011-2019, 2021-2022 Free Software +# Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives @@ -8410,7 +8894,7 @@ m4_define([_lt_join], # ------------ # Manipulate m4 lists. # These macros are necessary as long as will still need to support -# Autoconf-2.59 which quotes differently. +# Autoconf-2.59, which quotes differently. m4_define([lt_car], [[$1]]) m4_define([lt_cdr], [m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], @@ -8421,7 +8905,7 @@ m4_define([lt_unquote], $1) # lt_append(MACRO-NAME, STRING, [SEPARATOR]) # ------------------------------------------ -# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. +# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'. # Note that neither SEPARATOR nor STRING are expanded; they are appended # to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). # No SEPARATOR is output if MACRO-NAME was previously undefined (different @@ -8501,7 +8985,8 @@ m4_define([lt_dict_filter], # ltversion.m4 -- version numbers -*- Autoconf -*- # -# Copyright (C) 2004 Free Software Foundation, Inc. +# Copyright (C) 2004, 2011-2019, 2021-2022 Free Software Foundation, +# Inc. # Written by Scott James Remnant, 2004 # # This file is free software; the Free Software Foundation gives @@ -8510,22 +8995,23 @@ m4_define([lt_dict_filter], # @configure_input@ -# serial 3337 ltversion.m4 +# serial 4245 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4.2]) -m4_define([LT_PACKAGE_REVISION], [1.3337]) +m4_define([LT_PACKAGE_VERSION], [2.4.7]) +m4_define([LT_PACKAGE_REVISION], [2.4.7]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.2' -macro_revision='1.3337' +[macro_version='2.4.7' +macro_revision='2.4.7' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. +# Copyright (C) 2004-2005, 2007, 2009, 2011-2019, 2021-2022 Free +# Software Foundation, Inc. # Written by Scott James Remnant, 2004. # # This file is free software; the Free Software Foundation gives @@ -8536,7 +9022,7 @@ _LT_DECL(, macro_revision, 0) # These exist entirely to fool aclocal when bootstrapping libtool. # -# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) +# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN), # which have later been changed to m4_define as they aren't part of the # exported API, or moved to Autoconf or Automake where they belong. # @@ -8550,7 +9036,7 @@ _LT_DECL(, macro_revision, 0) # included after everything else. This provides aclocal with the # AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything # because those macros already exist, or will be overwritten later. -# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. +# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. # # Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. # Yes, that means every name once taken will need to remain here until @@ -8622,9 +9108,9 @@ m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) -dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -dnl serial 11 (pkg-config-0.29) -dnl +# pkg.m4 - Macros to locate and use pkg-config. -*- Autoconf -*- +# serial 12 (pkg-config-0.29.2) + dnl Copyright © 2004 Scott James Remnant . dnl Copyright © 2012-2015 Dan Nicholson dnl @@ -8665,7 +9151,7 @@ dnl dnl See the "Since" comment for each macro you use to see what version dnl of the macros you require. m4_defun([PKG_PREREQ], -[m4_define([PKG_MACROS_VERSION], [0.29]) +[m4_define([PKG_MACROS_VERSION], [0.29.2]) m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) ])dnl PKG_PREREQ @@ -8710,7 +9196,7 @@ dnl Check to see whether a particular set of modules exists. Similar to dnl PKG_CHECK_MODULES(), but does not set variables or print errors. dnl dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -dnl only at the first occurence in configure.ac, so if the first place +dnl only at the first occurrence in configure.ac, so if the first place dnl it's called might be skipped (such as if it is within an "if", you dnl have to call PKG_CHECK_EXISTS manually AC_DEFUN([PKG_CHECK_EXISTS], @@ -8766,7 +9252,7 @@ AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl pkg_failed=no -AC_MSG_CHECKING([for $1]) +AC_MSG_CHECKING([for $2]) _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) _PKG_CONFIG([$1][_LIBS], [libs], [$2]) @@ -8776,17 +9262,17 @@ and $1[]_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details.]) if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - m4_default([$4], [AC_MSG_ERROR( + m4_default([$4], [AC_MSG_ERROR( [Package requirements ($2) were not met: $$1_PKG_ERRORS @@ -8797,8 +9283,8 @@ installed software in a non-standard prefix. _PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) - m4_default([$4], [AC_MSG_FAILURE( + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -8808,10 +9294,10 @@ _PKG_TEXT To get pkg-config, see .])[]dnl ]) else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS AC_MSG_RESULT([yes]) - $3 + $3 fi[]dnl ])dnl PKG_CHECK_MODULES @@ -8898,6 +9384,74 @@ AS_VAR_COPY([$1], [pkg_cv_][$1]) AS_VAR_IF([$1], [""], [$5], [$4])dnl ])dnl PKG_CHECK_VAR +dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES, +dnl [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND], +dnl [DESCRIPTION], [DEFAULT]) +dnl ------------------------------------------ +dnl +dnl Prepare a "--with-" configure option using the lowercase +dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and +dnl PKG_CHECK_MODULES in a single macro. +AC_DEFUN([PKG_WITH_MODULES], +[ +m4_pushdef([with_arg], m4_tolower([$1])) + +m4_pushdef([description], + [m4_default([$5], [build with ]with_arg[ support])]) + +m4_pushdef([def_arg], [m4_default([$6], [auto])]) +m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes]) +m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no]) + +m4_case(def_arg, + [yes],[m4_pushdef([with_without], [--without-]with_arg)], + [m4_pushdef([with_without],[--with-]with_arg)]) + +AC_ARG_WITH(with_arg, + AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),, + [AS_TR_SH([with_]with_arg)=def_arg]) + +AS_CASE([$AS_TR_SH([with_]with_arg)], + [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)], + [auto],[PKG_CHECK_MODULES([$1],[$2], + [m4_n([def_action_if_found]) $3], + [m4_n([def_action_if_not_found]) $4])]) + +m4_popdef([with_arg]) +m4_popdef([description]) +m4_popdef([def_arg]) + +])dnl PKG_WITH_MODULES + +dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES, +dnl [DESCRIPTION], [DEFAULT]) +dnl ----------------------------------------------- +dnl +dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES +dnl check._[VARIABLE-PREFIX] is exported as make variable. +AC_DEFUN([PKG_HAVE_WITH_MODULES], +[ +PKG_WITH_MODULES([$1],[$2],,,[$3],[$4]) + +AM_CONDITIONAL([HAVE_][$1], + [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"]) +])dnl PKG_HAVE_WITH_MODULES + +dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES, +dnl [DESCRIPTION], [DEFAULT]) +dnl ------------------------------------------------------ +dnl +dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after +dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make +dnl and preprocessor variable. +AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES], +[ +PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4]) + +AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"], + [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])]) +])dnl PKG_HAVE_DEFINE_WITH_MODULES + # Copyright (C) 2002-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation diff --git a/libratbox/configure b/libratbox/configure index b8240b19..daa3aaa1 100755 --- a/libratbox/configure +++ b/libratbox/configure @@ -2,6 +2,7 @@ # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69 for libratbox devel. # +# # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # @@ -663,6 +664,7 @@ NEED_CRYPT_TRUE MINGW_FALSE MINGW_TRUE WARNFLAGS +LT_SYS_LIBRARY_PATH OTOOL64 OTOOL LIPO @@ -674,6 +676,7 @@ ac_ct_AR AR DLLTOOL OBJDUMP +FILECMD LN_S NM ac_ct_DUMPBIN @@ -762,7 +765,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -792,6 +794,7 @@ enable_shared enable_maintainer_mode with_pic enable_fast_install +with_aix_soname with_gnu_ld with_sysroot enable_libtool_lock @@ -814,6 +817,7 @@ LDFLAGS LIBS CPPFLAGS CPP +LT_SYS_LIBRARY_PATH PKG_CONFIG PKG_CONFIG_PATH PKG_CONFIG_LIBDIR @@ -859,7 +863,6 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1112,15 +1115,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1258,7 +1252,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1411,7 +1405,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1480,9 +1473,12 @@ Optional Packages: --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] + --with-aix-soname=aix|svr4|both + shared library versioning (aka "SONAME") variant to + provide on AIX, [default=aix]. --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sysroot=DIR Search for dependent libraries within DIR - (or the compiler's sysroot if not specified). + --with-sysroot[=DIR] Search for dependent libraries within DIR (or the + compiler's sysroot if not specified). --with-jemalloc enable jemalloc for memory allocations --with-tcmalloc-minimal enable minimal tcmalloc support for memory allocations @@ -1497,6 +1493,8 @@ Some influential environment variables: CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory CPP C preprocessor + LT_SYS_LIBRARY_PATH + User-defined run-time library search path. PKG_CONFIG path to pkg-config utility PKG_CONFIG_PATH directories to add to pkg-config's search path @@ -1582,7 +1580,6 @@ generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. - _ACEOF exit fi @@ -5110,14 +5107,14 @@ if test "${enable_static+set}" = set; then : *) enable_static=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_static=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -5141,14 +5138,14 @@ if test "${enable_shared+set}" = set; then : *) enable_shared=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_shared=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -5539,8 +5536,8 @@ esac -macro_version='2.4.2' -macro_revision='1.3337' +macro_version='2.4.7' +macro_revision='2.4.7' @@ -5554,7 +5551,7 @@ macro_revision='1.3337' -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh # Backslashify metacharacters that are still active within # double-quoted strings. @@ -5603,7 +5600,7 @@ func_echo_all () $ECHO "" } -case "$ECHO" in +case $ECHO in printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 $as_echo "printf" >&6; } ;; print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 @@ -5796,19 +5793,19 @@ test -z "$GREP" && GREP=grep # Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then : - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes + withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes else with_gnu_ld=no fi ac_prog=ld -if test "$GCC" = yes; then +if test yes = "$GCC"; then # Check if gcc -print-prog-name=ld gives a path. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 $as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw + # gcc leaves a trailing carriage return, which upsets mingw ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; @@ -5822,7 +5819,7 @@ $as_echo_n "checking for ld used by $CC... " >&6; } while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` done - test -z "$LD" && LD="$ac_prog" + test -z "$LD" && LD=$ac_prog ;; "") # If it fails, then pretend we aren't using GCC. @@ -5833,7 +5830,7 @@ $as_echo_n "checking for ld used by $CC... " >&6; } with_gnu_ld=unknown ;; esac -elif test "$with_gnu_ld" = yes; then +elif test yes = "$with_gnu_ld"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 $as_echo_n "checking for GNU ld... " >&6; } else @@ -5844,32 +5841,32 @@ if ${lt_cv_path_LD+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" + lt_cv_path_LD=$ac_dir/$ac_prog # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 &5 $as_echo "$LD" >&6; } @@ -5912,33 +5909,38 @@ if ${lt_cv_path_NM+:} false; then : else if test -n "$NM"; then # Let the user override the test. - lt_cv_path_NM="$NM" + lt_cv_path_NM=$NM else - lt_nm_to_check="${ac_tool_prefix}nm" + lt_nm_to_check=${ac_tool_prefix}nm if test -n "$ac_tool_prefix" && test "$build" = "$host"; then lt_nm_to_check="$lt_nm_to_check nm" fi for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + tmp_nm=$ac_dir/$lt_tmp_nm + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # Adding the 'sed 1q' prevents false positives on HP-UX, which says: # nm: unknown option "B" ignored # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) + # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty + case $build_os in + mingw*) lt_bad_file=conftest.nm/nofile ;; + *) lt_bad_file=/dev/null ;; + esac + case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in + *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" - break + break 2 ;; *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" - break + break 2 ;; *) lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but @@ -5949,15 +5951,15 @@ else esac fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs done : ${lt_cv_path_NM=no} fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 $as_echo "$lt_cv_path_NM" >&6; } -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" +if test no != "$lt_cv_path_NM"; then + NM=$lt_cv_path_NM else # Didn't find any BSD compatible name lister, look for dumpbin. if test -n "$DUMPBIN"; then : @@ -6063,9 +6065,9 @@ esac fi fi - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in *COFF*) - DUMPBIN="$DUMPBIN -symbols" + DUMPBIN="$DUMPBIN -symbols -headers" ;; *) DUMPBIN=: @@ -6073,8 +6075,8 @@ fi esac fi - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" + if test : != "$DUMPBIN"; then + NM=$DUMPBIN fi fi test -z "$NM" && NM=nm @@ -6125,7 +6127,7 @@ if ${lt_cv_sys_max_cmd_len+:} false; then : $as_echo_n "(cached) " >&6 else i=0 - teststring="ABCD" + teststring=ABCD case $build_os in msdosdjgpp*) @@ -6165,7 +6167,7 @@ else lt_cv_sys_max_cmd_len=8192; ;; - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -6208,7 +6210,7 @@ else sysv5* | sco5v6* | sysv4.2uw2*) kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` + lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*[ ]//'` else lt_cv_sys_max_cmd_len=32768 fi @@ -6216,22 +6218,22 @@ else *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` if test -n "$lt_cv_sys_max_cmd_len" && \ - test undefined != "$lt_cv_sys_max_cmd_len"; then + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else # Make teststring a little bigger before we do anything with it. # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do + for i in 1 2 3 4 5 6 7 8; do teststring=$teststring$teststring done SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + while { test X`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough + test 17 != "$i" # 1/2 MB should be enough do i=`expr $i + 1` teststring=$teststring$teststring @@ -6249,7 +6251,7 @@ else fi -if test -n $lt_cv_sys_max_cmd_len ; then +if test -n "$lt_cv_sys_max_cmd_len"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 $as_echo "$lt_cv_sys_max_cmd_len" >&6; } else @@ -6267,30 +6269,6 @@ max_cmd_len=$lt_cv_sys_max_cmd_len : ${MV="mv -f"} : ${RM="rm -f"} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 -$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 -$as_echo "$xsi_shell" >&6; } - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 -$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } -lt_shell_append=no -( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 -$as_echo "$lt_shell_append" >&6; } - - if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then lt_unset=unset else @@ -6413,13 +6391,13 @@ esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in cygwin* | mingw* | pw32* | cegcc*) - if test "$GCC" != yes; then + if test yes != "$GCC"; then reload_cmds=false fi ;; darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' + if test yes = "$GCC"; then + reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs' else reload_cmds='$LD$reload_flag -o $output$reload_objs' fi @@ -6434,6 +6412,104 @@ esac +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}file", so it can be a program name with args. +set dummy ${ac_tool_prefix}file; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_FILECMD+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$FILECMD"; then + ac_cv_prog_FILECMD="$FILECMD" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_FILECMD="${ac_tool_prefix}file" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +FILECMD=$ac_cv_prog_FILECMD +if test -n "$FILECMD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FILECMD" >&5 +$as_echo "$FILECMD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_FILECMD"; then + ac_ct_FILECMD=$FILECMD + # Extract the first word of "file", so it can be a program name with args. +set dummy file; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_FILECMD+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_FILECMD"; then + ac_cv_prog_ac_ct_FILECMD="$ac_ct_FILECMD" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_FILECMD="file" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_FILECMD=$ac_cv_prog_ac_ct_FILECMD +if test -n "$ac_ct_FILECMD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_FILECMD" >&5 +$as_echo "$ac_ct_FILECMD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_FILECMD" = x; then + FILECMD=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + FILECMD=$ac_ct_FILECMD + fi +else + FILECMD="$ac_cv_prog_FILECMD" +fi + + + + + + + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 @@ -6547,13 +6623,13 @@ lt_cv_deplibs_check_method='unknown' # Need to set the preceding variable on all platforms that support # interlibrary dependencies. # 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. +# 'unknown' -- same as none, but documents that we really don't know. # 'pass_all' -- all dependencies passed with no checks. # 'test_compile' -- check by making test program. # 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given extended regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. +# that responds to the $file_magic_cmd with a given extended regex. +# If you have 'file' or equivalent on your system and you're not sure +# whether 'pass_all' will *always* work, you probably want this one. case $host_os in aix[4-9]*) @@ -6566,7 +6642,7 @@ beos*) bsdi[45]*) lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_cmd='$FILECMD -L' lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -6580,8 +6656,7 @@ mingw* | pw32*) # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. - if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then + if ( file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -6601,14 +6676,14 @@ darwin* | rhapsody*) lt_cv_deplibs_check_method=pass_all ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; esac @@ -6622,7 +6697,7 @@ haiku*) ;; hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD case $host_cpu in ia64*) lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' @@ -6669,7 +6744,7 @@ netbsd* | netbsdelf*-gnu) newos6*) lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; @@ -6677,8 +6752,8 @@ newos6*) lt_cv_deplibs_check_method=pass_all ;; -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +openbsd* | bitrig*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' else lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' @@ -6731,6 +6806,9 @@ sysv4 | sysv4.3*) tpf*) lt_cv_deplibs_check_method=pass_all ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; esac fi @@ -6888,8 +6966,8 @@ else case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL + # two different shell functions defined in ltmain.sh; + # decide which one to use based on capabilities of $DLLTOOL case `$DLLTOOL --help 2>&1` in *--identify-strict*) lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib @@ -6901,7 +6979,7 @@ cygwin* | mingw* | pw32* | cegcc*) ;; *) # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" + lt_cv_sharedlib_from_linklib_cmd=$ECHO ;; esac @@ -7018,13 +7096,29 @@ esac fi : ${AR=ar} -: ${AR_FLAGS=cru} +# Use ARFLAGS variable as AR's operation code to sync the variable naming with +# Automake. If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have +# higher priority because thats what people were doing historically (setting +# ARFLAGS for automake and AR_FLAGS for libtool). FIXME: Make the AR_FLAGS +# variable obsoleted/removed. + +test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr} +lt_ar_flags=$AR_FLAGS + + + + + + +# Make AR_FLAGS overridable by 'make ARFLAGS='. Don't try to run-time override +# by AR_FLAGS because that was never working and AR_FLAGS is about to die. + @@ -7055,7 +7149,7 @@ if ac_fn_c_try_compile "$LINENO"; then : ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } - if test "$ac_status" -eq 0; then + if test 0 -eq "$ac_status"; then # Ensure the archiver fails upon bogus file names. rm -f conftest.$ac_objext libconftest.a { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 @@ -7063,7 +7157,7 @@ if ac_fn_c_try_compile "$LINENO"; then : ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } - if test "$ac_status" -ne 0; then + if test 0 -ne "$ac_status"; then lt_cv_ar_at_file=@ fi fi @@ -7076,7 +7170,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 $as_echo "$lt_cv_ar_at_file" >&6; } -if test "x$lt_cv_ar_at_file" = xno; then +if test no = "$lt_cv_ar_at_file"; then archiver_list_spec= else archiver_list_spec=$lt_cv_ar_at_file @@ -7293,7 +7387,7 @@ old_postuninstall_cmds= if test -n "$RANLIB"; then case $host_os in - openbsd*) + bitrig* | openbsd*) old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) @@ -7383,7 +7477,7 @@ cygwin* | mingw* | pw32* | cegcc*) symcode='[ABCDGISTW]' ;; hpux*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then symcode='[ABCDEGRST]' fi ;; @@ -7416,14 +7510,44 @@ case `$NM -V 2>&1` in symcode='[ABCDGIRSTW]' ;; esac +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Gets list of data symbols to import. + lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \(.*\)$/\1/p'" + # Adjust the below global symbol transforms to fixup imported variables. + lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" + lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" + lt_c_name_lib_hook="\ + -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ + -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" +else + # Disable hooks by default. + lt_cv_sys_global_symbol_to_import= + lt_cdecl_hook= + lt_c_name_hook= + lt_c_name_lib_hook= +fi + # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +lt_cv_sys_global_symbol_to_cdecl="$SED -n"\ +$lt_cdecl_hook\ +" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\ +$lt_c_name_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" + +# Transform an extracted symbol line into symbol name with lib prefix and +# symbol address. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\ +$lt_c_name_lib_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -7441,26 +7565,29 @@ for ac_symprfx in "" "_"; do # Write the raw and C identifiers. if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. - # Also find C++ and __fastcall symbols from MSVC++, + # Fake it for dumpbin and say T for any non-static function, + # D for any global variable and I for any imported variable. + # Also find C++ and __fastcall symbols from MSVC++ or ICC, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ +" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ +" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ " {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ +" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ +" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx" else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + lt_cv_sys_global_symbol_pipe="$SED -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | $SED '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -7486,11 +7613,8 @@ _LT_EOF test $ac_status = 0; }; then # Now try to grab the symbols. nlist=conftest.nm - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 - (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s "$nlist"; then + $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&5 + if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&5 && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -7503,11 +7627,11 @@ _LT_EOF if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT_DLSYM_CONST -#elif defined(__osf__) +#elif defined __osf__ /* This system does not cope well with relocations in const data. */ # define LT_DLSYM_CONST #else @@ -7533,7 +7657,7 @@ lt__PROGRAM__LTX_preloaded_symbols[] = { { "@PROGRAM@", (void *) 0 }, _LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext cat <<\_LT_EOF >> conftest.$ac_ext {0, (void *) 0} }; @@ -7553,13 +7677,13 @@ _LT_EOF mv conftest.$ac_objext conftstm.$ac_objext lt_globsym_save_LIBS=$LIBS lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" + LIBS=conftstm.$ac_objext CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext}; then + test $ac_status = 0; } && test -s conftest$ac_exeext; then pipe_works=yes fi LIBS=$lt_globsym_save_LIBS @@ -7580,7 +7704,7 @@ _LT_EOF rm -rf conftest* conftst* # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then + if test yes = "$pipe_works"; then break else lt_cv_sys_global_symbol_pipe= @@ -7622,6 +7746,16 @@ fi + + + + + + + + + + @@ -7645,20 +7779,20 @@ fi lt_sysroot= -case ${with_sysroot} in #( +case $with_sysroot in #( yes) - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_sysroot=`$CC --print-sysroot 2>/dev/null` fi ;; #( /*) - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"` ;; #( no|'') ;; #( *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 -$as_echo "${with_sysroot}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5 +$as_echo "$with_sysroot" >&6; } as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac @@ -7670,45 +7804,127 @@ $as_echo "${lt_sysroot:-no}" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5 +$as_echo_n "checking for a working dd... " >&6; } +if ${ac_cv_path_lt_DD+:} false; then : + $as_echo_n "(cached) " >&6 +else + printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +: ${lt_DD:=$DD} +if test -z "$lt_DD"; then + ac_path_lt_DD_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in dd; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_lt_DD" || continue +if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=: +fi + $ac_path_lt_DD_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_lt_DD"; then + : + fi +else + ac_cv_path_lt_DD=$lt_DD +fi + +rm -f conftest.i conftest2.i conftest.out +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5 +$as_echo "$ac_cv_path_lt_DD" >&6; } + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5 +$as_echo_n "checking how to truncate binary pipes... " >&6; } +if ${lt_cv_truncate_bin+:} false; then : + $as_echo_n "(cached) " >&6 +else + printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +lt_cv_truncate_bin= +if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" +fi +rm -f conftest.i conftest2.i conftest.out +test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5 +$as_echo "$lt_cv_truncate_bin" >&6; } + + + + + + + +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in $*""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} + # Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then : enableval=$enable_libtool_lock; fi -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +test no = "$enable_libtool_lock" || enable_libtool_lock=yes # Some flags need to be propagated to the compiler or linker for good # libtool support. case $host in ia64-*-hpux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set mode + # options accordingly. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *ELF-32*) - HPUX_IA64_MODE="32" + HPUX_IA64_MODE=32 ;; *ELF-64*) - HPUX_IA64_MODE="64" + HPUX_IA64_MODE=64 ;; esac fi rm -rf conftest* ;; *-*-irix6*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo '#line '$LINENO' "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - if test "$lt_cv_prog_gnu_ld" = yes; then - case `/usr/bin/file conftest.$ac_objext` in + if test yes = "$lt_cv_prog_gnu_ld"; then + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" ;; @@ -7720,7 +7936,7 @@ ia64-*-hpux*) ;; esac else - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" ;; @@ -7736,23 +7952,64 @@ ia64-*-hpux*) rm -rf conftest* ;; +mips64*-*linux*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo '#line '$LINENO' "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + emul=elf + case `$FILECMD conftest.$ac_objext` in + *32-bit*) + emul="${emul}32" + ;; + *64-bit*) + emul="${emul}64" + ;; + esac + case `$FILECMD conftest.$ac_objext` in + *MSB*) + emul="${emul}btsmip" + ;; + *LSB*) + emul="${emul}ltsmip" + ;; + esac + case `$FILECMD conftest.$ac_objext` in + *N32*) + emul="${emul}n32" + ;; + esac + LD="${LD-ld} -m $emul" + fi + rm -rf conftest* + ;; + x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. Note that the listed cases only cover the + # situations where additional linker options are needed (such as when + # doing 32-bit compilation for a host where ld defaults to 64-bit, or + # vice versa); the common cases where no linker options are needed do + # not appear in the list. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *32-bit*) case $host in x86_64-*kfreebsd*-gnu) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *x86-64*) LD="${LD-ld} -m elf32_x86_64" ;; @@ -7761,10 +8018,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) ;; esac ;; - powerpc64le-*) + powerpc64le-*linux*) LD="${LD-ld} -m elf32lppclinux" ;; - powerpc64-*) + powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -7783,10 +8040,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - powerpcle-*) + powerpcle-*linux*) LD="${LD-ld} -m elf64lppc" ;; - powerpc-*) + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -7804,7 +8061,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) *-*-sco3.2v5*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" + SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -belf" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 $as_echo_n "checking whether the C compiler needs -belf... " >&6; } @@ -7844,25 +8101,26 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 $as_echo "$lt_cv_cc_needs_belf" >&6; } - if test x"$lt_cv_cc_needs_belf" != x"yes"; then + if test yes != "$lt_cv_cc_needs_belf"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" + CFLAGS=$SAVE_CFLAGS fi ;; *-*solaris*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in yes*) case $host in - i?86-*-solaris*) + i?86-*-solaris*|x86_64-*-solaris*) LD="${LD-ld} -m elf_x86_64" ;; sparc*-*-solaris*) @@ -7871,7 +8129,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; } esac # GNU ld 2.21 introduced _sol2 emulations. Use them if available. if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" + LD=${LD-ld}_sol2 fi ;; *) @@ -7887,7 +8145,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; } ;; esac -need_locks="$enable_libtool_lock" +need_locks=$enable_libtool_lock if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. @@ -7998,7 +8256,7 @@ else fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 $as_echo "$lt_cv_path_mainfest_tool" >&6; } -if test "x$lt_cv_path_mainfest_tool" != xyes; then +if test yes != "$lt_cv_path_mainfest_tool"; then MANIFEST_TOOL=: fi @@ -8501,7 +8759,7 @@ if ${lt_cv_apple_cc_single_mod+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then + if test -z "$LT_MULTI_MODULE"; then # By default we will add the -single_module flag. You can override # by either setting the environment variable LT_MULTI_MODULE # non-empty at configure time, or by adding -multi_module to the @@ -8519,7 +8777,7 @@ else cat conftest.err >&5 # Otherwise, if the output was created with a 0 exit code from # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then + elif test -f libconftest.dylib && test 0 = "$_lt_result"; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -8558,7 +8816,7 @@ else fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 @@ -8575,8 +8833,8 @@ int forced_loaded() { return 2;} _LT_EOF echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 + echo "$AR $AR_FLAGS libconftest.a conftest.o" >&5 + $AR $AR_FLAGS libconftest.a conftest.o 2>&5 echo "$RANLIB libconftest.a" >&5 $RANLIB libconftest.a 2>&5 cat > conftest.c << _LT_EOF @@ -8587,7 +8845,7 @@ _LT_EOF _lt_result=$? if test -s conftest.err && $GREP force_load conftest.err; then cat conftest.err >&5 - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then lt_cv_ld_force_load=yes else cat conftest.err >&5 @@ -8600,32 +8858,27 @@ fi $as_echo "$lt_cv_ld_force_load" >&6; } case $host_os in rhapsody* | darwin1.[012]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[91]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[012]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + darwin*) + case $MACOSX_DEPLOYMENT_TARGET,$host in + 10.[012],*|,*powerpc*-darwin[5-8]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + *) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then + if test yes = "$lt_cv_apple_cc_single_mod"; then _lt_dar_single_mod='$single_module' fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + if test yes = "$lt_cv_ld_exported_symbols_list"; then + _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib' fi - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then + if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -8633,6 +8886,41 @@ $as_echo "$lt_cv_ld_force_load" >&6; } ;; esac +# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x$2 in + x) + ;; + *:) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\" + ;; + x:*) + eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" + ;; + *) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" + ;; + esac +} + for ac_header in dlfcn.h do : ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default @@ -8669,14 +8957,14 @@ if test "${with_pic+set}" = set; then : *) pic_mode=default # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for lt_pkg in $withval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$lt_pkg" = "X$lt_p"; then pic_mode=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -8684,8 +8972,6 @@ else fi -test -z "$pic_mode" && pic_mode=default - @@ -8701,14 +8987,14 @@ if test "${enable_fast_install+set}" = set; then : *) enable_fast_install=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_fast_install=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -8722,11 +9008,63 @@ fi + shared_archive_member_spec= +case $host,$enable_shared in +power*-*-aix[5-9]*,yes) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5 +$as_echo_n "checking which variant of shared library versioning to provide... " >&6; } + +# Check whether --with-aix-soname was given. +if test "${with_aix_soname+set}" = set; then : + withval=$with_aix_soname; case $withval in + aix|svr4|both) + ;; + *) + as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5 + ;; + esac + lt_cv_with_aix_soname=$with_aix_soname +else + if ${lt_cv_with_aix_soname+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_with_aix_soname=aix +fi + + with_aix_soname=$lt_cv_with_aix_soname +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5 +$as_echo "$with_aix_soname" >&6; } + if test aix != "$with_aix_soname"; then + # For the AIX way of multilib, we name the shared archive member + # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', + # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File. + # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag, + # the AIX toolchain works better with OBJECT_MODE set (default 32). + if test 64 = "${OBJECT_MODE-32}"; then + shared_archive_member_spec=shr_64 + else + shared_archive_member_spec=shr + fi + fi + ;; +*) + with_aix_soname=aix + ;; +esac + + + + + + + # This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" +LIBTOOL_DEPS=$ltmain # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@ -8775,7 +9113,7 @@ test -z "$LN_S" && LN_S="ln -s" -if test -n "${ZSH_VERSION+set}" ; then +if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi @@ -8814,7 +9152,7 @@ aix3*) # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then + if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -8825,14 +9163,14 @@ esac ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except MSVC, -# which needs '.lib'). +# All known linkers require a '.a' archive for static linking (except MSVC and +# ICC, which need '.lib'). libext=a -with_gnu_ld="$lt_cv_prog_gnu_ld" +with_gnu_ld=$lt_cv_prog_gnu_ld -old_CC="$CC" -old_CFLAGS="$CFLAGS" +old_CC=$CC +old_CFLAGS=$CFLAGS # Set sane defaults for various variables test -z "$CC" && CC=cc @@ -8841,15 +9179,8 @@ test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS test -z "$LD" && LD=ld test -z "$ac_objext" && ac_objext=o -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +func_cc_basename $compiler +cc_basename=$func_cc_basename_result # Only perform the check for file, if the check method requires it @@ -8864,22 +9195,22 @@ if ${lt_cv_path_MAGIC_CMD+:} false; then : else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/${ac_tool_prefix}file; then - lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" + if test -f "$ac_dir/${ac_tool_prefix}file"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + MAGIC_CMD=$lt_cv_path_MAGIC_CMD if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -8902,13 +9233,13 @@ _LT_EOF break fi done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD ;; esac fi -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } @@ -8930,22 +9261,22 @@ if ${lt_cv_path_MAGIC_CMD+:} false; then : else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/file; then - lt_cv_path_MAGIC_CMD="$ac_dir/file" + if test -f "$ac_dir/file"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"file" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + MAGIC_CMD=$lt_cv_path_MAGIC_CMD if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -8968,13 +9299,13 @@ _LT_EOF break fi done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD ;; esac fi -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } @@ -8995,7 +9326,7 @@ esac # Use C for the default configuration in the libtool script -lt_save_CC="$CC" +lt_save_CC=$CC ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -9053,7 +9384,7 @@ if test -n "$compiler"; then lt_prog_compiler_no_builtin_flag= -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $cc_basename in nvcc*) lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; @@ -9069,7 +9400,7 @@ else lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="-fno-rtti -fno-exceptions" + lt_compiler_flag="-fno-rtti -fno-exceptions" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -9099,7 +9430,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } -if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then +if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" else : @@ -9117,17 +9448,18 @@ lt_prog_compiler_pic= lt_prog_compiler_static= - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_prog_compiler_wl='-Wl,' lt_prog_compiler_static='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor lt_prog_compiler_static='-Bstatic' fi + lt_prog_compiler_pic='-fPIC' ;; amigaos*) @@ -9138,8 +9470,8 @@ lt_prog_compiler_static= ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -9155,6 +9487,11 @@ lt_prog_compiler_static= # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries lt_prog_compiler_pic='-DDLL_EXPORT' + case $host_os in + os2*) + lt_prog_compiler_static='$wl-static' + ;; + esac ;; darwin* | rhapsody*) @@ -9225,7 +9562,7 @@ lt_prog_compiler_static= case $host_os in aix*) lt_prog_compiler_wl='-Wl,' - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor lt_prog_compiler_static='-Bstatic' else @@ -9233,10 +9570,29 @@ lt_prog_compiler_static= fi ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + lt_prog_compiler_pic='-fno-common' + case $cc_basename in + nagfor*) + # NAG Fortran compiler + lt_prog_compiler_wl='-Wl,-Wl,,' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; + esac + ;; + mingw* | cygwin* | pw32* | os2* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). lt_prog_compiler_pic='-DDLL_EXPORT' + case $host_os in + os2*) + lt_prog_compiler_static='$wl-static' + ;; + esac ;; hpux9* | hpux10* | hpux11*) @@ -9252,7 +9608,7 @@ lt_prog_compiler_static= ;; esac # Is there a better lt_prog_compiler_static that works with the bundled CC? - lt_prog_compiler_static='${wl}-a ${wl}archive' + lt_prog_compiler_static='$wl-a ${wl}archive' ;; irix5* | irix6* | nonstopux*) @@ -9263,12 +9619,18 @@ lt_prog_compiler_static= linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. + # old Intel for x86_64, which still supported -KPIC. ecc*) lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-static' ;; + # flang / f18. f95 an alias for gfortran or flang on Debian + flang* | f18* | f95*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; # icc used to be incompatible with GCC. # ICC 10 doesn't accept -KPIC any more. icc* | ifort*) @@ -9288,6 +9650,12 @@ lt_prog_compiler_static= lt_prog_compiler_pic='-PIC' lt_prog_compiler_static='-Bstatic' ;; + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -9307,7 +9675,7 @@ lt_prog_compiler_static= lt_prog_compiler_static='-qstaticlink' ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker lt_prog_compiler_pic='-KPIC' @@ -9385,7 +9753,7 @@ lt_prog_compiler_static= ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then lt_prog_compiler_pic='-Kconform_pic' lt_prog_compiler_static='-Bstatic' fi @@ -9414,7 +9782,7 @@ lt_prog_compiler_static= fi case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: + # For platforms that do not support PIC, -DPIC is meaningless: *djgpp*) lt_prog_compiler_pic= ;; @@ -9446,7 +9814,7 @@ else lt_cv_prog_compiler_pic_works=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic -DPIC" + lt_compiler_flag="$lt_prog_compiler_pic -DPIC" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -9476,7 +9844,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 $as_echo "$lt_cv_prog_compiler_pic_works" >&6; } -if test x"$lt_cv_prog_compiler_pic_works" = xyes; then +if test yes = "$lt_cv_prog_compiler_pic_works"; then case $lt_prog_compiler_pic in "" | " "*) ;; *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; @@ -9508,7 +9876,7 @@ if ${lt_cv_prog_compiler_static_works+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -9527,13 +9895,13 @@ else fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 $as_echo "$lt_cv_prog_compiler_static_works" >&6; } -if test x"$lt_cv_prog_compiler_static_works" = xyes; then +if test yes = "$lt_cv_prog_compiler_static_works"; then : else lt_prog_compiler_static= @@ -9653,8 +10021,8 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; } -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then +hard_links=nottested +if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then # do not overwrite the value of need_locks provided by the user { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 $as_echo_n "checking if we can lock with hard links... " >&6; } @@ -9666,9 +10034,9 @@ $as_echo_n "checking if we can lock with hard links... " >&6; } ln conftest.a conftest.b 2>/dev/null && hard_links=no { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 $as_echo "$hard_links" >&6; } - if test "$hard_links" = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + if test no = "$hard_links"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} need_locks=warn fi else @@ -9711,9 +10079,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie # included in the symbol list include_expsyms= # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. + # it will be wrapped by ' (' and ')$', so one must not match beginning or + # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc', + # as well as any symbol that contains 'd'. exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if @@ -9725,18 +10093,18 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time + # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then + # Microsoft Visual C++ or Intel C++ Compiler. + if test yes != "$GCC"; then with_gnu_ld=no fi ;; interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) + # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC) with_gnu_ld=yes ;; - openbsd*) + openbsd* | bitrig*) with_gnu_ld=no ;; linux* | k*bsd*-gnu | gnu*) @@ -9749,7 +10117,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie # On some targets, GNU ld is compatible enough with the native linker # that we're better off using the native interface for both. lt_use_gnu_ld_interface=no - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then case $host_os in aix*) # The AIX port of GNU ld has always aspired to compatibility @@ -9771,24 +10139,24 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie esac fi - if test "$lt_use_gnu_ld_interface" = yes; then + if test yes = "$lt_use_gnu_ld_interface"; then # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' + wlarc='$wl' # Set some defaults for GNU ld with shared library support. These # are reset later if shared libraries are not supported. Putting them # here allows them to be overridden if necessary. runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec='${wl}--export-dynamic' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + export_dynamic_flag_spec='$wl--export-dynamic' # ancient GNU ld didn't support --whole-archive et. al. if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else whole_archive_flag_spec= fi supports_anon_versioning=no - case `$LD -v 2>&1` in + case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -9801,7 +10169,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie case $host_os in aix[3-9]*) # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then + if test ia64 != "$host_cpu"; then ld_shlibs=no cat <<_LT_EOF 1>&2 @@ -9820,7 +10188,7 @@ _LT_EOF case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' archive_expsym_cmds='' ;; m68k) @@ -9836,7 +10204,7 @@ _LT_EOF allow_undefined_flag=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else ld_shlibs=no fi @@ -9846,7 +10214,7 @@ _LT_EOF # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' - export_dynamic_flag_spec='${wl}--export-all-symbols' + export_dynamic_flag_spec='$wl--export-all-symbols' allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -9854,61 +10222,90 @@ _LT_EOF exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else ld_shlibs=no fi ;; haiku*) - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' link_all_deplibs=yes ;; + os2*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + allow_undefined_flag=unsupported + shrext_cmds=.dll + archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + enable_shared_with_static_runtimes=yes + file_list_spec='@' + ;; + interix[3-9]*) hardcode_direct=no hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' + export_dynamic_flag_spec='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds='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' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds='$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' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no - if test "$host_os" = linux-dietlibc; then + if test linux-dietlibc = "$host_os"; then case $cc_basename in diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) esac fi if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no + && test no = "$tmp_diet" then tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag' ;; pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group f77 and f90 compilers - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -9919,42 +10316,48 @@ _LT_EOF lf95*) # Lahey Fortran 8.1 whole_archive_flag_spec= tmp_sharedflag='--shared' ;; + nagfor*) # NAGFOR 5.3 + tmp_sharedflag='-Wl,-shared' ;; xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; nvcc*) # Cuda Compiler Driver 2.2 - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object=yes ;; esac - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 tmp_sharedflag='-G' ;; esac - archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi case $cc_basename in + tcc*) + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + export_dynamic_flag_spec='-rdynamic' + ;; xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -9968,8 +10371,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -9987,8 +10390,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -10000,7 +10403,7 @@ _LT_EOF ld_shlibs=no cat <<_LT_EOF 1>&2 -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot *** reliably create shared libraries on SCO systems. Therefore, libtool *** is disabling shared libraries support. We urge you to upgrade GNU *** binutils to release 2.16.91.0.3 or newer. Another option is to modify @@ -10015,9 +10418,9 @@ _LT_EOF # DT_RUNPATH tag from executables and libraries. But doing so # requires that you compile everything twice, which is a pain. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -10034,15 +10437,15 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi ;; esac - if test "$ld_shlibs" = no; then + if test no = "$ld_shlibs"; then runpath_var= hardcode_libdir_flag_spec= export_dynamic_flag_spec= @@ -10058,7 +10461,7 @@ _LT_EOF # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. hardcode_minus_L=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. hardcode_direct=unsupported @@ -10066,34 +10469,57 @@ _LT_EOF ;; aix[4-9]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global - # defined symbols, whereas GNU nm marks them as "W". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then aix_use_runtimelinking=yes break fi done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -10112,13 +10538,21 @@ _LT_EOF hardcode_direct_absolute=yes hardcode_libdir_separator=':' link_all_deplibs=yes - file_list_spec='${wl}-f,' + file_list_spec='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # traditional, no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + hardcode_direct=no + hardcode_direct_absolute=no + ;; + esac - if test "$GCC" = yes; then + if test yes = "$GCC"; then case $host_os in aix4.[012]|aix4.[012].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -10137,36 +10571,42 @@ _LT_EOF ;; esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag="$shared_flag "'$wl-G' fi - link_all_deplibs=no + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - export_dynamic_flag_spec='${wl}-bexpall' + export_dynamic_flag_spec='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to export. always_export_symbols=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then + if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else if ${lt_cv_aix_libpath_+:} false; then : @@ -10201,7 +10641,7 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" + lt_cv_aix_libpath_=/usr/lib:/lib fi fi @@ -10209,17 +10649,17 @@ fi aix_libpath=$lt_cv_aix_libpath_ fi - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" + archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' + if test ia64 = "$host_cpu"; then + hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib' allow_undefined_flag="-z nodefs" - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then + if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else if ${lt_cv_aix_libpath_+:} false; then : @@ -10254,7 +10694,7 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" + lt_cv_aix_libpath_=/usr/lib:/lib fi fi @@ -10262,21 +10702,33 @@ fi aix_libpath=$lt_cv_aix_libpath_ fi - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - no_undefined_flag=' ${wl}-bernotok' - allow_undefined_flag=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + no_undefined_flag=' $wl-bernotok' + allow_undefined_flag=' $wl-berok' + if test yes = "$with_gnu_ld"; then # We only use this code for GNU lds that support --whole-archive. - whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives whole_archive_flag_spec='$convenience' fi archive_cmds_need_lc=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared libraries. + archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + archive_expsym_cmds="$archive_expsym_cmds"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -10285,7 +10737,7 @@ fi case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' archive_expsym_cmds='' ;; m68k) @@ -10302,12 +10754,12 @@ fi cygwin* | mingw* | pw32* | cegcc*) # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. + # Microsoft Visual C++ or Intel C++ Compiler. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. case $cc_basename in - cl*) - # Native MSVC + cl* | icl*) + # Native MSVC or ICC hardcode_libdir_flag_spec=' ' allow_undefined_flag=unsupported always_export_symbols=yes @@ -10315,16 +10767,17 @@ fi # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, )='true' enable_shared_with_static_runtimes=yes @@ -10333,27 +10786,27 @@ fi # Don't use ranlib old_postinstall_cmds='chmod 644 $oldlib' postlink_cmds='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) - # Assume MSVC wrapper + # Assume MSVC and ICC wrapper hardcode_libdir_flag_spec=' ' allow_undefined_flag=unsupported # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. @@ -10372,24 +10825,24 @@ fi hardcode_direct=no hardcode_automatic=yes hardcode_shlibpath_var=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + if test yes = "$lt_cv_ld_force_load"; then + whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' else whole_archive_flag_spec='' fi link_all_deplibs=yes - allow_undefined_flag="$_lt_dar_allow_undefined" + allow_undefined_flag=$_lt_dar_allow_undefined case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; + ifort*|nagfor*) _lt_dar_can_shared=yes ;; *) _lt_dar_can_shared=$GCC ;; esac - if test "$_lt_dar_can_shared" = "yes"; then + if test yes = "$_lt_dar_can_shared"; then output_verbose_link_cmd=func_echo_all - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds="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}" - module_expsym_cmds="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}" + archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" + archive_expsym_cmds="$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" + module_expsym_cmds="$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" else ld_shlibs=no @@ -10423,7 +10876,7 @@ fi ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes @@ -10431,33 +10884,33 @@ fi ;; hpux9*) - if test "$GCC" = yes; then - archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + if test yes = "$GCC"; then + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' fi - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec='$wl+b $wl$libdir' hardcode_libdir_separator=: hardcode_direct=yes # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. hardcode_minus_L=yes - export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='$wl-E' ;; hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + if test yes,no = "$GCC,$with_gnu_ld"; then + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + hardcode_libdir_flag_spec='$wl+b $wl$libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. hardcode_minus_L=yes @@ -10465,25 +10918,25 @@ fi ;; hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then + if test yes,no = "$GCC,$with_gnu_ld"; then case $host_cpu in hppa*64*) - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else case $host_cpu in hppa*64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) @@ -10495,7 +10948,7 @@ if ${lt_cv_prog_compiler__b+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler__b=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -b" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -10514,14 +10967,14 @@ else fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 $as_echo "$lt_cv_prog_compiler__b" >&6; } -if test x"$lt_cv_prog_compiler__b" = xyes; then - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +if test yes = "$lt_cv_prog_compiler__b"; then + archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi @@ -10529,8 +10982,8 @@ fi ;; esac fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + hardcode_libdir_flag_spec='$wl+b $wl$libdir' hardcode_libdir_separator=: case $host_cpu in @@ -10541,7 +10994,7 @@ fi *) hardcode_direct=yes hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. @@ -10552,8 +11005,8 @@ fi ;; irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. @@ -10563,8 +11016,8 @@ $as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " > if ${lt_cv_irix_exported_symbol+:} false; then : $as_echo_n "(cached) " >&6 else - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int foo (void) { return 0; } @@ -10576,24 +11029,36 @@ else fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 $as_echo "$lt_cv_irix_exported_symbol" >&6; } - if test "$lt_cv_irix_exported_symbol" = yes; then - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + if test yes = "$lt_cv_irix_exported_symbol"; then + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi + link_all_deplibs=no else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' fi archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_separator=: inherit_rpath=yes link_all_deplibs=yes ;; + linux*) + case $cc_basename in + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + ld_shlibs=yes + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + ;; + esac + ;; + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out @@ -10608,7 +11073,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } newsos6) archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_separator=: hardcode_shlibpath_var=no ;; @@ -10616,27 +11081,19 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } *nto* | *qnx*) ;; - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then hardcode_direct=yes hardcode_shlibpath_var=no hardcode_direct_absolute=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' + archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' + export_dynamic_flag_spec='$wl-E' else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' fi else ld_shlibs=no @@ -10647,33 +11104,54 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } hardcode_libdir_flag_spec='-L$libdir' hardcode_minus_L=yes allow_undefined_flag=unsupported - archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + shrext_cmds=.dll + archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + enable_shared_with_static_runtimes=yes + file_list_spec='@' ;; osf3*) - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + allow_undefined_flag=' $wl-expect_unresolved $wl\*' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' fi archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_separator=: ;; osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + if test yes = "$GCC"; then + allow_undefined_flag=' $wl-expect_unresolved $wl\*' + archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp' # Both c and cxx compiler support -rpath directly hardcode_libdir_flag_spec='-rpath $libdir' @@ -10684,24 +11162,24 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } solaris*) no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + wlarc='$wl' + archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) wlarc='' - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' ;; *) - wlarc='${wl}' - archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' + wlarc='$wl' + archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ;; esac fi @@ -10711,11 +11189,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } solaris2.[0-5] | solaris2.[0-5].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', + # but understands '-z linker_flag'. GCC discards it without '$wl', # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + if test yes = "$GCC"; then + whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' else whole_archive_flag_spec='-z allextract$convenience -z defaultextract' fi @@ -10725,10 +11203,10 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } ;; sunos4*) - if test "x$host_vendor" = xsequent; then + if test sequent = "$host_vendor"; then # Use $CC to link under sequent, because it throws in some extra .o # files that make .init and .fini sections work. - archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' fi @@ -10777,43 +11255,43 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag='${wl}-z,text' + no_undefined_flag='$wl-z,text' archive_cmds_need_lc=no hardcode_shlibpath_var=no runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - no_undefined_flag='${wl}-z,text' - allow_undefined_flag='${wl}-z,nodefs' + no_undefined_flag='$wl-z,text' + allow_undefined_flag='$wl-z,nodefs' archive_cmds_need_lc=no hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-R,$libdir' + hardcode_libdir_flag_spec='$wl-R,$libdir' hardcode_libdir_separator=':' link_all_deplibs=yes - export_dynamic_flag_spec='${wl}-Bexport' + export_dynamic_flag_spec='$wl-Bexport' runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; @@ -10828,10 +11306,10 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } ;; esac - if test x$host_vendor = xsni; then + if test sni = "$host_vendor"; then case $host in sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - export_dynamic_flag_spec='${wl}-Blargedynsym' + export_dynamic_flag_spec='$wl-Blargedynsym' ;; esac fi @@ -10839,7 +11317,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 $as_echo "$ld_shlibs" >&6; } -test "$ld_shlibs" = no && can_build_shared=no +test no = "$ld_shlibs" && can_build_shared=no with_gnu_ld=$with_gnu_ld @@ -10865,7 +11343,7 @@ x|xyes) # Assume -lc should be added archive_cmds_need_lc=yes - if test "$enable_shared" = yes && test "$GCC" = yes; then + if test yes,yes = "$GCC,$enable_shared"; then case $archive_cmds in *'~'*) # FIXME: we may have to deal with multi-command sequences. @@ -11080,14 +11558,14 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; + darwin*) lt_awk_arg='/^libraries:/,/LR/' ;; + *) lt_awk_arg='/^libraries:/' ;; esac case $host_os in - mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; - *) lt_sed_strip_eq="s,=/,/,g" ;; + mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;; + *) lt_sed_strip_eq='s|=/|/|g' ;; esac lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` case $lt_search_path_spec in @@ -11103,28 +11581,35 @@ if test "$GCC" = yes; then ;; esac # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. + # and add multilib dir if necessary... lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + # ...but if some path component already ends with the multilib dir we assume + # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer). + case "$lt_multi_os_dir; $lt_search_path_spec " in + "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*) + lt_multi_os_dir= + ;; + esac for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else + if test -d "$lt_sys_path$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir" + elif test -n "$lt_multi_os_dir"; then test -d "$lt_sys_path" && \ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; +BEGIN {RS = " "; FS = "/|\n";} { + lt_foo = ""; + lt_count = 0; for (lt_i = NF; lt_i > 0; lt_i--) { if ($lt_i != "" && $lt_i != ".") { if ($lt_i == "..") { lt_count++; } else { if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; + lt_foo = "/" $lt_i lt_foo; } else { lt_count--; } @@ -11138,7 +11623,7 @@ BEGIN {RS=" "; FS="/|\n";} { # for these hosts. case $host_os in mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ - $SED 's,/\([A-Za-z]:\),\1,g'` ;; + $SED 's|/\([A-Za-z]:\)|\1|g'` ;; esac sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` else @@ -11147,7 +11632,7 @@ fi library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=".so" +shrext_cmds=.so postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -11164,14 +11649,16 @@ hardcode_into_libs=no # flags to be left without arguments need_version=unknown + + case $host_os in aix3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + library_names_spec='$libname$release$shared_ext$versuffix $libname.a' shlibpath_var=LIBPATH # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' + soname_spec='$libname$release$shared_ext$major' ;; aix[4-9]*) @@ -11179,41 +11666,91 @@ aix[4-9]*) need_lib_prefix=no need_version=no hardcode_into_libs=yes - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH else # With GCC up to 2.95.x, collect2 would create an import file # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in + # the line '#! .'. This would cause the generated library to + # depend on '.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in aix4 | aix4.[01] | aix4.[01].*) if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then : else can_build_shared=no fi ;; esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # Using Import Files as archive members, it is possible to support + # filename-based versioning of shared library archives on AIX. While + # this would work for both with and without runtime linking, it will + # prevent static linking of such archives. So we do filename-based + # shared library versioning with .so extension only, which is used + # when both runtime linking and shared linking is enabled. + # Unfortunately, runtime linking may impact performance, so we do + # not want this to be the default eventually. Also, we use the + # versioned .so libs for executables only if there is the -brtl + # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. + # To allow for filename-based versioning support, we need to create + # libNAME.so.V as an archive file, containing: + # *) an Import File, referring to the versioned filename of the + # archive as well as the shared archive member, telling the + # bitwidth (32 or 64) of that shared object, and providing the + # list of exported symbols of that shared object, eventually + # decorated with the 'weak' keyword + # *) the shared object with the F_LOADONLY flag set, to really avoid + # it being seen by the linker. + # At run time we better use the real file rather than another symlink, + # but for link time we create the symlink libNAME.so -> libNAME.so.V + + case $with_aix_soname,$aix_use_runtimelinking in + # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct # soname into executable. Probably we can add versioning support to # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then + aix,yes) # traditional libtool + dynamic_linker='AIX unversionable lib.so' # If using run time linking (on AIX 4.2 or later) use lib.so # instead of lib.a to let people know that these are not # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + aix,no) # traditional AIX only + dynamic_linker='AIX lib.a(lib.so.V)' # We preserve .a as extension for shared libraries through AIX4.2 # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + ;; + svr4,*) # full svr4 only + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,yes) # both, prefer svr4 + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # unpreferred sharedlib libNAME.a needs extra handling + postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' + postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,no) # both, prefer aix + dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)" + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling + postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' + postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' + ;; + esac shlibpath_var=LIBPATH fi ;; @@ -11223,18 +11760,18 @@ amigaos*) powerpc) # Since July 2007 AmigaOS4 officially supports .so libraries. # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ;; m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; beos*) - library_names_spec='${libname}${shared_ext}' + library_names_spec='$libname$shared_ext' dynamic_linker="$host_os ld.so" shlibpath_var=LIBRARY_PATH ;; @@ -11242,8 +11779,8 @@ beos*) bsdi[45]*) version_type=linux # correct to gnu/linux during the next big refactor need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" @@ -11255,7 +11792,7 @@ bsdi[45]*) cygwin* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=".dll" + shrext_cmds=.dll need_version=no need_lib_prefix=no @@ -11264,8 +11801,8 @@ cygwin* | mingw* | pw32* | cegcc*) # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname~ @@ -11281,27 +11818,27 @@ cygwin* | mingw* | pw32* | cegcc*) case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' ;; - *,cl*) - # Native MSVC + *,cl* | *,icl*) + # Native MSVC or ICC libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' case $build_os in mingw*) @@ -11317,7 +11854,7 @@ cygwin* | mingw* | pw32* | cegcc*) done IFS=$lt_save_ifs # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` ;; cygwin*) # Convert to unix form, then to dos form, then back to unix form @@ -11328,7 +11865,7 @@ cygwin* | mingw* | pw32* | cegcc*) sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ;; *) - sys_lib_search_path_spec="$LIB" + sys_lib_search_path_spec=$LIB if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then # It is most probably a Windows format PATH. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` @@ -11341,8 +11878,8 @@ cygwin* | mingw* | pw32* | cegcc*) esac # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname' @@ -11354,8 +11891,8 @@ cygwin* | mingw* | pw32* | cegcc*) ;; *) - # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + # Assume MSVC and ICC wrapper + library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; esac @@ -11368,8 +11905,8 @@ darwin* | rhapsody*) version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' + library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' + soname_spec='$libname$release$major$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' @@ -11382,12 +11919,12 @@ dgux*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. if test -x /usr/bin/objformat; then @@ -11401,12 +11938,13 @@ freebsd* | dragonfly*) version_type=freebsd-$objformat case $version_type in freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' need_version=no need_lib_prefix=no ;; freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' need_version=yes ;; esac @@ -11436,10 +11974,10 @@ haiku*) need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes + shlibpath_overrides_runpath=no sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -11457,14 +11995,15 @@ hpux9* | hpux10* | hpux11*) dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + if test 32 = "$HPUX_IA64_MODE"; then sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + sys_lib_dlsearch_path_spec=/usr/lib/hpux32 else sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + sys_lib_dlsearch_path_spec=/usr/lib/hpux64 fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) shrext_cmds='.sl' @@ -11472,8 +12011,8 @@ hpux9* | hpux10* | hpux11*) dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; @@ -11482,8 +12021,8 @@ hpux9* | hpux10* | hpux11*) dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' ;; esac # HP-UX runs *really* slowly unless shared libraries are mode 555, ... @@ -11496,8 +12035,8 @@ interix[3-9]*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -11508,7 +12047,7 @@ irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; *) - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix @@ -11516,8 +12055,8 @@ irix5* | irix6* | nonstopux*) esac need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' case $host_os in irix5* | nonstopux*) libsuff= shlibsuff= @@ -11536,8 +12075,8 @@ irix5* | irix6* | nonstopux*) esac shlibpath_var=LD_LIBRARY${shlibsuff}_PATH shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" + sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" hardcode_into_libs=yes ;; @@ -11546,13 +12085,33 @@ linux*oldld* | linux*aout* | linux*coff*) dynamic_linker=no ;; +linux*android*) + version_type=none # Android doesn't support versioned libraries. + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + dynamic_linker='Android linker' + # Don't embed -rpath directories since the linker doesn't support them. + hardcode_libdir_flag_spec='-L$libdir' + ;; + # This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -11596,7 +12155,12 @@ fi # before this can be enabled. hardcode_into_libs=yes - # Append ld.so.conf contents to the search path + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, + # even though it is searched at run-time. Try to do the best guess by + # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then 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;s/"//g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" @@ -11628,12 +12192,12 @@ netbsd*) need_lib_prefix=no need_version=no if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='NetBSD ld.elf_so' fi shlibpath_var=LD_LIBRARY_PATH @@ -11643,7 +12207,7 @@ netbsd*) newsos6) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes ;; @@ -11652,58 +12216,68 @@ newsos6) version_type=qnx need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes dynamic_linker='ldqnx.so' ;; -openbsd*) +openbsd* | bitrig*) version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" + sys_lib_dlsearch_path_spec=/usr/lib need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + need_version=no else - shlibpath_overrides_runpath=yes + need_version=yes fi + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes ;; os2*) libname_spec='$name' - shrext_cmds=".dll" + version_type=windows + shrext_cmds=.dll + need_version=no need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' + # OS/2 can only load a DLL with a base name of 8 characters or less. + soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; + v=$($ECHO $release$versuffix | tr -d .-); + n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); + $ECHO $n$v`$shared_ext' + library_names_spec='${libname}_dll.$libext' dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH + shlibpath_var=BEGINLIBPATH + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' ;; osf3* | osf4* | osf5*) version_type=osf need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; rdos*) @@ -11714,8 +12288,8 @@ solaris*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes @@ -11725,11 +12299,11 @@ solaris*) sunos4*) version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then need_lib_prefix=no fi need_version=yes @@ -11737,8 +12311,8 @@ sunos4*) sysv4 | sysv4.3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH case $host_vendor in sni) @@ -11759,24 +12333,24 @@ sysv4 | sysv4.3*) ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' + library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' + soname_spec='$libname$shared_ext.$major' shlibpath_var=LD_LIBRARY_PATH fi ;; sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf + version_type=sco need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' else sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' @@ -11794,7 +12368,7 @@ tpf*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes @@ -11802,8 +12376,8 @@ tpf*) uts4*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -11813,20 +12387,35 @@ uts4*) esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 $as_echo "$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no +test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then +if test yes = "$GCC"; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then + sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + +if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then + sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec fi +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec + +# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" + +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH + + + + + + @@ -11923,15 +12512,15 @@ $as_echo_n "checking how to hardcode library paths into programs... " >&6; } hardcode_action= if test -n "$hardcode_libdir_flag_spec" || test -n "$runpath_var" || - test "X$hardcode_automatic" = "Xyes" ; then + test yes = "$hardcode_automatic"; then # We can hardcode non-existent directories. - if test "$hardcode_direct" != no && + if test no != "$hardcode_direct" && # If the only mechanism to avoid hardcoding is shlibpath_var, we # have to relink, otherwise we might link with an installed library # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && - test "$hardcode_minus_L" != no; then + ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" && + test no != "$hardcode_minus_L"; then # Linking always hardcodes the temporary library directory. hardcode_action=relink else @@ -11946,12 +12535,12 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 $as_echo "$hardcode_action" >&6; } -if test "$hardcode_action" = relink || - test "$inherit_rpath" = yes; then +if test relink = "$hardcode_action" || + test yes = "$inherit_rpath"; then # Fast installation is not supported enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then +elif test yes = "$shlibpath_overrides_runpath" || + test no = "$enable_shared"; then # Fast installation is not necessary enable_fast_install=needless fi @@ -11961,7 +12550,7 @@ fi - if test "x$enable_dlopen" != xyes; then + if test yes != "$enable_dlopen"; then enable_dlopen=unknown enable_dlopen_self=unknown enable_dlopen_self_static=unknown @@ -11971,23 +12560,23 @@ else case $host_os in beos*) - lt_cv_dlopen="load_add_on" + lt_cv_dlopen=load_add_on lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ;; mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen=LoadLibrary lt_cv_dlopen_libs= ;; cygwin*) - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs= ;; darwin*) - # if libdl is installed we need to link against it + # if libdl is installed we need to link against it { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } if ${ac_cv_lib_dl_dlopen+:} false; then : @@ -12025,10 +12614,10 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl else - lt_cv_dlopen="dyld" + lt_cv_dlopen=dyld lt_cv_dlopen_libs= lt_cv_dlopen_self=yes @@ -12036,10 +12625,18 @@ fi ;; + tpf*) + # Don't try to run any link tests for TPF. We know it's impossible + # because TPF is a cross-compiler, and we know how we open DSOs. + lt_cv_dlopen=dlopen + lt_cv_dlopen_libs= + lt_cv_dlopen_self=no + ;; + *) ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" if test "x$ac_cv_func_shl_load" = xyes; then : - lt_cv_dlopen="shl_load" + lt_cv_dlopen=shl_load else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 $as_echo_n "checking for shl_load in -ldld... " >&6; } @@ -12078,11 +12675,11 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 $as_echo "$ac_cv_lib_dld_shl_load" >&6; } if test "x$ac_cv_lib_dld_shl_load" = xyes; then : - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" + lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld else ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" if test "x$ac_cv_func_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } @@ -12121,7 +12718,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 $as_echo_n "checking for dlopen in -lsvld... " >&6; } @@ -12160,7 +12757,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 $as_echo "$ac_cv_lib_svld_dlopen" >&6; } if test "x$ac_cv_lib_svld_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 $as_echo_n "checking for dld_link in -ldld... " >&6; } @@ -12199,7 +12796,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 $as_echo "$ac_cv_lib_dld_dld_link" >&6; } if test "x$ac_cv_lib_dld_dld_link" = xyes; then : - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" + lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld fi @@ -12220,21 +12817,21 @@ fi ;; esac - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else + if test no = "$lt_cv_dlopen"; then enable_dlopen=no + else + enable_dlopen=yes fi case $lt_cv_dlopen in dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + save_CPPFLAGS=$CPPFLAGS + test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - save_LIBS="$LIBS" + save_LIBS=$LIBS LIBS="$lt_cv_dlopen_libs $LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 @@ -12242,7 +12839,7 @@ $as_echo_n "checking whether a program can dlopen itself... " >&6; } if ${lt_cv_dlopen_self+:} false; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : + if test yes = "$cross_compiling"; then : lt_cv_dlopen_self=cross else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -12289,9 +12886,9 @@ else # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated +/* When -fvisibility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) int fnord () __attribute__((visibility("default"))); #endif @@ -12321,7 +12918,7 @@ _LT_EOF (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -12341,14 +12938,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 $as_echo "$lt_cv_dlopen_self" >&6; } - if test "x$lt_cv_dlopen_self" = xyes; then + if test yes = "$lt_cv_dlopen_self"; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } if ${lt_cv_dlopen_self_static+:} false; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : + if test yes = "$cross_compiling"; then : lt_cv_dlopen_self_static=cross else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -12395,9 +12992,9 @@ else # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated +/* When -fvisibility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) int fnord () __attribute__((visibility("default"))); #endif @@ -12427,7 +13024,7 @@ _LT_EOF (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -12448,9 +13045,9 @@ fi $as_echo "$lt_cv_dlopen_self_static" >&6; } fi - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" + CPPFLAGS=$save_CPPFLAGS + LDFLAGS=$save_LDFLAGS + LIBS=$save_LIBS ;; esac @@ -12485,30 +13082,41 @@ striplib= old_striplib= { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 $as_echo_n "checking whether stripping libraries is possible... " >&6; } -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +if test -z "$STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then + if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + case $host_os in + darwin*) + # FIXME - insert some real tests, host_os isn't really good enough striplib="$STRIP -x" old_striplib="$STRIP -S" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + ;; + freebsd*) + if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - fi - ;; - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + fi + ;; + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - ;; - esac + ;; + esac + fi fi @@ -12522,7 +13130,7 @@ fi - # Report which library types will actually be built + # Report what library types will actually be built { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 $as_echo_n "checking if libtool supports shared libraries... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 @@ -12530,13 +13138,13 @@ $as_echo "$can_build_shared" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 $as_echo_n "checking whether to build shared libraries... " >&6; } - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' @@ -12544,8 +13152,12 @@ $as_echo_n "checking whether to build shared libraries... " >&6; } ;; aix[4-9]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -12555,7 +13167,7 @@ $as_echo "$enable_shared" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 $as_echo_n "checking whether to build static libraries... " >&6; } # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 $as_echo "$enable_static" >&6; } @@ -12569,7 +13181,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -CC="$lt_save_CC" +CC=$lt_save_CC @@ -14347,6 +14959,8 @@ main () if (*(data + i) != *(data3 + i)) return 14; close (fd); + free (data); + free (data3); return 0; } _ACEOF @@ -14777,8 +15391,8 @@ fi if test "x$cf_enable_openssl" != "xno"; then : pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL" >&5 -$as_echo_n "checking for OpenSSL... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libssl >= 0.9.8 libcrypto >= 0.9.8" >&5 +$as_echo_n "checking for libssl >= 0.9.8 libcrypto >= 0.9.8... " >&6; } if test -n "$OpenSSL_CFLAGS"; then pkg_cv_OpenSSL_CFLAGS="$OpenSSL_CFLAGS" @@ -14818,7 +15432,7 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -14827,24 +15441,24 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - OpenSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libssl >= 0.9.8 libcrypto >= 0.9.8" 2>&1` + OpenSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libssl >= 0.9.8 libcrypto >= 0.9.8" 2>&1` else - OpenSSL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libssl >= 0.9.8 libcrypto >= 0.9.8" 2>&1` + OpenSSL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libssl >= 0.9.8 libcrypto >= 0.9.8" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$OpenSSL_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$OpenSSL_PKG_ERRORS" >&5 - cf_enable_openssl="no" + cf_enable_openssl="no" elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - cf_enable_openssl="no" + cf_enable_openssl="no" else - OpenSSL_CFLAGS=$pkg_cv_OpenSSL_CFLAGS - OpenSSL_LIBS=$pkg_cv_OpenSSL_LIBS + OpenSSL_CFLAGS=$pkg_cv_OpenSSL_CFLAGS + OpenSSL_LIBS=$pkg_cv_OpenSSL_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - cf_enable_openssl="yes" + cf_enable_openssl="yes" fi else cf_enable_openssl=no @@ -14944,7 +15558,7 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -14953,24 +15567,24 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - gnutls_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gnutls" 2>&1` + gnutls_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gnutls" 2>&1` else - gnutls_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gnutls" 2>&1` + gnutls_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gnutls" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$gnutls_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$gnutls_PKG_ERRORS" >&5 - cf_enable_gnutls="no" + cf_enable_gnutls="no" elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - cf_enable_gnutls="no" + cf_enable_gnutls="no" else - gnutls_CFLAGS=$pkg_cv_gnutls_CFLAGS - gnutls_LIBS=$pkg_cv_gnutls_LIBS + gnutls_CFLAGS=$pkg_cv_gnutls_CFLAGS + gnutls_LIBS=$pkg_cv_gnutls_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - cf_enable_gnutls="yes" + cf_enable_gnutls="yes" fi else cf_enable_gnutls=no @@ -15023,20 +15637,6 @@ $as_echo "no" >&6; } fi -if test "$is_mingw" = "yes"; then - -$as_echo "#define HAVE_WIN32 1" >>confdefs.h - -fi - - - - - - - - - # Check whether --enable-assert was given. @@ -15884,6 +16484,7 @@ macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`' macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`' pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' +shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`' SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' @@ -15911,6 +16512,7 @@ lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_q lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' +FILECMD='`$ECHO "$FILECMD" | $SED "$delay_single_quote_subst"`' OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' @@ -15919,6 +16521,7 @@ want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' +lt_ar_flags='`$ECHO "$lt_ar_flags" | $SED "$delay_single_quote_subst"`' AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' @@ -15933,10 +16536,13 @@ compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`' GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' +lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`' nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' +lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`' objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' @@ -16001,7 +16607,8 @@ finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`' finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' -sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' +configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`' +configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`' hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' @@ -16035,6 +16642,7 @@ LN_S \ lt_SP2NL \ lt_NL2SP \ reload_flag \ +FILECMD \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -16043,7 +16651,6 @@ want_nocaseglob \ DLLTOOL \ sharedlib_from_linklib_cmd \ AR \ -AR_FLAGS \ archiver_list_spec \ STRIP \ RANLIB \ @@ -16052,9 +16659,12 @@ CFLAGS \ compiler \ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ +lt_cv_sys_global_symbol_to_import \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ +lt_cv_nm_interface \ nm_file_list_spec \ +lt_cv_truncate_bin \ lt_prog_compiler_no_builtin_flag \ lt_prog_compiler_pic \ lt_prog_compiler_wl \ @@ -16089,7 +16699,7 @@ old_striplib \ striplib; do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -16116,10 +16726,11 @@ postinstall_cmds \ postuninstall_cmds \ finish_cmds \ sys_lib_search_path_spec \ -sys_lib_dlsearch_path_spec; do +configure_time_dlsearch_path \ +configure_time_lt_sys_library_path; do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -16128,19 +16739,16 @@ sys_lib_dlsearch_path_spec; do done ac_aux_dir='$ac_aux_dir' -xsi_shell='$xsi_shell' -lt_shell_append='$lt_shell_append' -# See if we are running on zsh, and set the options which allow our +# See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then +if test -n "\${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi PACKAGE='$PACKAGE' VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' RM='$RM' ofile='$ofile' @@ -16947,55 +17555,52 @@ $as_echo X"$file" | ;; "libtool":C) - # See if we are running on zsh, and set the options which allow our + # See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then + if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi - cfgfile="${ofile}T" + cfgfile=${ofile}T trap "$RM \"$cfgfile\"; exit 1" 1 2 15 $RM "$cfgfile" cat <<_LT_EOF >> "$cfgfile" #! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +# Generated automatically by $as_me ($PACKAGE) $VERSION # NOTE: Changes made to this file will be lost: look at ltmain.sh. + +# Provide generalized library-building support services. +# Written by Gordon Matzigkeit, 1996 + +# Copyright (C) 2014 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# GNU Libtool is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of of the License, or +# (at your option) any later version. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program or library that is built +# using GNU Libtool, you may include this file under the same +# distribution terms that you use for the rest of that program. # -# GNU Libtool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of +# GNU Libtool is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see . # The names of the tagged configurations supported by this script. -available_tags="" +available_tags='' + +# Configured defaults for sys_lib_dlsearch_path munging. +: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} # ### BEGIN LIBTOOL CONFIG @@ -17015,6 +17620,9 @@ pic_mode=$pic_mode # Whether or not to optimize for fast installation. fast_install=$enable_fast_install +# Shared archive member basename,for filename based shared library versioning on AIX. +shared_archive_member_spec=$shared_archive_member_spec + # Shell to use when invoking shell scripts. SHELL=$lt_SHELL @@ -17079,6 +17687,9 @@ to_host_file_cmd=$lt_cv_to_host_file_cmd # convert \$build files to toolchain format. to_tool_file_cmd=$lt_cv_to_tool_file_cmd +# A file(cmd) program that detects file types. +FILECMD=$lt_FILECMD + # An object symbol dumper. OBJDUMP=$lt_OBJDUMP @@ -17103,8 +17714,11 @@ sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd # The archiver. AR=$lt_AR +# Flags to create an archive (by configure). +lt_ar_flags=$lt_ar_flags + # Flags to create an archive. -AR_FLAGS=$lt_AR_FLAGS +AR_FLAGS=\${ARFLAGS-"\$lt_ar_flags"} # How to feed a file listing to the archiver. archiver_list_spec=$lt_archiver_list_spec @@ -17132,18 +17746,27 @@ global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe # Transform the output of nm in a proper C declaration. global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl +# Transform the output of nm into a list of symbols to manually relocate. +global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import + # Transform the output of nm in a C name address pair. global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix +# The name lister interface. +nm_interface=$lt_lt_cv_nm_interface + # Specify filename containing input files for \$NM. nm_file_list_spec=$lt_nm_file_list_spec -# The root where to search for dependent libraries,and in which our libraries should be installed. +# The root where to search for dependent libraries,and where our libraries should be installed. lt_sysroot=$lt_sysroot +# Command to truncate a binary pipe. +lt_truncate_bin=$lt_lt_cv_truncate_bin + # The name of the directory that contains temporary libtool files. objdir=$objdir @@ -17234,8 +17857,11 @@ hardcode_into_libs=$hardcode_into_libs # Compile-time system search path for libraries. sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -# Run-time system search path for libraries. -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec +# Detected run-time system search path for libraries. +sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path + +# Explicit LT_SYS_LIBRARY_PATH set during ./configure time. +configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path # Whether dlopen is supported. dlopen_support=$enable_dlopen @@ -17328,13 +17954,13 @@ hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes # DIR into the resulting binary. hardcode_direct=$hardcode_direct -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes # DIR into the resulting binary and the resulting library dependency is -# "absolute",i.e impossible to change by setting \${shlibpath_var} if the +# "absolute",i.e impossible to change by setting \$shlibpath_var if the # library is relocated. hardcode_direct_absolute=$hardcode_direct_absolute @@ -17384,6 +18010,65 @@ hardcode_action=$hardcode_action # ### END LIBTOOL CONFIG +_LT_EOF + + cat <<'_LT_EOF' >> "$cfgfile" + +# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE + +# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x$2 in + x) + ;; + *:) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\" + ;; + x:*) + eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" + ;; + *) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" + ;; + esac +} + + +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in $*""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} + + +# ### END FUNCTIONS SHARED WITH CONFIGURE + _LT_EOF case $host_os in @@ -17392,7 +18077,7 @@ _LT_EOF # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then +if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -17401,175 +18086,16 @@ _LT_EOF esac -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh # We use sed instead of cat because bash on DJGPP gets confused if # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" \ + $SED '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) - if test x"$xsi_shell" = xyes; then - sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -func_dirname ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_basename ()$/,/^} # func_basename /c\ -func_basename ()\ -{\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -func_dirname_and_basename ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -func_stripname ()\ -{\ -\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -\ # positional parameters, so assign one to ordinary parameter first.\ -\ func_stripname_result=${3}\ -\ func_stripname_result=${func_stripname_result#"${1}"}\ -\ func_stripname_result=${func_stripname_result%"${2}"}\ -} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -func_split_long_opt ()\ -{\ -\ func_split_long_opt_name=${1%%=*}\ -\ func_split_long_opt_arg=${1#*=}\ -} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -func_split_short_opt ()\ -{\ -\ func_split_short_opt_arg=${1#??}\ -\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -func_lo2o ()\ -{\ -\ case ${1} in\ -\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -\ *) func_lo2o_result=${1} ;;\ -\ esac\ -} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_xform ()$/,/^} # func_xform /c\ -func_xform ()\ -{\ - func_xform_result=${1%.*}.lo\ -} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_arith ()$/,/^} # func_arith /c\ -func_arith ()\ -{\ - func_arith_result=$(( $* ))\ -} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_len ()$/,/^} # func_len /c\ -func_len ()\ -{\ - func_len_result=${#1}\ -} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - -fi - -if test x"$lt_shell_append" = xyes; then - sed -e '/^func_append ()$/,/^} # func_append /c\ -func_append ()\ -{\ - eval "${1}+=\\${2}"\ -} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -func_append_quoted ()\ -{\ -\ func_quote_for_eval "${2}"\ -\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - # Save a `func_append' function call where possible by direct use of '+=' - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -else - # Save a `func_append' function call even when '+=' is not available - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -fi - -if test x"$_lt_function_replace_fail" = x":"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -fi - - mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" @@ -17608,14 +18134,6 @@ fi echo "#define RB_SIZEOF_TIME_T $rb_sizeof_time_t" >> $outfile echo "#define RB_SIZEOF_LONG $rb_sizeof_long" >> $outfile -if test "x$rb_windows_h" = "xyes"; then - echo '#define WIN32_LEAN_AND_MEAN 1' >> $outfile - echo '#include ' >> $outfile - echo '#include ' >> $outfile - echo '#include ' >> $outfile - echo '#include ' >> $outfile -fi - if test "x$rb_alloca_h" = "xyes"; then echo '#define RB_HAVE_ALLOCA_H 1' >> $outfile fi diff --git a/libratbox/configure.ac b/libratbox/configure.ac index 1fdb1756..93d63960 100644 --- a/libratbox/configure.ac +++ b/libratbox/configure.ac @@ -10,7 +10,7 @@ AUTOMAKE_OPTIONS = 1.10 saved_CFLAGS="$CFLAGS" dnl Sneaky way to get an Id tag into the configure script -AC_COPYRIGHT([$Id: configure.ac 29205 2015-12-09 20:08:43Z androsyn $]) +dnl AC_COPYRIGHT([$Id: configure.ac 29205 2015-12-09 20:08:43Z androsyn $]) AC_INIT([libratbox],[devel]) @@ -483,18 +483,6 @@ else fi -if test "$is_mingw" = "yes"; then - AC_DEFINE(HAVE_WIN32, [1], [Define to 1 if you are on windows]) -fi - - - - - - - - - dnl Debug-related options dnl ===================== @@ -591,14 +579,6 @@ fi echo "#define RB_SIZEOF_TIME_T $rb_sizeof_time_t" >> $outfile echo "#define RB_SIZEOF_LONG $rb_sizeof_long" >> $outfile -if test "x$rb_windows_h" = "xyes"; then - echo '#define WIN32_LEAN_AND_MEAN 1' >> $outfile - echo '#include ' >> $outfile - echo '#include ' >> $outfile - echo '#include ' >> $outfile - echo '#include ' >> $outfile -fi - if test "x$rb_alloca_h" = "xyes"; then echo '#define RB_HAVE_ALLOCA_H 1' >> $outfile fi diff --git a/libratbox/include/commio-int.h b/libratbox/include/commio-int.h index 9656f524..de0cd59b 100644 --- a/libratbox/include/commio-int.h +++ b/libratbox/include/commio-int.h @@ -32,12 +32,6 @@ #define FD_DESC_SZ 128 /* hostlen + comment */ -#ifdef _WIN32 -#define rb_get_errno() do { errno = WSAGetLastError(); WSASetLastError(errno); } while(0) -#else -#define rb_get_errno() -#endif - #define rb_hash_fd(x) (((unsigned long)x ^ ((unsigned long)x >> RB_FD_HASH_BITS) ^ ((unsigned long)x >> (RB_FD_HASH_BITS * 2))) & RB_FD_HASH_MASK) #ifdef HAVE_WRITEV diff --git a/libratbox/include/libratbox_config.h.in b/libratbox/include/libratbox_config.h.in index f8196793..a65e664c 100644 --- a/libratbox/include/libratbox_config.h.in +++ b/libratbox/include/libratbox_config.h.in @@ -231,9 +231,6 @@ /* Define to 1 if you have the `vsnprintf' function. */ #undef HAVE_VSNPRINTF -/* Define to 1 if you are on windows */ -#undef HAVE_WIN32 - /* Have WINSOCK_H */ #undef HAVE_WINSOCK2_H @@ -252,8 +249,7 @@ /* Have WS2TCPIP_H */ #undef HAVE_WS2TCPIP_H -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ +/* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR /* This is a MinGW system */ diff --git a/libratbox/include/ratbox_lib.h b/libratbox/include/ratbox_lib.h index 2b3509b6..cc986f1c 100644 --- a/libratbox/include/ratbox_lib.h +++ b/libratbox/include/ratbox_lib.h @@ -73,66 +73,6 @@ char *alloca(); #define rb_unlikely(x) (x) #endif - - -#ifdef _WIN32 -#include - -#ifndef MAXPATHLEN -#define MAXPATHLEN 128 -#endif - -#ifdef strerror -#undef strerror -#endif - -#define strerror(x) rb_strerror(x) -char *rb_strerror(int error); - - -#ifndef ENOBUFS -#define ENOBUFS WSAENOBUFS -#endif -#ifndef EINPROGRESS -#define EINPROGRESS WSAEINPROGRESS -#endif - -#ifndef EWOULDBLOCK -#define EWOULDBLOCK WSAEWOULDBLOCK -#endif -#ifndef EMSGSIZE -#define EMSGSIZE WSAEMSGSIZE -#endif -#ifndef EALREADY -#define EALREADY WSAEALREADY -#endif - -#ifndef EISCONN -#define EISCONN WSAEISCONN -#endif - -#ifndef EADDRINUSE -#define EADDRINUSE WSAEADDRINUSE -#endif -#ifndef EAFNOSUPPORT -#define EAFNOSUPPORT WSAEAFNOSUPPORT -#endif - -#define pipe(x) _pipe(x, 1024, O_BINARY) -#define ioctl(x,y,z) ioctlsocket(x,y, (u_long *)z) - -#ifndef WNOHANG -#define WNOHANG 1 -#endif - -#ifndef SIGKILL -#define SIGKILL SIGTERM -#endif - -#endif /* _WIN32 */ - - - #ifndef HOSTIPLEN #define HOSTIPLEN 53 #endif @@ -261,12 +201,6 @@ extern const char *libratbox_infotext[]; #endif #endif -#ifdef _WIN32 -#undef LIBRB_TT_FMT -#define LIBRB_TT_FMT "ld" -#endif - - #include #include diff --git a/libratbox/include/rb_commio.h b/libratbox/include/rb_commio.h index 7ce5fd76..2102c5ac 100644 --- a/libratbox/include/rb_commio.h +++ b/libratbox/include/rb_commio.h @@ -76,11 +76,7 @@ typedef enum _rb_tls_ver #define RB_FD_NONE 0x01 #define RB_FD_FILE 0x02 #define RB_FD_SOCKET 0x04 -#ifndef _WIN32 #define RB_FD_PIPE 0x08 -#else -#define RB_FD_PIPE RB_FD_SOCKET -#endif #define RB_FD_LISTEN 0x10 #define RB_FD_SSL 0x20 #define RB_FD_UNKNOWN 0x40 diff --git a/libratbox/ltmain.sh b/libratbox/ltmain.sh old mode 100644 new mode 100755 index bffda541..3846a506 --- a/libratbox/ltmain.sh +++ b/libratbox/ltmain.sh @@ -1,9 +1,12 @@ +#! /usr/bin/env sh +## DO NOT EDIT - This file generated from ./build-aux/ltmain.in +## by inline-source v2019-02-19.15 -# libtool (GNU libtool) 2.4.2 +# libtool (GNU libtool) 2.4.7 +# Provide generalized library-building support services. # Written by Gordon Matzigkeit , 1996 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1996-2019, 2021-2022 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -23,881 +26,2340 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, -# or obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see . -# Usage: $progname [OPTION]... [MODE-ARG]... -# -# Provide generalized library-building support services. -# -# --config show all configuration variables -# --debug enable verbose shell tracing -# -n, --dry-run display commands without modifying any files -# --features display basic configuration information and exit -# --mode=MODE use operation mode MODE -# --preserve-dup-deps don't remove duplicate dependency libraries -# --quiet, --silent don't print informational messages -# --no-quiet, --no-silent -# print informational messages (default) -# --no-warn don't display warning messages -# --tag=TAG use configuration variables from tag TAG -# -v, --verbose print more informational messages than default -# --no-verbose don't print the extra informational messages -# --version print version information -# -h, --help, --help-all print short, long, or detailed help message -# -# MODE must be one of the following: -# -# clean remove files from the build directory -# compile compile a source file into a libtool object -# execute automatically set library path, then run a program -# finish complete the installation of libtool libraries -# install install libraries or executables -# link create a library or an executable -# uninstall remove libraries from an installed directory + +PROGRAM=libtool +PACKAGE=libtool +VERSION="2.4.7 Debian-2.4.7-7~deb12u1" +package_revision=2.4.7 + + +## ------ ## +## Usage. ## +## ------ ## + +# Run './libtool --help' for help with using this script from the +# command line. + + +## ------------------------------- ## +## User overridable command paths. ## +## ------------------------------- ## + +# After configure completes, it has a better idea of some of the +# shell tools we need than the defaults used by the functions shared +# with bootstrap, so set those here where they can still be over- +# ridden by the user, but otherwise take precedence. + +: ${AUTOCONF="autoconf"} +: ${AUTOMAKE="automake"} + + +## -------------------------- ## +## Source external libraries. ## +## -------------------------- ## + +# Much of our low-level functionality needs to be sourced from external +# libraries, which are installed to $pkgauxdir. + +# Set a version string for this script. +scriptversion=2019-02-19.15; # UTC + +# General shell script boiler plate, and helper functions. +# Written by Gary V. Vaughan, 2004 + +# This is free software. There is NO warranty; not even for +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # -# MODE-ARGS vary depending on the MODE. When passed as first option, -# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. -# Try `$progname --help --mode=MODE' for a more detailed description of MODE. +# Copyright (C) 2004-2019, 2021 Bootstrap Authors # -# When reporting a bug, please describe a test case to reproduce it and -# include the following information: +# This file is dual licensed under the terms of the MIT license +# , and GPL version 2 or later +# . You must apply one of +# these licenses when using or redistributing this software or any of +# the files within it. See the URLs above, or the file `LICENSE` +# included in the Bootstrap distribution for the full license texts. + +# Please report bugs or propose patches to: +# + + +## ------ ## +## Usage. ## +## ------ ## + +# Evaluate this file near the top of your script to gain access to +# the functions and variables defined here: # -# host-triplet: $host -# shell: $SHELL -# compiler: $LTCC -# compiler flags: $LTCFLAGS -# linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.11 -# automake: $automake_version -# autoconf: $autoconf_version +# . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh # -# Report bugs to . -# GNU libtool home page: . -# General help using GNU software: . +# If you need to override any of the default environment variable +# settings, do that before evaluating this file. -PROGRAM=libtool -PACKAGE=libtool -VERSION="2.4.2 Debian-2.4.2-1.11" -TIMESTAMP="" -package_revision=1.3337 -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +## -------------------- ## +## Shell normalisation. ## +## -------------------- ## + +# Some shells need a little help to be as Bourne compatible as possible. +# Before doing anything else, make sure all that help has been provided! + +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh - -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -$1 -_LTECHO_EOF' -} -# NLS nuisances: We save the old values to restore during execute mode. -lt_user_locale= -lt_safe_locale= -for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES +# NLS nuisances: We save the old values in case they are required later. +_G_user_locale= +_G_safe_locale= +for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES do - eval "if test \"\${$lt_var+set}\" = set; then - save_$lt_var=\$$lt_var - $lt_var=C - export $lt_var - lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\" - lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" + eval "if test set = \"\${$_G_var+set}\"; then + save_$_G_var=\$$_G_var + $_G_var=C + export $_G_var + _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\" + _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\" fi" done +# These NLS vars are set unconditionally (bootstrap issue #24). Unset those +# in case the environment reset is needed later and the $save_* variant is not +# defined (see the code above). LC_ALL=C LANGUAGE=C export LANGUAGE LC_ALL -$lt_unset CDPATH - +# Make sure IFS has a sensible default +sp=' ' +nl=' +' +IFS="$sp $nl" + +# There are apparently some retarded systems that use ';' as a PATH separator! +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi -# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -# is ksh but when the shell is invoked as "sh" and the current value of -# the _XPG environment variable is not equal to 1 (one), the special -# positional parameter $0, within a function call, is the name of the -# function. -progpath="$0" +# func_unset VAR +# -------------- +# Portably unset VAR. +# In some shells, an 'unset VAR' statement leaves a non-zero return +# status if VAR is already unset, which might be problematic if the +# statement is used at the end of a function (thus poisoning its return +# value) or when 'set -e' is active (causing even a spurious abort of +# the script in this case). +func_unset () +{ + { eval $1=; (eval unset $1) >/dev/null 2>&1 && eval unset $1 || : ; } +} -: ${CP="cp -f"} -test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} -: ${MAKE="make"} -: ${MKDIR="mkdir"} -: ${MV="mv -f"} -: ${RM="rm -f"} -: ${SHELL="${CONFIG_SHELL-/bin/sh}"} -: ${Xsed="$SED -e 1s/^X//"} +# Make sure CDPATH doesn't cause `cd` commands to output the target dir. +func_unset CDPATH -# Global variables: -EXIT_SUCCESS=0 -EXIT_FAILURE=1 -EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. -EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. +# Make sure ${,E,F}GREP behave sanely. +func_unset GREP_OPTIONS -exit_status=$EXIT_SUCCESS -# Make sure IFS has a sensible default -lt_nl=' -' -IFS=" $lt_nl" +## ------------------------- ## +## Locate command utilities. ## +## ------------------------- ## -dirname="s,/[^/]*$,," -basename="s,^.*/,," -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () +# func_executable_p FILE +# ---------------------- +# Check that FILE is an executable regular file. +func_executable_p () { - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} # func_dirname may be replaced by extended shell implementation + test -f "$1" && test -x "$1" +} -# func_basename file -func_basename () +# func_path_progs PROGS_LIST CHECK_FUNC [PATH] +# -------------------------------------------- +# Search for either a program that responds to --version with output +# containing "GNU", or else returned by CHECK_FUNC otherwise, by +# trying all the directories in PATH with each of the elements of +# PROGS_LIST. +# +# CHECK_FUNC should accept the path to a candidate program, and +# set $func_check_prog_result if it truncates its output less than +# $_G_path_prog_max characters. +func_path_progs () { - func_basename_result=`$ECHO "${1}" | $SED "$basename"` -} # func_basename may be replaced by extended shell implementation + _G_progs_list=$1 + _G_check_func=$2 + _G_PATH=${3-"$PATH"} + + _G_path_prog_max=0 + _G_path_prog_found=false + _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:} + for _G_dir in $_G_PATH; do + IFS=$_G_save_IFS + test -z "$_G_dir" && _G_dir=. + for _G_prog_name in $_G_progs_list; do + for _exeext in '' .EXE; do + _G_path_prog=$_G_dir/$_G_prog_name$_exeext + func_executable_p "$_G_path_prog" || continue + case `"$_G_path_prog" --version 2>&1` in + *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;; + *) $_G_check_func $_G_path_prog + func_path_progs_result=$func_check_prog_result + ;; + esac + $_G_path_prog_found && break 3 + done + done + done + IFS=$_G_save_IFS + test -z "$func_path_progs_result" && { + echo "no acceptable sed could be found in \$PATH" >&2 + exit 1 + } +} -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function -# call: -# dirname: Compute the dirname of FILE. If nonempty, -# add APPEND to the result, otherwise set result -# to NONDIR_REPLACEMENT. -# value returned in "$func_dirname_result" -# basename: Compute filename of FILE. -# value retuned in "$func_basename_result" -# Implementation must be kept synchronized with func_dirname -# and func_basename. For efficiency, we do not delegate to -# those functions but instead duplicate the functionality here. -func_dirname_and_basename () -{ - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi - func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` -} # func_dirname_and_basename may be replaced by extended shell implementation +# We want to be able to use the functions in this file before configure +# has figured out where the best binaries are kept, which means we have +# to search for them ourselves - except when the results are already set +# where we skip the searches. +# Unless the user overrides by setting SED, search the path for either GNU +# sed, or the sed that truncates its output the least. +test -z "$SED" && { + _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for _G_i in 1 2 3 4 5 6 7; do + _G_sed_script=$_G_sed_script$nl$_G_sed_script + done + echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed + _G_sed_script= -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -} # func_stripname may be replaced by extended shell implementation + func_check_prog_sed () + { + _G_path_prog=$1 + _G_count=0 + printf 0123456789 >conftest.in + while : + do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo '' >> conftest.nl + "$_G_path_prog" -f conftest.sed conftest.out 2>/dev/null || break + diff conftest.out conftest.nl >/dev/null 2>&1 || break + _G_count=`expr $_G_count + 1` + if test "$_G_count" -gt "$_G_path_prog_max"; then + # Best one so far, save it but keep looking for a better one + func_check_prog_result=$_G_path_prog + _G_path_prog_max=$_G_count + fi + # 10*(2^10) chars as input seems more than enough + test 10 -lt "$_G_count" && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out + } -# These SED scripts presuppose an absolute path with a trailing slash. -pathcar='s,^/\([^/]*\).*$,\1,' -pathcdr='s,^/[^/]*,,' -removedotparts=':dotsl - s@/\./@/@g - t dotsl - s,/\.$,/,' -collapseslashes='s@/\{1,\}@/@g' -finalslash='s,/*$,/,' + func_path_progs "sed gsed" func_check_prog_sed "$PATH:/usr/xpg4/bin" + rm -f conftest.sed + SED=$func_path_progs_result +} -# func_normal_abspath PATH -# Remove doubled-up and trailing slashes, "." path components, -# and cancel out any ".." path components in PATH after making -# it an absolute path. -# value returned in "$func_normal_abspath_result" -func_normal_abspath () + +# Unless the user overrides by setting GREP, search the path for either GNU +# grep, or the grep that truncates its output the least. +test -z "$GREP" && { + func_check_prog_grep () + { + _G_path_prog=$1 + + _G_count=0 + _G_path_prog_max=0 + printf 0123456789 >conftest.in + while : + do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo 'GREP' >> conftest.nl + "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' conftest.out 2>/dev/null || break + diff conftest.out conftest.nl >/dev/null 2>&1 || break + _G_count=`expr $_G_count + 1` + if test "$_G_count" -gt "$_G_path_prog_max"; then + # Best one so far, save it but keep looking for a better one + func_check_prog_result=$_G_path_prog + _G_path_prog_max=$_G_count + fi + # 10*(2^10) chars as input seems more than enough + test 10 -lt "$_G_count" && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out + } + + func_path_progs "grep ggrep" func_check_prog_grep "$PATH:/usr/xpg4/bin" + GREP=$func_path_progs_result +} + + +## ------------------------------- ## +## User overridable command paths. ## +## ------------------------------- ## + +# All uppercase variable names are used for environment variables. These +# variables can be overridden by the user before calling a script that +# uses them if a suitable command of that name is not already available +# in the command search PATH. + +: ${CP="cp -f"} +: ${ECHO="printf %s\n"} +: ${EGREP="$GREP -E"} +: ${FGREP="$GREP -F"} +: ${LN_S="ln -s"} +: ${MAKE="make"} +: ${MKDIR="mkdir"} +: ${MV="mv -f"} +: ${RM="rm -f"} +: ${SHELL="${CONFIG_SHELL-/bin/sh}"} + + +## -------------------- ## +## Useful sed snippets. ## +## -------------------- ## + +sed_dirname='s|/[^/]*$||' +sed_basename='s|^.*/||' + +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +sed_quote_subst='s|\([`"$\\]\)|\\\1|g' + +# Same as above, but do not quote variable references. +sed_double_quote_subst='s/\(["`\\]\)/\\\1/g' + +# Sed substitution that turns a string into a regex matching for the +# string literally. +sed_make_literal_regex='s|[].[^$\\*\/]|\\&|g' + +# Sed substitution that converts a w32 file name or path +# that contains forward slashes, into one that contains +# (escaped) backslashes. A very naive implementation. +sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' + +# Re-'\' parameter expansions in output of sed_double_quote_subst that +# were '\'-ed in input to the same. If an odd number of '\' preceded a +# '$' in input to sed_double_quote_subst, that '$' was protected from +# expansion. Since each input '\' is now two '\'s, look for any number +# of runs of four '\'s followed by two '\'s and then a '$'. '\' that '$'. +_G_bs='\\' +_G_bs2='\\\\' +_G_bs4='\\\\\\\\' +_G_dollar='\$' +sed_double_backslash="\ + s/$_G_bs4/&\\ +/g + s/^$_G_bs2$_G_dollar/$_G_bs&/ + s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g + s/\n//g" + +# require_check_ifs_backslash +# --------------------------- +# Check if we can use backslash as IFS='\' separator, and set +# $check_ifs_backshlash_broken to ':' or 'false'. +require_check_ifs_backslash=func_require_check_ifs_backslash +func_require_check_ifs_backslash () { - # Start from root dir and reassemble the path. - func_normal_abspath_result= - func_normal_abspath_tpath=$1 - func_normal_abspath_altnamespace= - case $func_normal_abspath_tpath in - "") - # Empty path, that just means $cwd. - func_stripname '' '/' "`pwd`" - func_normal_abspath_result=$func_stripname_result - return - ;; - # The next three entries are used to spot a run of precisely - # two leading slashes without using negated character classes; - # we take advantage of case's first-match behaviour. - ///*) - # Unusual form of absolute path, do nothing. - ;; - //*) - # Not necessarily an ordinary path; POSIX reserves leading '//' - # and for example Cygwin uses it to access remote file shares - # over CIFS/SMB, so we conserve a leading double slash if found. - func_normal_abspath_altnamespace=/ + _G_save_IFS=$IFS + IFS='\' + _G_check_ifs_backshlash='a\\b' + for _G_i in $_G_check_ifs_backshlash + do + case $_G_i in + a) + check_ifs_backshlash_broken=false ;; - /*) - # Absolute path, do nothing. + '') + break ;; - *) - # Relative path, prepend $cwd. - func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath + *) + check_ifs_backshlash_broken=: + break ;; esac - # Cancel out all the simple stuff to save iterations. We also want - # the path to end with a slash for ease of parsing, so make sure - # there is one (and only one) here. - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` - while :; do - # Processed it all yet? - if test "$func_normal_abspath_tpath" = / ; then - # If we ascended to the root using ".." the result may be empty now. - if test -z "$func_normal_abspath_result" ; then - func_normal_abspath_result=/ - fi - break - fi - func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcar"` - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcdr"` - # Figure out what to do with it - case $func_normal_abspath_tcomponent in - "") - # Trailing empty path component, ignore it. - ;; - ..) - # Parent dir; strip last assembled component from result. - func_dirname "$func_normal_abspath_result" - func_normal_abspath_result=$func_dirname_result - ;; - *) - # Actual path component, append it. - func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent - ;; - esac done - # Restore leading double-slash if one was found on entry. - func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result + IFS=$_G_save_IFS + require_check_ifs_backslash=: } -# func_relative_path SRCDIR DSTDIR -# generates a relative path from SRCDIR to DSTDIR, with a trailing -# slash if non-empty, suitable for immediately appending a filename -# without needing to append a separator. -# value returned in "$func_relative_path_result" -func_relative_path () -{ - func_relative_path_result= - func_normal_abspath "$1" - func_relative_path_tlibdir=$func_normal_abspath_result - func_normal_abspath "$2" - func_relative_path_tbindir=$func_normal_abspath_result - - # Ascend the tree starting from libdir - while :; do - # check if we have found a prefix of bindir - case $func_relative_path_tbindir in - $func_relative_path_tlibdir) - # found an exact match - func_relative_path_tcancelled= - break - ;; - $func_relative_path_tlibdir*) - # found a matching prefix - func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" - func_relative_path_tcancelled=$func_stripname_result - if test -z "$func_relative_path_result"; then - func_relative_path_result=. - fi - break - ;; - *) - func_dirname $func_relative_path_tlibdir - func_relative_path_tlibdir=${func_dirname_result} - if test "x$func_relative_path_tlibdir" = x ; then - # Have to descend all the way to the root! - func_relative_path_result=../$func_relative_path_result - func_relative_path_tcancelled=$func_relative_path_tbindir - break - fi - func_relative_path_result=../$func_relative_path_result - ;; - esac - done - # Now calculate path; take care to avoid doubling-up slashes. - func_stripname '' '/' "$func_relative_path_result" - func_relative_path_result=$func_stripname_result - func_stripname '/' '/' "$func_relative_path_tcancelled" - if test "x$func_stripname_result" != x ; then - func_relative_path_result=${func_relative_path_result}/${func_stripname_result} - fi +## ----------------- ## +## Global variables. ## +## ----------------- ## - # Normalisation. If bindir is libdir, return empty string, - # else relative path ending with a slash; either way, target - # file name can be directly appended. - if test ! -z "$func_relative_path_result"; then - func_stripname './' '' "$func_relative_path_result/" - func_relative_path_result=$func_stripname_result - fi -} +# Except for the global variables explicitly listed below, the following +# functions in the '^func_' namespace, and the '^require_' namespace +# variables initialised in the 'Resource management' section, sourcing +# this file will not pollute your global namespace with anything +# else. There's no portable way to scope variables in Bourne shell +# though, so actually running these functions will sometimes place +# results into a variable named after the function, and often use +# temporary variables in the '^_G_' namespace. If you are careful to +# avoid using those namespaces casually in your sourcing script, things +# should continue to work as you expect. And, of course, you can freely +# overwrite any of the functions or variables defined here before +# calling anything to customize them. + +EXIT_SUCCESS=0 +EXIT_FAILURE=1 +EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. +EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. + +# Allow overriding, eg assuming that you follow the convention of +# putting '$debug_cmd' at the start of all your functions, you can get +# bash to show function call trace with: +# +# debug_cmd='echo "${FUNCNAME[0]} $*" >&2' bash your-script-name +debug_cmd=${debug_cmd-":"} +exit_cmd=: + +# By convention, finish your script with: +# +# exit $exit_status +# +# so that you can set exit_status to non-zero if you want to indicate +# something went wrong during execution without actually bailing out at +# the point of failure. +exit_status=$EXIT_SUCCESS -# The name of this program: -func_dirname_and_basename "$progpath" -progname=$func_basename_result +# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh +# is ksh but when the shell is invoked as "sh" and the current value of +# the _XPG environment variable is not equal to 1 (one), the special +# positional parameter $0, within a function call, is the name of the +# function. +progpath=$0 + +# The name of this program. +progname=`$ECHO "$progpath" |$SED "$sed_basename"` -# Make sure we have an absolute path for reexecution: +# Make sure we have an absolute progpath for reexecution: case $progpath in [\\/]*|[A-Za-z]:\\*) ;; *[\\/]*) - progdir=$func_dirname_result + progdir=`$ECHO "$progpath" |$SED "$sed_dirname"` progdir=`cd "$progdir" && pwd` - progpath="$progdir/$progname" + progpath=$progdir/$progname ;; *) - save_IFS="$IFS" + _G_IFS=$IFS IFS=${PATH_SEPARATOR-:} for progdir in $PATH; do - IFS="$save_IFS" + IFS=$_G_IFS test -x "$progdir/$progname" && break done - IFS="$save_IFS" + IFS=$_G_IFS test -n "$progdir" || progdir=`pwd` - progpath="$progdir/$progname" + progpath=$progdir/$progname ;; esac -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed="${SED}"' -e 1s/^X//' -sed_quote_subst='s/\([`"$\\]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\(["`\\]\)/\\\1/g' -# Sed substitution that turns a string into a regex matching for the -# string literally. -sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' +## ----------------- ## +## Standard options. ## +## ----------------- ## -# Sed substitution that converts a w32 file name or path -# which contains forward slashes, into one that contains -# (escaped) backslashes. A very naive implementation. -lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - -# Re-`\' parameter expansions in output of double_quote_subst that were -# `\'-ed in input to the same. If an odd number of `\' preceded a '$' -# in input to double_quote_subst, that '$' was protected from expansion. -# Since each input `\' is now two `\'s, look for any number of runs of -# four `\'s followed by two `\'s and then a '$'. `\' that '$'. -bs='\\' -bs2='\\\\' -bs4='\\\\\\\\' -dollar='\$' -sed_double_backslash="\ - s/$bs4/&\\ -/g - s/^$bs2$dollar/$bs&/ - s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g - s/\n//g" +# The following options affect the operation of the functions defined +# below, and should be set appropriately depending on run-time para- +# meters passed on the command line. -# Standard options: opt_dry_run=false -opt_help=false opt_quiet=false opt_verbose=false -opt_warning=: -# func_echo arg... -# Echo program name prefixed message, along with the current mode -# name if it has been set yet. -func_echo () -{ - $ECHO "$progname: ${opt_mode+$opt_mode: }$*" -} +# Categories 'all' and 'none' are always available. Append any others +# you will pass as the first argument to func_warning from your own +# code. +warning_categories= -# func_verbose arg... -# Echo program name prefixed message in verbose mode only. -func_verbose () -{ - $opt_verbose && func_echo ${1+"$@"} +# By default, display warnings according to 'opt_warning_types'. Set +# 'warning_func' to ':' to elide all warnings, or func_fatal_error to +# treat the next displayed warning as a fatal error. +warning_func=func_warn_and_continue - # A bug in bash halts the script if the last line of a function - # fails when set -e is in force, so we need another command to - # work around that: - : -} +# Set to 'all' to display all warnings, 'none' to suppress all +# warnings, or a space delimited list of some subset of +# 'warning_categories' to display only the listed warnings. +opt_warning_types=all -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "$*" -} -# func_error arg... -# Echo program name prefixed message to standard error. -func_error () -{ - $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 -} +## -------------------- ## +## Resource management. ## +## -------------------- ## -# func_warning arg... -# Echo program name prefixed warning message to standard error. -func_warning () -{ - $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 +# This section contains definitions for functions that each ensure a +# particular resource (a file, or a non-empty configuration variable for +# example) is available, and if appropriate to extract default values +# from pertinent package files. Call them using their associated +# 'require_*' variable to ensure that they are executed, at most, once. +# +# It's entirely deliberate that calling these functions can set +# variables that don't obey the namespace limitations obeyed by the rest +# of this file, in order that that they be as useful as possible to +# callers. - # bash bug again: - : -} -# func_fatal_error arg... -# Echo program name prefixed message to standard error, and exit. -func_fatal_error () +# require_term_colors +# ------------------- +# Allow display of bold text on terminals that support it. +require_term_colors=func_require_term_colors +func_require_term_colors () { - func_error ${1+"$@"} - exit $EXIT_FAILURE -} + $debug_cmd + + test -t 1 && { + # COLORTERM and USE_ANSI_COLORS environment variables take + # precedence, because most terminfo databases neglect to describe + # whether color sequences are supported. + test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"} + + if test 1 = "$USE_ANSI_COLORS"; then + # Standard ANSI escape sequences + tc_reset='' + tc_bold=''; tc_standout='' + tc_red=''; tc_green='' + tc_blue=''; tc_cyan='' + else + # Otherwise trust the terminfo database after all. + test -n "`tput sgr0 2>/dev/null`" && { + tc_reset=`tput sgr0` + test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold` + tc_standout=$tc_bold + test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso` + test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1` + test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2` + test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4` + test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5` + } + fi + } -# func_fatal_help arg... -# Echo program name prefixed message to standard error, followed by -# a help hint, and exit. -func_fatal_help () -{ - func_error ${1+"$@"} - func_fatal_error "$help" + require_term_colors=: } -help="Try \`$progname --help' for more information." ## default -# func_grep expression filename -# Check whether EXPRESSION matches any line of FILENAME, without output. -func_grep () -{ - $GREP "$1" "$2" >/dev/null 2>&1 -} +## ----------------- ## +## Function library. ## +## ----------------- ## +# This section contains a variety of useful functions to call in your +# scripts. Take note of the portable wrappers for features provided by +# some modern shells, which will fall back to slower equivalents on +# less featureful shells. -# func_mkdir_p directory-path -# Make sure the entire path to DIRECTORY-PATH is available. -func_mkdir_p () + +# func_append VAR VALUE +# --------------------- +# Append VALUE onto the existing contents of VAR. + + # _G_HAVE_PLUSEQ_OP + # Can be empty, in which case the shell is probed, "yes" if += is + # useable or anything else if it does not work. + if test -z "$_G_HAVE_PLUSEQ_OP" && \ + __PLUSEQ_TEST="a" && \ + __PLUSEQ_TEST+=" b" 2>/dev/null && \ + test "a b" = "$__PLUSEQ_TEST"; then + _G_HAVE_PLUSEQ_OP=yes + fi + +if test yes = "$_G_HAVE_PLUSEQ_OP" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_append () + { + $debug_cmd + + eval "$1+=\$2" + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_append () + { + $debug_cmd + + eval "$1=\$$1\$2" + } +fi + + +# func_append_quoted VAR VALUE +# ---------------------------- +# Quote VALUE and append to the end of shell variable VAR, separated +# by a space. +if test yes = "$_G_HAVE_PLUSEQ_OP"; then + eval 'func_append_quoted () + { + $debug_cmd + + func_quote_arg pretty "$2" + eval "$1+=\\ \$func_quote_arg_result" + }' +else + func_append_quoted () + { + $debug_cmd + + func_quote_arg pretty "$2" + eval "$1=\$$1\\ \$func_quote_arg_result" + } +fi + + +# func_append_uniq VAR VALUE +# -------------------------- +# Append unique VALUE onto the existing contents of VAR, assuming +# entries are delimited by the first character of VALUE. For example: +# +# func_append_uniq options " --another-option option-argument" +# +# will only append to $options if " --another-option option-argument " +# is not already present somewhere in $options already (note spaces at +# each end implied by leading space in second argument). +func_append_uniq () +{ + $debug_cmd + + eval _G_current_value='`$ECHO $'$1'`' + _G_delim=`expr "$2" : '\(.\)'` + + case $_G_delim$_G_current_value$_G_delim in + *"$2$_G_delim"*) ;; + *) func_append "$@" ;; + esac +} + + +# func_arith TERM... +# ------------------ +# Set func_arith_result to the result of evaluating TERMs. + test -z "$_G_HAVE_ARITH_OP" \ + && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \ + && _G_HAVE_ARITH_OP=yes + +if test yes = "$_G_HAVE_ARITH_OP"; then + eval 'func_arith () + { + $debug_cmd + + func_arith_result=$(( $* )) + }' +else + func_arith () + { + $debug_cmd + + func_arith_result=`expr "$@"` + } +fi + + +# func_basename FILE +# ------------------ +# Set func_basename_result to FILE with everything up to and including +# the last / stripped. +if test yes = "$_G_HAVE_XSI_OPS"; then + # If this shell supports suffix pattern removal, then use it to avoid + # forking. Hide the definitions single quotes in case the shell chokes + # on unsupported syntax... + _b='func_basename_result=${1##*/}' + _d='case $1 in + */*) func_dirname_result=${1%/*}$2 ;; + * ) func_dirname_result=$3 ;; + esac' + +else + # ...otherwise fall back to using sed. + _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`' + _d='func_dirname_result=`$ECHO "$1" |$SED "$sed_dirname"` + if test "X$func_dirname_result" = "X$1"; then + func_dirname_result=$3 + else + func_append func_dirname_result "$2" + fi' +fi + +eval 'func_basename () +{ + $debug_cmd + + '"$_b"' +}' + + +# func_dirname FILE APPEND NONDIR_REPLACEMENT +# ------------------------------------------- +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +eval 'func_dirname () +{ + $debug_cmd + + '"$_d"' +}' + + +# func_dirname_and_basename FILE APPEND NONDIR_REPLACEMENT +# -------------------------------------------------------- +# Perform func_basename and func_dirname in a single function +# call: +# dirname: Compute the dirname of FILE. If nonempty, +# add APPEND to the result, otherwise set result +# to NONDIR_REPLACEMENT. +# value returned in "$func_dirname_result" +# basename: Compute filename of FILE. +# value retuned in "$func_basename_result" +# For efficiency, we do not delegate to the functions above but instead +# duplicate the functionality here. +eval 'func_dirname_and_basename () +{ + $debug_cmd + + '"$_b"' + '"$_d"' +}' + + +# func_echo ARG... +# ---------------- +# Echo program name prefixed message. +func_echo () +{ + $debug_cmd + + _G_message=$* + + func_echo_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_IFS + $ECHO "$progname: $_G_line" + done + IFS=$func_echo_IFS +} + + +# func_echo_all ARG... +# -------------------- +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "$*" +} + + +# func_echo_infix_1 INFIX ARG... +# ------------------------------ +# Echo program name, followed by INFIX on the first line, with any +# additional lines not showing INFIX. +func_echo_infix_1 () +{ + $debug_cmd + + $require_term_colors + + _G_infix=$1; shift + _G_indent=$_G_infix + _G_prefix="$progname: $_G_infix: " + _G_message=$* + + # Strip color escape sequences before counting printable length + for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan" + do + test -n "$_G_tc" && { + _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"` + _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"` + } + done + _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`" " ## exclude from sc_prohibit_nested_quotes + + func_echo_infix_1_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_infix_1_IFS + $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2 + _G_prefix=$_G_indent + done + IFS=$func_echo_infix_1_IFS +} + + +# func_error ARG... +# ----------------- +# Echo program name prefixed message to standard error. +func_error () { - my_directory_path="$1" - my_dir_list= + $debug_cmd + + $require_term_colors - if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then + func_echo_infix_1 " $tc_standout${tc_red}error$tc_reset" "$*" >&2 +} + + +# func_fatal_error ARG... +# ----------------------- +# Echo program name prefixed message to standard error, and exit. +func_fatal_error () +{ + $debug_cmd - # Protect directory names starting with `-' - case $my_directory_path in - -*) my_directory_path="./$my_directory_path" ;; + func_error "$*" + exit $EXIT_FAILURE +} + + +# func_grep EXPRESSION FILENAME +# ----------------------------- +# Check whether EXPRESSION matches any line of FILENAME, without output. +func_grep () +{ + $debug_cmd + + $GREP "$1" "$2" >/dev/null 2>&1 +} + + +# func_len STRING +# --------------- +# Set func_len_result to the length of STRING. STRING may not +# start with a hyphen. + test -z "$_G_HAVE_XSI_OPS" \ + && (eval 'x=a/b/c; + test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ + && _G_HAVE_XSI_OPS=yes + +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_len () + { + $debug_cmd + + func_len_result=${#1} + }' +else + func_len () + { + $debug_cmd + + func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` + } +fi + + +# func_mkdir_p DIRECTORY-PATH +# --------------------------- +# Make sure the entire path to DIRECTORY-PATH is available. +func_mkdir_p () +{ + $debug_cmd + + _G_directory_path=$1 + _G_dir_list= + + if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then + + # Protect directory names starting with '-' + case $_G_directory_path in + -*) _G_directory_path=./$_G_directory_path ;; esac # While some portion of DIR does not yet exist... - while test ! -d "$my_directory_path"; do + while test ! -d "$_G_directory_path"; do # ...make a list in topmost first order. Use a colon delimited # list incase some portion of path contains whitespace. - my_dir_list="$my_directory_path:$my_dir_list" + _G_dir_list=$_G_directory_path:$_G_dir_list # If the last portion added has no slash in it, the list is done - case $my_directory_path in */*) ;; *) break ;; esac + case $_G_directory_path in */*) ;; *) break ;; esac # ...otherwise throw away the child directory and loop - my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` + _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"` done - my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` + _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'` - save_mkdir_p_IFS="$IFS"; IFS=':' - for my_dir in $my_dir_list; do - IFS="$save_mkdir_p_IFS" - # mkdir can fail with a `File exist' error if two processes + func_mkdir_p_IFS=$IFS; IFS=: + for _G_dir in $_G_dir_list; do + IFS=$func_mkdir_p_IFS + # mkdir can fail with a 'File exist' error if two processes # try to create one of the directories concurrently. Don't # stop in that case! - $MKDIR "$my_dir" 2>/dev/null || : + $MKDIR "$_G_dir" 2>/dev/null || : done - IFS="$save_mkdir_p_IFS" + IFS=$func_mkdir_p_IFS # Bail out if we (or some other process) failed to create a directory. - test -d "$my_directory_path" || \ - func_fatal_error "Failed to create \`$1'" + test -d "$_G_directory_path" || \ + func_fatal_error "Failed to create '$1'" fi } -# func_mktempdir [string] +# func_mktempdir [BASENAME] +# ------------------------- # Make a temporary directory that won't clash with other running # libtool processes, and avoids race conditions if possible. If -# given, STRING is the basename for that directory. +# given, BASENAME is the basename for that directory. func_mktempdir () { - my_template="${TMPDIR-/tmp}/${1-$progname}" + $debug_cmd - if test "$opt_dry_run" = ":"; then + _G_template=${TMPDIR-/tmp}/${1-$progname} + + if test : = "$opt_dry_run"; then # Return a directory name, but don't create it in dry-run mode - my_tmpdir="${my_template}-$$" + _G_tmpdir=$_G_template-$$ else # If mktemp works, use that first and foremost - my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` + _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null` - if test ! -d "$my_tmpdir"; then + if test ! -d "$_G_tmpdir"; then # Failing that, at least try and use $RANDOM to avoid a race - my_tmpdir="${my_template}-${RANDOM-0}$$" + _G_tmpdir=$_G_template-${RANDOM-0}$$ - save_mktempdir_umask=`umask` + func_mktempdir_umask=`umask` umask 0077 - $MKDIR "$my_tmpdir" - umask $save_mktempdir_umask + $MKDIR "$_G_tmpdir" + umask $func_mktempdir_umask fi # If we're not in dry-run mode, bomb out on failure - test -d "$my_tmpdir" || \ - func_fatal_error "cannot create temporary directory \`$my_tmpdir'" + test -d "$_G_tmpdir" || \ + func_fatal_error "cannot create temporary directory '$_G_tmpdir'" fi - $ECHO "$my_tmpdir" + $ECHO "$_G_tmpdir" } -# func_quote_for_eval arg -# Aesthetically quote ARG to be evaled later. -# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT -# is double-quoted, suitable for a subsequent eval, whereas -# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters -# which are still active within double quotes backslashified. -func_quote_for_eval () +# func_normal_abspath PATH +# ------------------------ +# Remove doubled-up and trailing slashes, "." path components, +# and cancel out any ".." path components in PATH after making +# it an absolute path. +func_normal_abspath () { - case $1 in - *[\\\`\"\$]*) - func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; + $debug_cmd + + # These SED scripts presuppose an absolute path with a trailing slash. + _G_pathcar='s|^/\([^/]*\).*$|\1|' + _G_pathcdr='s|^/[^/]*||' + _G_removedotparts=':dotsl + s|/\./|/|g + t dotsl + s|/\.$|/|' + _G_collapseslashes='s|/\{1,\}|/|g' + _G_finalslash='s|/*$|/|' + + # Start from root dir and reassemble the path. + func_normal_abspath_result= + func_normal_abspath_tpath=$1 + func_normal_abspath_altnamespace= + case $func_normal_abspath_tpath in + "") + # Empty path, that just means $cwd. + func_stripname '' '/' "`pwd`" + func_normal_abspath_result=$func_stripname_result + return + ;; + # The next three entries are used to spot a run of precisely + # two leading slashes without using negated character classes; + # we take advantage of case's first-match behaviour. + ///*) + # Unusual form of absolute path, do nothing. + ;; + //*) + # Not necessarily an ordinary path; POSIX reserves leading '//' + # and for example Cygwin uses it to access remote file shares + # over CIFS/SMB, so we conserve a leading double slash if found. + func_normal_abspath_altnamespace=/ + ;; + /*) + # Absolute path, do nothing. + ;; *) - func_quote_for_eval_unquoted_result="$1" ;; + # Relative path, prepend $cwd. + func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath + ;; esac - case $func_quote_for_eval_unquoted_result in - # Double-quote args containing shell metacharacters to delay - # word splitting, command substitution and and variable - # expansion for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly + # Cancel out all the simple stuff to save iterations. We also want + # the path to end with a slash for ease of parsing, so make sure + # there is one (and only one) here. + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_finalslash"` + while :; do + # Processed it all yet? + if test / = "$func_normal_abspath_tpath"; then + # If we ascended to the root using ".." the result may be empty now. + if test -z "$func_normal_abspath_result"; then + func_normal_abspath_result=/ + fi + break + fi + func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_pathcar"` + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_pathcdr"` + # Figure out what to do with it + case $func_normal_abspath_tcomponent in + "") + # Trailing empty path component, ignore it. + ;; + ..) + # Parent dir; strip last assembled component from result. + func_dirname "$func_normal_abspath_result" + func_normal_abspath_result=$func_dirname_result + ;; + *) + # Actual path component, append it. + func_append func_normal_abspath_result "/$func_normal_abspath_tcomponent" + ;; + esac + done + # Restore leading double-slash if one was found on entry. + func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result +} + + +# func_notquiet ARG... +# -------------------- +# Echo program name prefixed message only when not in quiet mode. +func_notquiet () +{ + $debug_cmd + + $opt_quiet || func_echo ${1+"$@"} + + # A bug in bash halts the script if the last line of a function + # fails when set -e is in force, so we need another command to + # work around that: + : +} + + +# func_relative_path SRCDIR DSTDIR +# -------------------------------- +# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR. +func_relative_path () +{ + $debug_cmd + + func_relative_path_result= + func_normal_abspath "$1" + func_relative_path_tlibdir=$func_normal_abspath_result + func_normal_abspath "$2" + func_relative_path_tbindir=$func_normal_abspath_result + + # Ascend the tree starting from libdir + while :; do + # check if we have found a prefix of bindir + case $func_relative_path_tbindir in + $func_relative_path_tlibdir) + # found an exact match + func_relative_path_tcancelled= + break + ;; + $func_relative_path_tlibdir*) + # found a matching prefix + func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" + func_relative_path_tcancelled=$func_stripname_result + if test -z "$func_relative_path_result"; then + func_relative_path_result=. + fi + break + ;; + *) + func_dirname $func_relative_path_tlibdir + func_relative_path_tlibdir=$func_dirname_result + if test -z "$func_relative_path_tlibdir"; then + # Have to descend all the way to the root! + func_relative_path_result=../$func_relative_path_result + func_relative_path_tcancelled=$func_relative_path_tbindir + break + fi + func_relative_path_result=../$func_relative_path_result + ;; + esac + done + + # Now calculate path; take care to avoid doubling-up slashes. + func_stripname '' '/' "$func_relative_path_result" + func_relative_path_result=$func_stripname_result + func_stripname '/' '/' "$func_relative_path_tcancelled" + if test -n "$func_stripname_result"; then + func_append func_relative_path_result "/$func_stripname_result" + fi + + # Normalisation. If bindir is libdir, return '.' else relative path. + if test -n "$func_relative_path_result"; then + func_stripname './' '' "$func_relative_path_result" + func_relative_path_result=$func_stripname_result + fi + + test -n "$func_relative_path_result" || func_relative_path_result=. + + : +} + + +# func_quote_portable EVAL ARG +# ---------------------------- +# Internal function to portably implement func_quote_arg. Note that we still +# keep attention to performance here so we as much as possible try to avoid +# calling sed binary (so far O(N) complexity as long as func_append is O(1)). +func_quote_portable () +{ + $debug_cmd + + $require_check_ifs_backslash + + func_quote_portable_result=$2 + + # one-time-loop (easy break) + while true + do + if $1; then + func_quote_portable_result=`$ECHO "$2" | $SED \ + -e "$sed_double_quote_subst" -e "$sed_double_backslash"` + break + fi + + # Quote for eval. + case $func_quote_portable_result in + *[\\\`\"\$]*) + # Fallback to sed for $func_check_bs_ifs_broken=:, or when the string + # contains the shell wildcard characters. + case $check_ifs_backshlash_broken$func_quote_portable_result in + :*|*[\[\*\?]*) + func_quote_portable_result=`$ECHO "$func_quote_portable_result" \ + | $SED "$sed_quote_subst"` + break + ;; + esac + + func_quote_portable_old_IFS=$IFS + for _G_char in '\' '`' '"' '$' + do + # STATE($1) PREV($2) SEPARATOR($3) + set start "" "" + func_quote_portable_result=dummy"$_G_char$func_quote_portable_result$_G_char"dummy + IFS=$_G_char + for _G_part in $func_quote_portable_result + do + case $1 in + quote) + func_append func_quote_portable_result "$3$2" + set quote "$_G_part" "\\$_G_char" + ;; + start) + set first "" "" + func_quote_portable_result= + ;; + first) + set quote "$_G_part" "" + ;; + esac + done + done + IFS=$func_quote_portable_old_IFS + ;; + *) ;; + esac + break + done + + func_quote_portable_unquoted_result=$func_quote_portable_result + case $func_quote_portable_result in + # double-quote args containing shell metacharacters to delay + # word splitting, command substitution and variable expansion + # for a subsequent eval. + # many bourne shells cannot handle close brackets correctly # in scan sets, so we specify it separately. *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\"" + func_quote_portable_result=\"$func_quote_portable_result\" + ;; + esac +} + + +# func_quotefast_eval ARG +# ----------------------- +# Quote one ARG (internal). This is equivalent to 'func_quote_arg eval ARG', +# but optimized for speed. Result is stored in $func_quotefast_eval. +if test xyes = `(x=; printf -v x %q yes; echo x"$x") 2>/dev/null`; then + printf -v _GL_test_printf_tilde %q '~' + if test '\~' = "$_GL_test_printf_tilde"; then + func_quotefast_eval () + { + printf -v func_quotefast_eval_result %q "$1" + } + else + # Broken older Bash implementations. Make those faster too if possible. + func_quotefast_eval () + { + case $1 in + '~'*) + func_quote_portable false "$1" + func_quotefast_eval_result=$func_quote_portable_result + ;; + *) + printf -v func_quotefast_eval_result %q "$1" + ;; + esac + } + fi +else + func_quotefast_eval () + { + func_quote_portable false "$1" + func_quotefast_eval_result=$func_quote_portable_result + } +fi + + +# func_quote_arg MODEs ARG +# ------------------------ +# Quote one ARG to be evaled later. MODEs argument may contain zero or more +# specifiers listed below separated by ',' character. This function returns two +# values: +# i) func_quote_arg_result +# double-quoted (when needed), suitable for a subsequent eval +# ii) func_quote_arg_unquoted_result +# has all characters that are still active within double +# quotes backslashified. Available only if 'unquoted' is specified. +# +# Available modes: +# ---------------- +# 'eval' (default) +# - escape shell special characters +# 'expand' +# - the same as 'eval'; but do not quote variable references +# 'pretty' +# - request aesthetic output, i.e. '"a b"' instead of 'a\ b'. This might +# be used later in func_quote to get output like: 'echo "a b"' instead +# of 'echo a\ b'. This is slower than default on some shells. +# 'unquoted' +# - produce also $func_quote_arg_unquoted_result which does not contain +# wrapping double-quotes. +# +# Examples for 'func_quote_arg pretty,unquoted string': +# +# string | *_result | *_unquoted_result +# ------------+-----------------------+------------------- +# " | \" | \" +# a b | "a b" | a b +# "a b" | "\"a b\"" | \"a b\" +# * | "*" | * +# z="${x-$y}" | "z=\"\${x-\$y}\"" | z=\"\${x-\$y}\" +# +# Examples for 'func_quote_arg pretty,unquoted,expand string': +# +# string | *_result | *_unquoted_result +# --------------+---------------------+-------------------- +# z="${x-$y}" | "z=\"${x-$y}\"" | z=\"${x-$y}\" +func_quote_arg () +{ + _G_quote_expand=false + case ,$1, in + *,expand,*) + _G_quote_expand=: + ;; + esac + + case ,$1, in + *,pretty,*|*,expand,*|*,unquoted,*) + func_quote_portable $_G_quote_expand "$2" + func_quote_arg_result=$func_quote_portable_result + func_quote_arg_unquoted_result=$func_quote_portable_unquoted_result ;; *) - func_quote_for_eval_result="$func_quote_for_eval_unquoted_result" + # Faster quote-for-eval for some shells. + func_quotefast_eval "$2" + func_quote_arg_result=$func_quotefast_eval_result + ;; + esac +} + + +# func_quote MODEs ARGs... +# ------------------------ +# Quote all ARGs to be evaled later and join them into single command. See +# func_quote_arg's description for more info. +func_quote () +{ + $debug_cmd + _G_func_quote_mode=$1 ; shift + func_quote_result= + while test 0 -lt $#; do + func_quote_arg "$_G_func_quote_mode" "$1" + if test -n "$func_quote_result"; then + func_append func_quote_result " $func_quote_arg_result" + else + func_append func_quote_result "$func_quote_arg_result" + fi + shift + done +} + + +# func_stripname PREFIX SUFFIX NAME +# --------------------------------- +# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_stripname () + { + $debug_cmd + + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are + # positional parameters, so assign one to ordinary variable first. + func_stripname_result=$3 + func_stripname_result=${func_stripname_result#"$1"} + func_stripname_result=${func_stripname_result%"$2"} + }' +else + func_stripname () + { + $debug_cmd + + case $2 in + .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;; + *) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;; + esac + } +fi + + +# func_show_eval CMD [FAIL_EXP] +# ----------------------------- +# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. +func_show_eval () +{ + $debug_cmd + + _G_cmd=$1 + _G_fail_exp=${2-':'} + + func_quote_arg pretty,expand "$_G_cmd" + eval "func_notquiet $func_quote_arg_result" + + $opt_dry_run || { + eval "$_G_cmd" + _G_status=$? + if test 0 -ne "$_G_status"; then + eval "(exit $_G_status); $_G_fail_exp" + fi + } +} + + +# func_show_eval_locale CMD [FAIL_EXP] +# ------------------------------------ +# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. Use the saved locale for evaluation. +func_show_eval_locale () +{ + $debug_cmd + + _G_cmd=$1 + _G_fail_exp=${2-':'} + + $opt_quiet || { + func_quote_arg expand,pretty "$_G_cmd" + eval "func_echo $func_quote_arg_result" + } + + $opt_dry_run || { + eval "$_G_user_locale + $_G_cmd" + _G_status=$? + eval "$_G_safe_locale" + if test 0 -ne "$_G_status"; then + eval "(exit $_G_status); $_G_fail_exp" + fi + } +} + + +# func_tr_sh +# ---------- +# Turn $1 into a string suitable for a shell variable name. +# Result is stored in $func_tr_sh_result. All characters +# not in the set a-zA-Z0-9_ are replaced with '_'. Further, +# if $1 begins with a digit, a '_' is prepended as well. +func_tr_sh () +{ + $debug_cmd + + case $1 in + [0-9]* | *[!a-zA-Z0-9_]*) + func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 's/[^a-zA-Z0-9_]/_/g'` + ;; + * ) + func_tr_sh_result=$1 + ;; esac } -# func_quote_for_expand arg -# Aesthetically quote ARG to be evaled later; same as above, -# but do not quote variable references. -func_quote_for_expand () +# func_verbose ARG... +# ------------------- +# Echo program name prefixed message in verbose mode only. +func_verbose () +{ + $debug_cmd + + $opt_verbose && func_echo "$*" + + : +} + + +# func_warn_and_continue ARG... +# ----------------------------- +# Echo program name prefixed warning message to standard error. +func_warn_and_continue () +{ + $debug_cmd + + $require_term_colors + + func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2 +} + + +# func_warning CATEGORY ARG... +# ---------------------------- +# Echo program name prefixed warning message to standard error. Warning +# messages can be filtered according to CATEGORY, where this function +# elides messages where CATEGORY is not listed in the global variable +# 'opt_warning_types'. +func_warning () +{ + $debug_cmd + + # CATEGORY must be in the warning_categories list! + case " $warning_categories " in + *" $1 "*) ;; + *) func_internal_error "invalid warning category '$1'" ;; + esac + + _G_category=$1 + shift + + case " $opt_warning_types " in + *" $_G_category "*) $warning_func ${1+"$@"} ;; + esac +} + + +# func_sort_ver VER1 VER2 +# ----------------------- +# 'sort -V' is not generally available. +# Note this deviates from the version comparison in automake +# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a +# but this should suffice as we won't be specifying old +# version formats or redundant trailing .0 in bootstrap.conf. +# If we did want full compatibility then we should probably +# use m4_version_compare from autoconf. +func_sort_ver () +{ + $debug_cmd + + printf '%s\n%s\n' "$1" "$2" \ + | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n +} + +# func_lt_ver PREV CURR +# --------------------- +# Return true if PREV and CURR are in the correct order according to +# func_sort_ver, otherwise false. Use it like this: +# +# func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..." +func_lt_ver () +{ + $debug_cmd + + test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q` +} + + +# Local variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" +# time-stamp-time-zone: "UTC" +# End: +#! /bin/sh + +# A portable, pluggable option parser for Bourne shell. +# Written by Gary V. Vaughan, 2010 + +# This is free software. There is NO warranty; not even for +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +# Copyright (C) 2010-2019, 2021 Bootstrap Authors +# +# This file is dual licensed under the terms of the MIT license +# , and GPL version 2 or later +# . You must apply one of +# these licenses when using or redistributing this software or any of +# the files within it. See the URLs above, or the file `LICENSE` +# included in the Bootstrap distribution for the full license texts. + +# Please report bugs or propose patches to: +# + +# Set a version string for this script. +scriptversion=2019-02-19.15; # UTC + + +## ------ ## +## Usage. ## +## ------ ## + +# This file is a library for parsing options in your shell scripts along +# with assorted other useful supporting features that you can make use +# of too. +# +# For the simplest scripts you might need only: +# +# #!/bin/sh +# . relative/path/to/funclib.sh +# . relative/path/to/options-parser +# scriptversion=1.0 +# func_options ${1+"$@"} +# eval set dummy "$func_options_result"; shift +# ...rest of your script... +# +# In order for the '--version' option to work, you will need to have a +# suitably formatted comment like the one at the top of this file +# starting with '# Written by ' and ending with '# Copyright'. +# +# For '-h' and '--help' to work, you will also need a one line +# description of your script's purpose in a comment directly above the +# '# Written by ' line, like the one at the top of this file. +# +# The default options also support '--debug', which will turn on shell +# execution tracing (see the comment above debug_cmd below for another +# use), and '--verbose' and the func_verbose function to allow your script +# to display verbose messages only when your user has specified +# '--verbose'. +# +# After sourcing this file, you can plug in processing for additional +# options by amending the variables from the 'Configuration' section +# below, and following the instructions in the 'Option parsing' +# section further down. + +## -------------- ## +## Configuration. ## +## -------------- ## + +# You should override these variables in your script after sourcing this +# file so that they reflect the customisations you have added to the +# option parser. + +# The usage line for option parsing errors and the start of '-h' and +# '--help' output messages. You can embed shell variables for delayed +# expansion at the time the message is displayed, but you will need to +# quote other shell meta-characters carefully to prevent them being +# expanded when the contents are evaled. +usage='$progpath [OPTION]...' + +# Short help message in response to '-h' and '--help'. Add to this or +# override it after sourcing this library to reflect the full set of +# options your script accepts. +usage_message="\ + --debug enable verbose shell tracing + -W, --warnings=CATEGORY + report the warnings falling in CATEGORY [all] + -v, --verbose verbosely report processing + --version print version information and exit + -h, --help print short or long help message and exit +" + +# Additional text appended to 'usage_message' in response to '--help'. +long_help_message=" +Warning categories include: + 'all' show all warnings + 'none' turn off all the warnings + 'error' warnings are treated as fatal errors" + +# Help message printed before fatal option parsing errors. +fatal_help="Try '\$progname --help' for more information." + + + +## ------------------------- ## +## Hook function management. ## +## ------------------------- ## + +# This section contains functions for adding, removing, and running hooks +# in the main code. A hook is just a list of function names that can be +# run in order later on. + +# func_hookable FUNC_NAME +# ----------------------- +# Declare that FUNC_NAME will run hooks added with +# 'func_add_hook FUNC_NAME ...'. +func_hookable () +{ + $debug_cmd + + func_append hookable_fns " $1" +} + + +# func_add_hook FUNC_NAME HOOK_FUNC +# --------------------------------- +# Request that FUNC_NAME call HOOK_FUNC before it returns. FUNC_NAME must +# first have been declared "hookable" by a call to 'func_hookable'. +func_add_hook () +{ + $debug_cmd + + case " $hookable_fns " in + *" $1 "*) ;; + *) func_fatal_error "'$1' does not accept hook functions." ;; + esac + + eval func_append ${1}_hooks '" $2"' +} + + +# func_remove_hook FUNC_NAME HOOK_FUNC +# ------------------------------------ +# Remove HOOK_FUNC from the list of hook functions to be called by +# FUNC_NAME. +func_remove_hook () +{ + $debug_cmd + + eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`' +} + + +# func_propagate_result FUNC_NAME_A FUNC_NAME_B +# --------------------------------------------- +# If the *_result variable of FUNC_NAME_A _is set_, assign its value to +# *_result variable of FUNC_NAME_B. +func_propagate_result () +{ + $debug_cmd + + func_propagate_result_result=: + if eval "test \"\${${1}_result+set}\" = set" + then + eval "${2}_result=\$${1}_result" + else + func_propagate_result_result=false + fi +} + + +# func_run_hooks FUNC_NAME [ARG]... +# --------------------------------- +# Run all hook functions registered to FUNC_NAME. +# It's assumed that the list of hook functions contains nothing more +# than a whitespace-delimited list of legal shell function names, and +# no effort is wasted trying to catch shell meta-characters or preserve +# whitespace. +func_run_hooks () +{ + $debug_cmd + + _G_rc_run_hooks=false + + case " $hookable_fns " in + *" $1 "*) ;; + *) func_fatal_error "'$1' does not support hook functions." ;; + esac + + eval _G_hook_fns=\$$1_hooks; shift + + for _G_hook in $_G_hook_fns; do + func_unset "${_G_hook}_result" + eval $_G_hook '${1+"$@"}' + func_propagate_result $_G_hook func_run_hooks + if $func_propagate_result_result; then + eval set dummy "$func_run_hooks_result"; shift + fi + done +} + + + +## --------------- ## +## Option parsing. ## +## --------------- ## + +# In order to add your own option parsing hooks, you must accept the +# full positional parameter list from your hook function. You may remove +# or edit any options that you action, and then pass back the remaining +# unprocessed options in '_result', escaped +# suitably for 'eval'. +# +# The '_result' variable is automatically unset +# before your hook gets called; for best performance, only set the +# *_result variable when necessary (i.e. don't call the 'func_quote' +# function unnecessarily because it can be an expensive operation on some +# machines). +# +# Like this: +# +# my_options_prep () +# { +# $debug_cmd +# +# # Extend the existing usage message. +# usage_message=$usage_message' +# -s, --silent don'\''t print informational messages +# ' +# # No change in '$@' (ignored completely by this hook). Leave +# # my_options_prep_result variable intact. +# } +# func_add_hook func_options_prep my_options_prep +# +# +# my_silent_option () +# { +# $debug_cmd +# +# args_changed=false +# +# # Note that, for efficiency, we parse as many options as we can +# # recognise in a loop before passing the remainder back to the +# # caller on the first unrecognised argument we encounter. +# while test $# -gt 0; do +# opt=$1; shift +# case $opt in +# --silent|-s) opt_silent=: +# args_changed=: +# ;; +# # Separate non-argument short options: +# -s*) func_split_short_opt "$_G_opt" +# set dummy "$func_split_short_opt_name" \ +# "-$func_split_short_opt_arg" ${1+"$@"} +# shift +# args_changed=: +# ;; +# *) # Make sure the first unrecognised option "$_G_opt" +# # is added back to "$@" in case we need it later, +# # if $args_changed was set to 'true'. +# set dummy "$_G_opt" ${1+"$@"}; shift; break ;; +# esac +# done +# +# # Only call 'func_quote' here if we processed at least one argument. +# if $args_changed; then +# func_quote eval ${1+"$@"} +# my_silent_option_result=$func_quote_result +# fi +# } +# func_add_hook func_parse_options my_silent_option +# +# +# my_option_validation () +# { +# $debug_cmd +# +# $opt_silent && $opt_verbose && func_fatal_help "\ +# '--silent' and '--verbose' options are mutually exclusive." +# } +# func_add_hook func_validate_options my_option_validation +# +# You'll also need to manually amend $usage_message to reflect the extra +# options you parse. It's preferable to append if you can, so that +# multiple option parsing hooks can be added safely. + + +# func_options_finish [ARG]... +# ---------------------------- +# Finishing the option parse loop (call 'func_options' hooks ATM). +func_options_finish () +{ + $debug_cmd + + func_run_hooks func_options ${1+"$@"} + func_propagate_result func_run_hooks func_options_finish +} + + +# func_options [ARG]... +# --------------------- +# All the functions called inside func_options are hookable. See the +# individual implementations for details. +func_hookable func_options +func_options () +{ + $debug_cmd + + _G_options_quoted=false + + for my_func in options_prep parse_options validate_options options_finish + do + func_unset func_${my_func}_result + func_unset func_run_hooks_result + eval func_$my_func '${1+"$@"}' + func_propagate_result func_$my_func func_options + if $func_propagate_result_result; then + eval set dummy "$func_options_result"; shift + _G_options_quoted=: + fi + done + + $_G_options_quoted || { + # As we (func_options) are top-level options-parser function and + # nobody quoted "$@" for us yet, we need to do it explicitly for + # caller. + func_quote eval ${1+"$@"} + func_options_result=$func_quote_result + } +} + + +# func_options_prep [ARG]... +# -------------------------- +# All initialisations required before starting the option parse loop. +# Note that when calling hook functions, we pass through the list of +# positional parameters. If a hook function modifies that list, and +# needs to propagate that back to rest of this script, then the complete +# modified list must be put in 'func_run_hooks_result' before returning. +func_hookable func_options_prep +func_options_prep () { - case $1 in - *[\\\`\"]*) - my_arg=`$ECHO "$1" | $SED \ - -e "$double_quote_subst" -e "$sed_double_backslash"` ;; - *) - my_arg="$1" ;; - esac + $debug_cmd - case $my_arg in - # Double-quote args containing shell metacharacters to delay - # word splitting and command substitution for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - my_arg="\"$my_arg\"" - ;; - esac + # Option defaults: + opt_verbose=false + opt_warning_types= - func_quote_for_expand_result="$my_arg" + func_run_hooks func_options_prep ${1+"$@"} + func_propagate_result func_run_hooks func_options_prep } -# func_show_eval cmd [fail_exp] -# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -# is given, then evaluate it. -func_show_eval () +# func_parse_options [ARG]... +# --------------------------- +# The main option parsing loop. +func_hookable func_parse_options +func_parse_options () { - my_cmd="$1" - my_fail_exp="${2-:}" + $debug_cmd + + _G_parse_options_requote=false + # this just eases exit handling + while test $# -gt 0; do + # Defer to hook functions for initial option parsing, so they + # get priority in the event of reusing an option name. + func_run_hooks func_parse_options ${1+"$@"} + func_propagate_result func_run_hooks func_parse_options + if $func_propagate_result_result; then + eval set dummy "$func_parse_options_result"; shift + # Even though we may have changed "$@", we passed the "$@" array + # down into the hook and it quoted it for us (because we are in + # this if-branch). No need to quote it again. + _G_parse_options_requote=false + fi - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" - } + # Break out of the loop if we already parsed every option. + test $# -gt 0 || break - if ${opt_dry_run-false}; then :; else - eval "$my_cmd" - my_status=$? - if test "$my_status" -eq 0; then :; else - eval "(exit $my_status); $my_fail_exp" + # We expect that one of the options parsed in this function matches + # and thus we remove _G_opt from "$@" and need to re-quote. + _G_match_parse_options=: + _G_opt=$1 + shift + case $_G_opt in + --debug|-x) debug_cmd='set -x' + func_echo "enabling shell trace mode" >&2 + $debug_cmd + ;; + + --no-warnings|--no-warning|--no-warn) + set dummy --warnings none ${1+"$@"} + shift + ;; + + --warnings|--warning|-W) + if test $# = 0 && func_missing_arg $_G_opt; then + _G_parse_options_requote=: + break + fi + case " $warning_categories $1" in + *" $1 "*) + # trailing space prevents matching last $1 above + func_append_uniq opt_warning_types " $1" + ;; + *all) + opt_warning_types=$warning_categories + ;; + *none) + opt_warning_types=none + warning_func=: + ;; + *error) + opt_warning_types=$warning_categories + warning_func=func_fatal_error + ;; + *) + func_fatal_error \ + "unsupported warning category: '$1'" + ;; + esac + shift + ;; + + --verbose|-v) opt_verbose=: ;; + --version) func_version ;; + -\?|-h) func_usage ;; + --help) func_help ;; + + # Separate optargs to long options (plugins may need this): + --*=*) func_split_equals "$_G_opt" + set dummy "$func_split_equals_lhs" \ + "$func_split_equals_rhs" ${1+"$@"} + shift + ;; + + # Separate optargs to short options: + -W*) + func_split_short_opt "$_G_opt" + set dummy "$func_split_short_opt_name" \ + "$func_split_short_opt_arg" ${1+"$@"} + shift + ;; + + # Separate non-argument short options: + -\?*|-h*|-v*|-x*) + func_split_short_opt "$_G_opt" + set dummy "$func_split_short_opt_name" \ + "-$func_split_short_opt_arg" ${1+"$@"} + shift + ;; + + --) _G_parse_options_requote=: ; break ;; + -*) func_fatal_help "unrecognised option: '$_G_opt'" ;; + *) set dummy "$_G_opt" ${1+"$@"}; shift + _G_match_parse_options=false + break + ;; + esac + + if $_G_match_parse_options; then + _G_parse_options_requote=: fi + done + + if $_G_parse_options_requote; then + # save modified positional parameters for caller + func_quote eval ${1+"$@"} + func_parse_options_result=$func_quote_result fi } -# func_show_eval_locale cmd [fail_exp] -# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -# is given, then evaluate it. Use the saved locale for evaluation. -func_show_eval_locale () +# func_validate_options [ARG]... +# ------------------------------ +# Perform any sanity checks on option settings and/or unconsumed +# arguments. +func_hookable func_validate_options +func_validate_options () { - my_cmd="$1" - my_fail_exp="${2-:}" + $debug_cmd - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" - } + # Display all warnings if -W was not given. + test -n "$opt_warning_types" || opt_warning_types=" $warning_categories" - if ${opt_dry_run-false}; then :; else - eval "$lt_user_locale - $my_cmd" - my_status=$? - eval "$lt_safe_locale" - if test "$my_status" -eq 0; then :; else - eval "(exit $my_status); $my_fail_exp" - fi - fi -} + func_run_hooks func_validate_options ${1+"$@"} + func_propagate_result func_run_hooks func_validate_options -# func_tr_sh -# Turn $1 into a string suitable for a shell variable name. -# Result is stored in $func_tr_sh_result. All characters -# not in the set a-zA-Z0-9_ are replaced with '_'. Further, -# if $1 begins with a digit, a '_' is prepended as well. -func_tr_sh () -{ - case $1 in - [0-9]* | *[!a-zA-Z0-9_]*) - func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` - ;; - * ) - func_tr_sh_result=$1 - ;; - esac + # Bail if the options were screwed! + $exit_cmd $EXIT_FAILURE } -# func_version -# Echo version message to standard output and exit. -func_version () -{ - $opt_debug - $SED -n '/(C)/!b go - :more - /\./!{ - N - s/\n# / / - b more - } - :go - /^# '$PROGRAM' (GNU /,/# warranty; / { - s/^# // - s/^# *$// - s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ - p - }' < "$progpath" - exit $? -} +## ----------------- ## +## Helper functions. ## +## ----------------- ## -# func_usage -# Echo short help message to standard output and exit. -func_usage () +# This section contains the helper functions used by the rest of the +# hookable option parser framework in ascii-betical order. + + +# func_fatal_help ARG... +# ---------------------- +# Echo program name prefixed message to standard error, followed by +# a help hint, and exit. +func_fatal_help () { - $opt_debug + $debug_cmd - $SED -n '/^# Usage:/,/^# *.*--help/ { - s/^# // - s/^# *$// - s/\$progname/'$progname'/ - p - }' < "$progpath" - echo - $ECHO "run \`$progname --help | more' for full usage" - exit $? + eval \$ECHO \""Usage: $usage"\" + eval \$ECHO \""$fatal_help"\" + func_error ${1+"$@"} + exit $EXIT_FAILURE } -# func_help [NOEXIT] -# Echo long help message to standard output and exit, -# unless 'noexit' is passed as argument. + +# func_help +# --------- +# Echo long help message to standard output and exit. func_help () { - $opt_debug - - $SED -n '/^# Usage:/,/# Report bugs to/ { - :print - s/^# // - s/^# *$// - s*\$progname*'$progname'* - s*\$host*'"$host"'* - s*\$SHELL*'"$SHELL"'* - s*\$LTCC*'"$LTCC"'* - s*\$LTCFLAGS*'"$LTCFLAGS"'* - s*\$LD*'"$LD"'* - s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ - p - d - } - /^# .* home page:/b print - /^# General help using/b print - ' < "$progpath" - ret=$? - if test -z "$1"; then - exit $ret - fi + $debug_cmd + + func_usage_message + $ECHO "$long_help_message" + exit 0 } -# func_missing_arg argname + +# func_missing_arg ARGNAME +# ------------------------ # Echo program name prefixed message to standard error and set global # exit_cmd. func_missing_arg () { - $opt_debug + $debug_cmd - func_error "missing argument for $1." + func_error "Missing argument for '$1'." exit_cmd=exit } -# func_split_short_opt shortopt +# func_split_equals STRING +# ------------------------ +# Set func_split_equals_lhs and func_split_equals_rhs shell variables +# after splitting STRING at the '=' sign. +test -z "$_G_HAVE_XSI_OPS" \ + && (eval 'x=a/b/c; + test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ + && _G_HAVE_XSI_OPS=yes + +if test yes = "$_G_HAVE_XSI_OPS" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_split_equals () + { + $debug_cmd + + func_split_equals_lhs=${1%%=*} + func_split_equals_rhs=${1#*=} + if test "x$func_split_equals_lhs" = "x$1"; then + func_split_equals_rhs= + fi + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_split_equals () + { + $debug_cmd + + func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'` + func_split_equals_rhs= + test "x$func_split_equals_lhs=" = "x$1" \ + || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'` + } +fi #func_split_equals + + +# func_split_short_opt SHORTOPT +# ----------------------------- # Set func_split_short_opt_name and func_split_short_opt_arg shell # variables after splitting SHORTOPT after the 2nd character. -func_split_short_opt () +if test yes = "$_G_HAVE_XSI_OPS" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_split_short_opt () + { + $debug_cmd + + func_split_short_opt_arg=${1#??} + func_split_short_opt_name=${1%"$func_split_short_opt_arg"} + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_split_short_opt () + { + $debug_cmd + + func_split_short_opt_name=`expr "x$1" : 'x\(-.\)'` + func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'` + } +fi #func_split_short_opt + + +# func_usage +# ---------- +# Echo short help message to standard output and exit. +func_usage () { - my_sed_short_opt='1s/^\(..\).*$/\1/;q' - my_sed_short_rest='1s/^..\(.*\)$/\1/;q' + $debug_cmd - func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` - func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` -} # func_split_short_opt may be replaced by extended shell implementation + func_usage_message + $ECHO "Run '$progname --help |${PAGER-more}' for full usage" + exit 0 +} -# func_split_long_opt longopt -# Set func_split_long_opt_name and func_split_long_opt_arg shell -# variables after splitting LONGOPT at the `=' sign. -func_split_long_opt () +# func_usage_message +# ------------------ +# Echo short help message to standard output. +func_usage_message () { - my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' - my_sed_long_arg='1s/^--[^=]*=//' + $debug_cmd + + eval \$ECHO \""Usage: $usage"\" + echo + $SED -n 's|^# || + /^Written by/{ + x;p;x + } + h + /^Written by/q' < "$progpath" + echo + eval \$ECHO \""$usage_message"\" +} - func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` - func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` -} # func_split_long_opt may be replaced by extended shell implementation -exit_cmd=: +# func_version +# ------------ +# Echo version message to standard output and exit. +# The version message is extracted from the calling file's header +# comments, with leading '# ' stripped: +# 1. First display the progname and version +# 2. Followed by the header comment line matching /^# Written by / +# 3. Then a blank line followed by the first following line matching +# /^# Copyright / +# 4. Immediately followed by any lines between the previous matches, +# except lines preceding the intervening completely blank line. +# For example, see the header comments of this file. +func_version () +{ + $debug_cmd + printf '%s\n' "$progname $scriptversion" + $SED -n ' + /^# Written by /!b + s|^# ||; p; n + :fwd2blnk + /./ { + n + b fwd2blnk + } + p; n + + :holdwrnt + s|^# || + s|^# *$|| + /^Copyright /!{ + /./H + n + b holdwrnt + } + s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2| + G + s|\(\n\)\n*|\1|g + p; q' < "$progpath" + exit $? +} -magic="%%%MAGIC variable%%%" -magic_exe="%%%MAGIC EXE variable%%%" -# Global variables. -nonopt= -preserve_args= -lo2o="s/\\.lo\$/.${objext}/" -o2lo="s/\\.${objext}\$/.lo/" -extracted_archives= -extracted_serial=0 +# Local variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-pattern: "30/scriptversion=%:y-%02m-%02d.%02H; # UTC" +# time-stamp-time-zone: "UTC" +# End: -# If this variable is set in any of the actions, the command in it -# will be execed at the end. This prevents here-documents from being -# left over by shells. -exec_cmd= +# Set a version string. +scriptversion='(GNU libtool) 2.4.7' -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "${1}=\$${1}\${2}" -} # func_append may be replaced by extended shell implementation -# func_append_quoted var value -# Quote VALUE and append to the end of shell variable VAR, separated -# by a space. -func_append_quoted () +# func_echo ARG... +# ---------------- +# Libtool also displays the current mode in messages, so override +# funclib.sh func_echo with this custom definition. +func_echo () { - func_quote_for_eval "${2}" - eval "${1}=\$${1}\\ \$func_quote_for_eval_result" -} # func_append_quoted may be replaced by extended shell implementation + $debug_cmd + _G_message=$* -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=`expr "${@}"` -} # func_arith may be replaced by extended shell implementation + func_echo_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_IFS + $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line" + done + IFS=$func_echo_IFS +} -# func_len string -# STRING may not start with a hyphen. -func_len () +# func_warning ARG... +# ------------------- +# Libtool warnings are not categorized, so override funclib.sh +# func_warning with this simpler definition. +func_warning () { - func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` -} # func_len may be replaced by extended shell implementation + $debug_cmd + $warning_func ${1+"$@"} +} -# func_lo2o object -func_lo2o () -{ - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -} # func_lo2o may be replaced by extended shell implementation +## ---------------- ## +## Options parsing. ## +## ---------------- ## + +# Hook in the functions to make sure our own options are parsed during +# the option parsing loop. + +usage='$progpath [OPTION]... [MODE-ARG]...' + +# Short help message in response to '-h'. +usage_message="Options: + --config show all configuration variables + --debug enable verbose shell tracing + -n, --dry-run display commands without modifying any files + --features display basic configuration information and exit + --mode=MODE use operation mode MODE + --no-warnings equivalent to '-Wnone' + --preserve-dup-deps don't remove duplicate dependency libraries + --quiet, --silent don't print informational messages + --tag=TAG use configuration variables from tag TAG + -v, --verbose print more informational messages than default + --version print version information + -W, --warnings=CATEGORY report the warnings falling in CATEGORY [all] + -h, --help, --help-all print short, long, or detailed help message +" -# func_xform libobj-or-source -func_xform () +# Additional text appended to 'usage_message' in response to '--help'. +func_help () { - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` -} # func_xform may be replaced by extended shell implementation + $debug_cmd + + func_usage_message + $ECHO "$long_help_message + +MODE must be one of the following: + + clean remove files from the build directory + compile compile a source file into a libtool object + execute automatically set library path, then run a program + finish complete the installation of libtool libraries + install install libraries or executables + link create a library or an executable + uninstall remove libraries from an installed directory + +MODE-ARGS vary depending on the MODE. When passed as first option, +'--mode=MODE' may be abbreviated as 'MODE' or a unique abbreviation of that. +Try '$progname --help --mode=MODE' for a more detailed description of MODE. + +When reporting a bug, please describe a test case to reproduce it and +include the following information: + + host-triplet: $host + shell: $SHELL + compiler: $LTCC + compiler flags: $LTCFLAGS + linker: $LD (gnu? $with_gnu_ld) + version: $progname $scriptversion Debian-2.4.7-7~deb12u1 + automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` + autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` + +Report bugs to . +GNU libtool home page: . +General help using GNU software: ." + exit 0 +} + + +# func_lo2o OBJECT-NAME +# --------------------- +# Transform OBJECT-NAME from a '.lo' suffix to the platform specific +# object suffix. + +lo2o=s/\\.lo\$/.$objext/ +o2lo=s/\\.$objext\$/.lo/ + +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_lo2o () + { + case $1 in + *.lo) func_lo2o_result=${1%.lo}.$objext ;; + * ) func_lo2o_result=$1 ;; + esac + }' + + # func_xform LIBOBJ-OR-SOURCE + # --------------------------- + # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise) + # suffix to a '.lo' libtool-object suffix. + eval 'func_xform () + { + func_xform_result=${1%.*}.lo + }' +else + # ...otherwise fall back to using sed. + func_lo2o () + { + func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"` + } + + func_xform () + { + func_xform_result=`$ECHO "$1" | $SED 's|\.[^.]*$|.lo|'` + } +fi -# func_fatal_configuration arg... +# func_fatal_configuration ARG... +# ------------------------------- # Echo program name prefixed message to standard error, followed by # a configuration failure hint, and exit. func_fatal_configuration () { - func_error ${1+"$@"} - func_error "See the $PACKAGE documentation for more information." - func_fatal_error "Fatal configuration error." + func_fatal_error ${1+"$@"} \ + "See the $PACKAGE documentation for more information." \ + "Fatal configuration error." } # func_config +# ----------- # Display the configuration for all the tags in this script. func_config () { @@ -915,17 +2377,19 @@ func_config () exit $? } + # func_features +# ------------- # Display the features supported by this script. func_features () { echo "host: $host" - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then echo "enable shared libraries" else echo "disable shared libraries" fi - if test "$build_old_libs" = yes; then + if test yes = "$build_old_libs"; then echo "enable static libraries" else echo "disable static libraries" @@ -934,314 +2398,367 @@ func_features () exit $? } -# func_enable_tag tagname + +# func_enable_tag TAGNAME +# ----------------------- # Verify that TAGNAME is valid, and either flag an error and exit, or # enable the TAGNAME tag. We also add TAGNAME to the global $taglist # variable here. func_enable_tag () { - # Global variable: - tagname="$1" + # Global variable: + tagname=$1 - re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" - re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" - sed_extractcf="/$re_begincf/,/$re_endcf/p" + re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" + re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" + sed_extractcf=/$re_begincf/,/$re_endcf/p - # Validate tagname. - case $tagname in - *[!-_A-Za-z0-9,/]*) - func_fatal_error "invalid tag name: $tagname" - ;; - esac + # Validate tagname. + case $tagname in + *[!-_A-Za-z0-9,/]*) + func_fatal_error "invalid tag name: $tagname" + ;; + esac - # Don't test for the "default" C tag, as we know it's - # there but not specially marked. - case $tagname in - CC) ;; + # Don't test for the "default" C tag, as we know it's + # there but not specially marked. + case $tagname in + CC) ;; *) - if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then - taglist="$taglist $tagname" - - # Evaluate the configuration. Be careful to quote the path - # and the sed script, to avoid splitting on whitespace, but - # also don't use non-portable quotes within backquotes within - # quotes we have to do it in 2 steps: - extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` - eval "$extractedcf" - else - func_error "ignoring unknown tag $tagname" - fi - ;; - esac + if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then + taglist="$taglist $tagname" + + # Evaluate the configuration. Be careful to quote the path + # and the sed script, to avoid splitting on whitespace, but + # also don't use non-portable quotes within backquotes within + # quotes we have to do it in 2 steps: + extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` + eval "$extractedcf" + else + func_error "ignoring unknown tag $tagname" + fi + ;; + esac } + # func_check_version_match +# ------------------------ # Ensure that we are using m4 macros, and libtool script from the same # release of libtool. func_check_version_match () { - if test "$package_revision" != "$macro_revision"; then - if test "$VERSION" != "$macro_version"; then - if test -z "$macro_version"; then - cat >&2 <<_LT_EOF + if test "$package_revision" != "$macro_revision"; then + if test "$VERSION" != "$macro_version"; then + if test -z "$macro_version"; then + cat >&2 <<_LT_EOF $progname: Version mismatch error. This is $PACKAGE $VERSION, but the $progname: definition of this LT_INIT comes from an older release. $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION $progname: and run autoconf again. _LT_EOF - else - cat >&2 <<_LT_EOF + else + cat >&2 <<_LT_EOF $progname: Version mismatch error. This is $PACKAGE $VERSION, but the $progname: definition of this LT_INIT comes from $PACKAGE $macro_version. $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION $progname: and run autoconf again. _LT_EOF - fi - else - cat >&2 <<_LT_EOF + fi + else + cat >&2 <<_LT_EOF $progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, $progname: but the definition of this LT_INIT comes from revision $macro_revision. $progname: You should recreate aclocal.m4 with macros from revision $package_revision $progname: of $PACKAGE $VERSION and run autoconf again. _LT_EOF - fi + fi - exit $EXIT_MISMATCH - fi + exit $EXIT_MISMATCH + fi } -# Shorthand for --mode=foo, only valid as the first argument -case $1 in -clean|clea|cle|cl) - shift; set dummy --mode clean ${1+"$@"}; shift - ;; -compile|compil|compi|comp|com|co|c) - shift; set dummy --mode compile ${1+"$@"}; shift - ;; -execute|execut|execu|exec|exe|ex|e) - shift; set dummy --mode execute ${1+"$@"}; shift - ;; -finish|finis|fini|fin|fi|f) - shift; set dummy --mode finish ${1+"$@"}; shift - ;; -install|instal|insta|inst|ins|in|i) - shift; set dummy --mode install ${1+"$@"}; shift - ;; -link|lin|li|l) - shift; set dummy --mode link ${1+"$@"}; shift - ;; -uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) - shift; set dummy --mode uninstall ${1+"$@"}; shift - ;; -esac +# libtool_options_prep [ARG]... +# ----------------------------- +# Preparation for options parsed by libtool. +libtool_options_prep () +{ + $debug_mode + # Option defaults: + opt_config=false + opt_dlopen= + opt_dry_run=false + opt_help=false + opt_mode= + opt_preserve_dup_deps=false + opt_quiet=false + nonopt= + preserve_args= -# Option defaults: -opt_debug=: -opt_dry_run=false -opt_config=false -opt_preserve_dup_deps=false -opt_features=false -opt_finish=false -opt_help=false -opt_help_all=false -opt_silent=: -opt_warning=: -opt_verbose=: -opt_silent=false -opt_verbose=false + _G_rc_lt_options_prep=: + _G_rc_lt_options_prep=: -# Parse options once, thoroughly. This comes as soon as possible in the -# script to make things like `--version' happen as quickly as we can. -{ - # this just eases exit handling - while test $# -gt 0; do - opt="$1" - shift - case $opt in - --debug|-x) opt_debug='set -x' - func_echo "enabling shell trace mode" - $opt_debug - ;; - --dry-run|--dryrun|-n) - opt_dry_run=: - ;; - --config) - opt_config=: -func_config - ;; - --dlopen|-dlopen) - optarg="$1" - opt_dlopen="${opt_dlopen+$opt_dlopen -}$optarg" - shift - ;; - --preserve-dup-deps) - opt_preserve_dup_deps=: - ;; - --features) - opt_features=: -func_features - ;; - --finish) - opt_finish=: -set dummy --mode finish ${1+"$@"}; shift - ;; - --help) - opt_help=: - ;; - --help-all) - opt_help_all=: -opt_help=': help-all' - ;; - --mode) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_mode="$optarg" -case $optarg in - # Valid mode arguments: - clean|compile|execute|finish|install|link|relink|uninstall) ;; - - # Catch anything else as an error - *) func_error "invalid argument for $opt" - exit_cmd=exit - break - ;; -esac - shift - ;; - --no-silent|--no-quiet) - opt_silent=false -func_append preserve_args " $opt" - ;; - --no-warning|--no-warn) - opt_warning=false -func_append preserve_args " $opt" - ;; - --no-verbose) - opt_verbose=false -func_append preserve_args " $opt" - ;; - --silent|--quiet) - opt_silent=: -func_append preserve_args " $opt" - opt_verbose=false - ;; - --verbose|-v) - opt_verbose=: -func_append preserve_args " $opt" -opt_silent=false - ;; - --tag) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_tag="$optarg" -func_append preserve_args " $opt $optarg" -func_enable_tag "$optarg" - shift - ;; - - -\?|-h) func_usage ;; - --help) func_help ;; - --version) func_version ;; - - # Separate optargs to long options: - --*=*) - func_split_long_opt "$opt" - set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} - shift - ;; - - # Separate non-argument short options: - -\?*|-h*|-n*|-v*) - func_split_short_opt "$opt" - set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} - shift - ;; - - --) break ;; - -*) func_fatal_help "unrecognized option \`$opt'" ;; - *) set dummy "$opt" ${1+"$@"}; shift; break ;; + # Shorthand for --mode=foo, only valid as the first argument + case $1 in + clean|clea|cle|cl) + shift; set dummy --mode clean ${1+"$@"}; shift + ;; + compile|compil|compi|comp|com|co|c) + shift; set dummy --mode compile ${1+"$@"}; shift + ;; + execute|execut|execu|exec|exe|ex|e) + shift; set dummy --mode execute ${1+"$@"}; shift + ;; + finish|finis|fini|fin|fi|f) + shift; set dummy --mode finish ${1+"$@"}; shift + ;; + install|instal|insta|inst|ins|in|i) + shift; set dummy --mode install ${1+"$@"}; shift + ;; + link|lin|li|l) + shift; set dummy --mode link ${1+"$@"}; shift + ;; + uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) + shift; set dummy --mode uninstall ${1+"$@"}; shift + ;; + *) + _G_rc_lt_options_prep=false + ;; esac - done - # Validate options: + if $_G_rc_lt_options_prep; then + # Pass back the list of options. + func_quote eval ${1+"$@"} + libtool_options_prep_result=$func_quote_result + fi +} +func_add_hook func_options_prep libtool_options_prep - # save first non-option argument - if test "$#" -gt 0; then - nonopt="$opt" - shift - fi - # preserve --debug - test "$opt_debug" = : || func_append preserve_args " --debug" +# libtool_parse_options [ARG]... +# --------------------------------- +# Provide handling for libtool specific options. +libtool_parse_options () +{ + $debug_cmd - case $host in - *cygwin* | *mingw* | *pw32* | *cegcc*) - # don't eliminate duplications in $postdeps and $predeps - opt_duplicate_compiler_generated_deps=: - ;; - *) - opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps - ;; - esac + _G_rc_lt_parse_options=false - $opt_help || { - # Sanity checks first: - func_check_version_match + # Perform our own loop to consume as many options as possible in + # each iteration. + while test $# -gt 0; do + _G_match_lt_parse_options=: + _G_opt=$1 + shift + case $_G_opt in + --dry-run|--dryrun|-n) + opt_dry_run=: + ;; + + --config) func_config ;; + + --dlopen|-dlopen) + opt_dlopen="${opt_dlopen+$opt_dlopen +}$1" + shift + ;; + + --preserve-dup-deps) + opt_preserve_dup_deps=: ;; + + --features) func_features ;; + + --finish) set dummy --mode finish ${1+"$@"}; shift ;; + + --help) opt_help=: ;; + + --help-all) opt_help=': help-all' ;; + + --mode) test $# = 0 && func_missing_arg $_G_opt && break + opt_mode=$1 + case $1 in + # Valid mode arguments: + clean|compile|execute|finish|install|link|relink|uninstall) ;; + + # Catch anything else as an error + *) func_error "invalid argument for $_G_opt" + exit_cmd=exit + break + ;; + esac + shift + ;; + + --no-silent|--no-quiet) + opt_quiet=false + func_append preserve_args " $_G_opt" + ;; + + --no-warnings|--no-warning|--no-warn) + opt_warning=false + func_append preserve_args " $_G_opt" + ;; + + --no-verbose) + opt_verbose=false + func_append preserve_args " $_G_opt" + ;; + + --silent|--quiet) + opt_quiet=: + opt_verbose=false + func_append preserve_args " $_G_opt" + ;; + + --tag) test $# = 0 && func_missing_arg $_G_opt && break + opt_tag=$1 + func_append preserve_args " $_G_opt $1" + func_enable_tag "$1" + shift + ;; + + --verbose|-v) opt_quiet=false + opt_verbose=: + func_append preserve_args " $_G_opt" + ;; + + # An option not handled by this hook function: + *) set dummy "$_G_opt" ${1+"$@"} ; shift + _G_match_lt_parse_options=false + break + ;; + esac + $_G_match_lt_parse_options && _G_rc_lt_parse_options=: + done - if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then - func_fatal_configuration "not configured to build any kind of library" + if $_G_rc_lt_parse_options; then + # save modified positional parameters for caller + func_quote eval ${1+"$@"} + libtool_parse_options_result=$func_quote_result fi +} +func_add_hook func_parse_options libtool_parse_options - # Darwin sucks - eval std_shrext=\"$shrext_cmds\" - # Only execute mode is allowed to have -dlopen flags. - if test -n "$opt_dlopen" && test "$opt_mode" != execute; then - func_error "unrecognized option \`-dlopen'" - $ECHO "$help" 1>&2 - exit $EXIT_FAILURE + +# libtool_validate_options [ARG]... +# --------------------------------- +# Perform any sanity checks on option settings and/or unconsumed +# arguments. +libtool_validate_options () +{ + # save first non-option argument + if test 0 -lt $#; then + nonopt=$1 + shift fi - # Change the help message to a mode-specific one. - generic_help="$help" - help="Try \`$progname --help --mode=$opt_mode' for more information." - } + # preserve --debug + test : = "$debug_cmd" || func_append preserve_args " --debug" + + case $host in + # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452 + # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788 + *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*) + # don't eliminate duplications in $postdeps and $predeps + opt_duplicate_compiler_generated_deps=: + ;; + *) + opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps + ;; + esac + + $opt_help || { + # Sanity checks first: + func_check_version_match + + test yes != "$build_libtool_libs" \ + && test yes != "$build_old_libs" \ + && func_fatal_configuration "not configured to build any kind of library" + # Darwin sucks + eval std_shrext=\"$shrext_cmds\" + + # Only execute mode is allowed to have -dlopen flags. + if test -n "$opt_dlopen" && test execute != "$opt_mode"; then + func_error "unrecognized option '-dlopen'" + $ECHO "$help" 1>&2 + exit $EXIT_FAILURE + fi + + # Change the help message to a mode-specific one. + generic_help=$help + help="Try '$progname --help --mode=$opt_mode' for more information." + } - # Bail if the options were screwed - $exit_cmd $EXIT_FAILURE + # Pass back the unparsed argument list + func_quote eval ${1+"$@"} + libtool_validate_options_result=$func_quote_result } +func_add_hook func_validate_options libtool_validate_options +# Process options as early as possible so that --help and --version +# can return quickly. +func_options ${1+"$@"} +eval set dummy "$func_options_result"; shift + ## ----------- ## ## Main. ## ## ----------- ## +magic='%%%MAGIC variable%%%' +magic_exe='%%%MAGIC EXE variable%%%' + +# Global variables. +extracted_archives= +extracted_serial=0 + +# If this variable is set in any of the actions, the command in it +# will be execed at the end. This prevents here-documents from being +# left over by shells. +exec_cmd= + + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' +} + +# func_generated_by_libtool +# True iff stdin has been generated by Libtool. This function is only +# a basic sanity check; it will hardly flush out determined imposters. +func_generated_by_libtool_p () +{ + $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 +} + # func_lalib_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. +# True iff FILE is a libtool '.la' library or '.lo' object file. # This function is only a basic sanity check; it will hardly flush out # determined imposters. func_lalib_p () { test -f "$1" && - $SED -e 4q "$1" 2>/dev/null \ - | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 + $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p } # func_lalib_unsafe_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. +# True iff FILE is a libtool '.la' library or '.lo' object file. # This function implements the same check as func_lalib_p without # resorting to external programs. To this end, it redirects stdin and # closes it afterwards, without saving the original file descriptor. # As a safety measure, use it only where a negative result would be -# fatal anyway. Works if `file' does not exist. +# fatal anyway. Works if 'file' does not exist. func_lalib_unsafe_p () { lalib_p=no @@ -1249,13 +2766,13 @@ func_lalib_unsafe_p () for lalib_p_l in 1 2 3 4 do read lalib_p_line - case "$lalib_p_line" in + case $lalib_p_line in \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;; esac done exec 0<&5 5<&- fi - test "$lalib_p" = yes + test yes = "$lalib_p" } # func_ltwrapper_script_p file @@ -1264,7 +2781,8 @@ func_lalib_unsafe_p () # determined imposters. func_ltwrapper_script_p () { - func_lalib_p "$1" + test -f "$1" && + $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p } # func_ltwrapper_executable_p file @@ -1289,7 +2807,7 @@ func_ltwrapper_scriptname () { func_dirname_and_basename "$1" "" "." func_stripname '' '.exe' "$func_basename_result" - func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" + func_ltwrapper_scriptname_result=$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper } # func_ltwrapper_p file @@ -1308,11 +2826,13 @@ func_ltwrapper_p () # FAIL_CMD may read-access the current command in variable CMD! func_execute_cmds () { - $opt_debug + $debug_cmd + save_ifs=$IFS; IFS='~' for cmd in $1; do - IFS=$save_ifs + IFS=$sp$nl eval cmd=\"$cmd\" + IFS=$save_ifs func_show_eval "$cmd" "${2-:}" done IFS=$save_ifs @@ -1324,10 +2844,11 @@ func_execute_cmds () # Note that it is not necessary on cygwin/mingw to append a dot to # FILE even if both FILE and FILE.exe exist: automatic-append-.exe # behavior happens only for exec(3), not for open(2)! Also, sourcing -# `FILE.' does not work on cygwin managed mounts. +# 'FILE.' does not work on cygwin managed mounts. func_source () { - $opt_debug + $debug_cmd + case $1 in */* | *\\*) . "$1" ;; *) . "./$1" ;; @@ -1354,10 +2875,10 @@ func_resolve_sysroot () # store the result into func_replace_sysroot_result. func_replace_sysroot () { - case "$lt_sysroot:$1" in + case $lt_sysroot:$1 in ?*:"$lt_sysroot"*) func_stripname "$lt_sysroot" '' "$1" - func_replace_sysroot_result="=$func_stripname_result" + func_replace_sysroot_result='='$func_stripname_result ;; *) # Including no sysroot. @@ -1374,7 +2895,8 @@ func_replace_sysroot () # arg is usually of the form 'gcc ...' func_infer_tag () { - $opt_debug + $debug_cmd + if test -n "$available_tags" && test -z "$tagname"; then CC_quoted= for arg in $CC; do @@ -1393,7 +2915,7 @@ func_infer_tag () for z in $available_tags; do if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" + eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" CC_quoted= for arg in $CC; do # Double-quote args containing other shell metacharacters. @@ -1418,7 +2940,7 @@ func_infer_tag () # line option must be used. if test -z "$tagname"; then func_echo "unable to infer tagged configuration" - func_fatal_error "specify a tag with \`--tag'" + func_fatal_error "specify a tag with '--tag'" # else # func_verbose "using $tagname tagged configuration" fi @@ -1434,15 +2956,15 @@ func_infer_tag () # but don't create it if we're doing a dry run. func_write_libtool_object () { - write_libobj=${1} - if test "$build_libtool_libs" = yes; then - write_lobj=\'${2}\' + write_libobj=$1 + if test yes = "$build_libtool_libs"; then + write_lobj=\'$2\' else write_lobj=none fi - if test "$build_old_libs" = yes; then - write_oldobj=\'${3}\' + if test yes = "$build_old_libs"; then + write_oldobj=\'$3\' else write_oldobj=none fi @@ -1450,7 +2972,7 @@ func_write_libtool_object () $opt_dry_run || { cat >${write_libobj}T </dev/null` - if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then + if test "$?" -eq 0 && test -n "$func_convert_core_file_wine_to_w32_tmp"; then func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | - $SED -e "$lt_sed_naive_backslashify"` + $SED -e "$sed_naive_backslashify"` else func_convert_core_file_wine_to_w32_result= fi @@ -1514,18 +3037,19 @@ func_convert_core_file_wine_to_w32 () # are convertible, then the result may be empty. func_convert_core_path_wine_to_w32 () { - $opt_debug + $debug_cmd + # unfortunately, winepath doesn't convert paths, only file names - func_convert_core_path_wine_to_w32_result="" + func_convert_core_path_wine_to_w32_result= if test -n "$1"; then oldIFS=$IFS IFS=: for func_convert_core_path_wine_to_w32_f in $1; do IFS=$oldIFS func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" - if test -n "$func_convert_core_file_wine_to_w32_result" ; then + if test -n "$func_convert_core_file_wine_to_w32_result"; then if test -z "$func_convert_core_path_wine_to_w32_result"; then - func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" + func_convert_core_path_wine_to_w32_result=$func_convert_core_file_wine_to_w32_result else func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" fi @@ -1554,7 +3078,8 @@ func_convert_core_path_wine_to_w32 () # environment variable; do not put it in $PATH. func_cygpath () { - $opt_debug + $debug_cmd + if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` if test "$?" -ne 0; then @@ -1563,7 +3088,7 @@ func_cygpath () fi else func_cygpath_result= - func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" + func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'" fi } #end: func_cygpath @@ -1574,10 +3099,11 @@ func_cygpath () # result in func_convert_core_msys_to_w32_result. func_convert_core_msys_to_w32 () { - $opt_debug + $debug_cmd + # awkward: cmd appends spaces to result func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` + $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"` } #end: func_convert_core_msys_to_w32 @@ -1588,13 +3114,14 @@ func_convert_core_msys_to_w32 () # func_to_host_file_result to ARG1). func_convert_file_check () { - $opt_debug - if test -z "$2" && test -n "$1" ; then + $debug_cmd + + if test -z "$2" && test -n "$1"; then func_error "Could not determine host file name corresponding to" - func_error " \`$1'" + func_error " '$1'" func_error "Continuing, but uninstalled executables may not work." # Fallback: - func_to_host_file_result="$1" + func_to_host_file_result=$1 fi } # end func_convert_file_check @@ -1606,10 +3133,11 @@ func_convert_file_check () # func_to_host_file_result to a simplistic fallback value (see below). func_convert_path_check () { - $opt_debug + $debug_cmd + if test -z "$4" && test -n "$3"; then func_error "Could not determine the host path corresponding to" - func_error " \`$3'" + func_error " '$3'" func_error "Continuing, but uninstalled executables may not work." # Fallback. This is a deliberately simplistic "conversion" and # should not be "improved". See libtool.info. @@ -1618,7 +3146,7 @@ func_convert_path_check () func_to_host_path_result=`echo "$3" | $SED -e "$lt_replace_pathsep_chars"` else - func_to_host_path_result="$3" + func_to_host_path_result=$3 fi fi } @@ -1630,9 +3158,10 @@ func_convert_path_check () # and appending REPL if ORIG matches BACKPAT. func_convert_path_front_back_pathsep () { - $opt_debug + $debug_cmd + case $4 in - $1 ) func_to_host_path_result="$3$func_to_host_path_result" + $1 ) func_to_host_path_result=$3$func_to_host_path_result ;; esac case $4 in @@ -1646,7 +3175,7 @@ func_convert_path_front_back_pathsep () ################################################## # $build to $host FILE NAME CONVERSION FUNCTIONS # ################################################## -# invoked via `$to_host_file_cmd ARG' +# invoked via '$to_host_file_cmd ARG' # # In each case, ARG is the path to be converted from $build to $host format. # Result will be available in $func_to_host_file_result. @@ -1657,7 +3186,8 @@ func_convert_path_front_back_pathsep () # in func_to_host_file_result. func_to_host_file () { - $opt_debug + $debug_cmd + $to_host_file_cmd "$1" } # end func_to_host_file @@ -1669,7 +3199,8 @@ func_to_host_file () # in (the comma separated) LAZY, no conversion takes place. func_to_tool_file () { - $opt_debug + $debug_cmd + case ,$2, in *,"$to_tool_file_cmd",*) func_to_tool_file_result=$1 @@ -1687,7 +3218,7 @@ func_to_tool_file () # Copy ARG to func_to_host_file_result. func_convert_file_noop () { - func_to_host_file_result="$1" + func_to_host_file_result=$1 } # end func_convert_file_noop @@ -1698,11 +3229,12 @@ func_convert_file_noop () # func_to_host_file_result. func_convert_file_msys_to_w32 () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then func_convert_core_msys_to_w32 "$1" - func_to_host_file_result="$func_convert_core_msys_to_w32_result" + func_to_host_file_result=$func_convert_core_msys_to_w32_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1714,8 +3246,9 @@ func_convert_file_msys_to_w32 () # func_to_host_file_result. func_convert_file_cygwin_to_w32 () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then # because $build is cygwin, we call "the" cygpath in $PATH; no need to use # LT_CYGPATH in this case. @@ -1731,11 +3264,12 @@ func_convert_file_cygwin_to_w32 () # and a working winepath. Returns result in func_to_host_file_result. func_convert_file_nix_to_w32 () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then func_convert_core_file_wine_to_w32 "$1" - func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" + func_to_host_file_result=$func_convert_core_file_wine_to_w32_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1747,12 +3281,13 @@ func_convert_file_nix_to_w32 () # Returns result in func_to_host_file_result. func_convert_file_msys_to_cygwin () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then func_convert_core_msys_to_w32 "$1" func_cygpath -u "$func_convert_core_msys_to_w32_result" - func_to_host_file_result="$func_cygpath_result" + func_to_host_file_result=$func_cygpath_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1765,13 +3300,14 @@ func_convert_file_msys_to_cygwin () # in func_to_host_file_result. func_convert_file_nix_to_cygwin () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. func_convert_core_file_wine_to_w32 "$1" func_cygpath -u "$func_convert_core_file_wine_to_w32_result" - func_to_host_file_result="$func_cygpath_result" + func_to_host_file_result=$func_cygpath_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1781,7 +3317,7 @@ func_convert_file_nix_to_cygwin () ############################################# # $build to $host PATH CONVERSION FUNCTIONS # ############################################# -# invoked via `$to_host_path_cmd ARG' +# invoked via '$to_host_path_cmd ARG' # # In each case, ARG is the path to be converted from $build to $host format. # The result will be available in $func_to_host_path_result. @@ -1805,10 +3341,11 @@ func_convert_file_nix_to_cygwin () to_host_path_cmd= func_init_to_host_path_cmd () { - $opt_debug + $debug_cmd + if test -z "$to_host_path_cmd"; then func_stripname 'func_convert_file_' '' "$to_host_file_cmd" - to_host_path_cmd="func_convert_path_${func_stripname_result}" + to_host_path_cmd=func_convert_path_$func_stripname_result fi } @@ -1818,7 +3355,8 @@ func_init_to_host_path_cmd () # in func_to_host_path_result. func_to_host_path () { - $opt_debug + $debug_cmd + func_init_to_host_path_cmd $to_host_path_cmd "$1" } @@ -1829,7 +3367,7 @@ func_to_host_path () # Copy ARG to func_to_host_path_result. func_convert_path_noop () { - func_to_host_path_result="$1" + func_to_host_path_result=$1 } # end func_convert_path_noop @@ -1840,8 +3378,9 @@ func_convert_path_noop () # func_to_host_path_result. func_convert_path_msys_to_w32 () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # Remove leading and trailing path separator characters from ARG. MSYS # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; @@ -1849,7 +3388,7 @@ func_convert_path_msys_to_w32 () func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_msys_to_w32_result" + func_to_host_path_result=$func_convert_core_msys_to_w32_result func_convert_path_check : ";" \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" @@ -1863,8 +3402,9 @@ func_convert_path_msys_to_w32 () # func_to_host_file_result. func_convert_path_cygwin_to_w32 () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" @@ -1883,14 +3423,15 @@ func_convert_path_cygwin_to_w32 () # a working winepath. Returns result in func_to_host_file_result. func_convert_path_nix_to_w32 () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" + func_to_host_path_result=$func_convert_core_path_wine_to_w32_result func_convert_path_check : ";" \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" @@ -1904,15 +3445,16 @@ func_convert_path_nix_to_w32 () # Returns result in func_to_host_file_result. func_convert_path_msys_to_cygwin () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" func_cygpath -u -p "$func_convert_core_msys_to_w32_result" - func_to_host_path_result="$func_cygpath_result" + func_to_host_path_result=$func_cygpath_result func_convert_path_check : : \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" : "$1" @@ -1927,8 +3469,9 @@ func_convert_path_msys_to_cygwin () # func_to_host_file_result. func_convert_path_nix_to_cygwin () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # Remove leading and trailing path separator characters from # ARG. msys behavior is inconsistent here, cygpath turns them @@ -1937,7 +3480,7 @@ func_convert_path_nix_to_cygwin () func_to_host_path_tmp1=$func_stripname_result func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" - func_to_host_path_result="$func_cygpath_result" + func_to_host_path_result=$func_cygpath_result func_convert_path_check : : \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" : "$1" @@ -1946,13 +3489,31 @@ func_convert_path_nix_to_cygwin () # end func_convert_path_nix_to_cygwin +# func_dll_def_p FILE +# True iff FILE is a Windows DLL '.def' file. +# Keep in sync with _LT_DLL_DEF_P in libtool.m4 +func_dll_def_p () +{ + $debug_cmd + + func_dll_def_p_tmp=`$SED -n \ + -e 's/^[ ]*//' \ + -e '/^\(;.*\)*$/d' \ + -e 's/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p' \ + -e q \ + "$1"` + test DEF = "$func_dll_def_p_tmp" +} + + # func_mode_compile arg... func_mode_compile () { - $opt_debug + $debug_cmd + # Get the compilation command and the source file. base_compile= - srcfile="$nonopt" # always keep a non-empty value in "srcfile" + srcfile=$nonopt # always keep a non-empty value in "srcfile" suppress_opt=yes suppress_output= arg_mode=normal @@ -1965,12 +3526,12 @@ func_mode_compile () case $arg_mode in arg ) # do not "continue". Instead, add this to base_compile - lastarg="$arg" + lastarg=$arg arg_mode=normal ;; target ) - libobj="$arg" + libobj=$arg arg_mode=normal continue ;; @@ -1980,7 +3541,7 @@ func_mode_compile () case $arg in -o) test -n "$libobj" && \ - func_fatal_error "you cannot specify \`-o' more than once" + func_fatal_error "you cannot specify '-o' more than once" arg_mode=target continue ;; @@ -2009,12 +3570,12 @@ func_mode_compile () func_stripname '-Wc,' '' "$arg" args=$func_stripname_result lastarg= - save_ifs="$IFS"; IFS=',' + save_ifs=$IFS; IFS=, for arg in $args; do - IFS="$save_ifs" + IFS=$save_ifs func_append_quoted lastarg "$arg" done - IFS="$save_ifs" + IFS=$save_ifs func_stripname ' ' '' "$lastarg" lastarg=$func_stripname_result @@ -2027,8 +3588,8 @@ func_mode_compile () # Accept the current argument as the source file. # The previous "srcfile" becomes the current argument. # - lastarg="$srcfile" - srcfile="$arg" + lastarg=$srcfile + srcfile=$arg ;; esac # case $arg ;; @@ -2043,13 +3604,13 @@ func_mode_compile () func_fatal_error "you must specify an argument for -Xcompile" ;; target) - func_fatal_error "you must specify a target with \`-o'" + func_fatal_error "you must specify a target with '-o'" ;; *) # Get the name of the library object. test -z "$libobj" && { func_basename "$srcfile" - libobj="$func_basename_result" + libobj=$func_basename_result } ;; esac @@ -2069,7 +3630,7 @@ func_mode_compile () case $libobj in *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;; *) - func_fatal_error "cannot determine name of library object from \`$libobj'" + func_fatal_error "cannot determine name of library object from '$libobj'" ;; esac @@ -2078,8 +3639,8 @@ func_mode_compile () for arg in $later; do case $arg in -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" + test yes = "$build_libtool_libs" \ + || func_fatal_configuration "cannot build a shared library" build_old_libs=no continue ;; @@ -2102,20 +3663,20 @@ func_mode_compile () esac done - func_quote_for_eval "$libobj" - test "X$libobj" != "X$func_quote_for_eval_result" \ + func_quote_arg pretty "$libobj" + test "X$libobj" != "X$func_quote_arg_result" \ && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ - && func_warning "libobj name \`$libobj' may not contain shell special characters." + && func_warning "libobj name '$libobj' may not contain shell special characters." func_dirname_and_basename "$obj" "/" "" - objname="$func_basename_result" - xdir="$func_dirname_result" - lobj=${xdir}$objdir/$objname + objname=$func_basename_result + xdir=$func_dirname_result + lobj=$xdir$objdir/$objname test -z "$base_compile" && \ func_fatal_help "you must specify a compilation command" # Delete any leftover library objects. - if test "$build_old_libs" = yes; then + if test yes = "$build_old_libs"; then removelist="$obj $lobj $libobj ${libobj}T" else removelist="$lobj $libobj ${libobj}T" @@ -2127,16 +3688,16 @@ func_mode_compile () pic_mode=default ;; esac - if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then + if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then # non-PIC code in shared libraries is not supported pic_mode=default fi # Calculate the filename of the output object if compiler does # not support -o with -c - if test "$compiler_c_o" = no; then - output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext} - lockfile="$output_obj.lock" + if test no = "$compiler_c_o"; then + output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext + lockfile=$output_obj.lock else output_obj= need_locks=no @@ -2145,12 +3706,12 @@ func_mode_compile () # Lock this critical section if it is needed # We use this script file to make the link, it avoids creating a new file - if test "$need_locks" = yes; then + if test yes = "$need_locks"; then until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do func_echo "Waiting for $lockfile to be removed" sleep 2 done - elif test "$need_locks" = warn; then + elif test warn = "$need_locks"; then if test -f "$lockfile"; then $ECHO "\ *** ERROR, $lockfile exists and contains: @@ -2158,7 +3719,7 @@ func_mode_compile () This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you +your compiler does not support '-c' and '-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -2176,15 +3737,15 @@ compiler." func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 srcfile=$func_to_tool_file_result - func_quote_for_eval "$srcfile" - qsrcfile=$func_quote_for_eval_result + func_quote_arg pretty "$srcfile" + qsrcfile=$func_quote_arg_result # Only build a PIC object if we are building libtool libraries. - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then # Without this assignment, base_compile gets emptied. fbsd_hideous_sh_bug=$base_compile - if test "$pic_mode" != no; then + if test no != "$pic_mode"; then command="$base_compile $qsrcfile $pic_flag" else # Don't build PIC code @@ -2201,7 +3762,7 @@ compiler." func_show_eval_locale "$command" \ 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE' - if test "$need_locks" = warn && + if test warn = "$need_locks" && test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then $ECHO "\ *** ERROR, $lockfile contains: @@ -2212,7 +3773,7 @@ $srcfile This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you +your compiler does not support '-c' and '-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -2228,20 +3789,20 @@ compiler." fi # Allow error messages only from the first compilation. - if test "$suppress_opt" = yes; then + if test yes = "$suppress_opt"; then suppress_output=' >/dev/null 2>&1' fi fi # Only build a position-dependent object if we build old libraries. - if test "$build_old_libs" = yes; then - if test "$pic_mode" != yes; then + if test yes = "$build_old_libs"; then + if test yes != "$pic_mode"; then # Don't build PIC code command="$base_compile $qsrcfile$pie_flag" else command="$base_compile $qsrcfile $pic_flag" fi - if test "$compiler_c_o" = yes; then + if test yes = "$compiler_c_o"; then func_append command " -o $obj" fi @@ -2250,7 +3811,7 @@ compiler." func_show_eval_locale "$command" \ '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' - if test "$need_locks" = warn && + if test warn = "$need_locks" && test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then $ECHO "\ *** ERROR, $lockfile contains: @@ -2261,7 +3822,7 @@ $srcfile This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you +your compiler does not support '-c' and '-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -2281,7 +3842,7 @@ compiler." func_write_libtool_object "$libobj" "$objdir/$objname" "$objname" # Unlock the critical section if it was locked - if test "$need_locks" != no; then + if test no != "$need_locks"; then removelist=$lockfile $RM "$lockfile" fi @@ -2291,7 +3852,7 @@ compiler." } $opt_help || { - test "$opt_mode" = compile && func_mode_compile ${1+"$@"} + test compile = "$opt_mode" && func_mode_compile ${1+"$@"} } func_mode_help () @@ -2311,7 +3872,7 @@ func_mode_help () Remove files from the build directory. RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed to RM. If FILE is a libtool library, object or program, all the files associated @@ -2330,16 +3891,17 @@ This mode accepts the following additional options: -no-suppress do not suppress compiler output for multiple passes -prefer-pic try to build PIC objects only -prefer-non-pic try to build non-PIC objects only - -shared do not build a \`.o' file suitable for static linking - -static only build a \`.o' file suitable for static linking - -Wc,FLAG pass FLAG directly to the compiler + -shared do not build a '.o' file suitable for static linking + -static only build a '.o' file suitable for static linking + -Wc,FLAG + -Xcompiler FLAG pass FLAG directly to the compiler -COMPILE-COMMAND is a command to be used in creating a \`standard' object file +COMPILE-COMMAND is a command to be used in creating a 'standard' object file from the given SOURCEFILE. The output file name is determined by removing the directory component from -SOURCEFILE, then substituting the C source code suffix \`.c' with the -library object suffix, \`.lo'." +SOURCEFILE, then substituting the C source code suffix '.c' with the +library object suffix, '.lo'." ;; execute) @@ -2352,7 +3914,7 @@ This mode accepts the following additional options: -dlopen FILE add the directory containing FILE to the library path -This mode sets the library path environment variable according to \`-dlopen' +This mode sets the library path environment variable according to '-dlopen' flags. If any of the ARGS are libtool executable wrappers, then they are translated @@ -2371,7 +3933,7 @@ Complete the installation of libtool libraries. Each LIBDIR is a directory that contains libtool libraries. The commands that this mode executes may require superuser privileges. Use -the \`--dry-run' option if you just want to see what would be executed." +the '--dry-run' option if you just want to see what would be executed." ;; install) @@ -2381,7 +3943,7 @@ the \`--dry-run' option if you just want to see what would be executed." Install executables or libraries. INSTALL-COMMAND is the installation command. The first component should be -either the \`install' or \`cp' program. +either the 'install' or 'cp' program. The following components of INSTALL-COMMAND are treated specially: @@ -2407,7 +3969,7 @@ The following components of LINK-COMMAND are treated specially: -avoid-version do not add a version suffix if possible -bindir BINDIR specify path to binaries directory (for systems where libraries must be found in the PATH setting at runtime) - -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime + -dlopen FILE '-dlpreopen' FILE if it cannot be dlopened at runtime -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) -export-symbols SYMFILE @@ -2421,7 +3983,8 @@ The following components of LINK-COMMAND are treated specially: -no-install link a not-installable executable -no-undefined declare that a library does not refer to external symbols -o OUTPUT-FILE create OUTPUT-FILE from the specified objects - -objectlist FILE Use a list of object files found in FILE to specify objects + -objectlist FILE use a list of object files found in FILE to specify objects + -os2dllname NAME force a short DLL name on OS/2 (no effect on other OSes) -precious-files-regex REGEX don't remove output files matching REGEX -release RELEASE specify package release information @@ -2437,24 +4000,26 @@ The following components of LINK-COMMAND are treated specially: -weak LIBNAME declare that the target provides the LIBNAME interface -Wc,FLAG -Xcompiler FLAG pass linker-specific FLAG directly to the compiler + -Wa,FLAG + -Xassembler FLAG pass linker-specific FLAG directly to the assembler -Wl,FLAG -Xlinker FLAG pass linker-specific FLAG directly to the linker -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) -All other options (arguments beginning with \`-') are ignored. +All other options (arguments beginning with '-') are ignored. -Every other argument is treated as a filename. Files ending in \`.la' are +Every other argument is treated as a filename. Files ending in '.la' are treated as uninstalled libtool libraries, other files are standard or library object files. -If the OUTPUT-FILE ends in \`.la', then a libtool library is created, -only library objects (\`.lo' files) may be specified, and \`-rpath' is +If the OUTPUT-FILE ends in '.la', then a libtool library is created, +only library objects ('.lo' files) may be specified, and '-rpath' is required, except when creating a convenience library. -If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created -using \`ar' and \`ranlib', or on Windows using \`lib'. +If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created +using 'ar' and 'ranlib', or on Windows using 'lib'. -If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file +If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file is created, otherwise an executable program is created." ;; @@ -2465,7 +4030,7 @@ is created, otherwise an executable program is created." Remove libraries from an installation directory. RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed to RM. If FILE is a libtool library, all the files associated with it are deleted. @@ -2473,17 +4038,17 @@ Otherwise, only FILE itself is deleted using RM." ;; *) - func_fatal_help "invalid operation mode \`$opt_mode'" + func_fatal_help "invalid operation mode '$opt_mode'" ;; esac echo - $ECHO "Try \`$progname --help' for more information about other modes." + $ECHO "Try '$progname --help' for more information about other modes." } # Now that we've collected a possible --mode arg, show help if necessary if $opt_help; then - if test "$opt_help" = :; then + if test : = "$opt_help"; then func_mode_help else { @@ -2491,7 +4056,7 @@ if $opt_help; then for opt_mode in compile link execute install finish uninstall clean; do func_mode_help done - } | sed -n '1p; 2,$s/^Usage:/ or: /p' + } | $SED -n '1p; 2,$s/^Usage:/ or: /p' { func_help noexit for opt_mode in compile link execute install finish uninstall clean; do @@ -2499,7 +4064,7 @@ if $opt_help; then func_mode_help done } | - sed '1d + $SED '1d /^When reporting/,/^Report/{ H d @@ -2516,16 +4081,17 @@ fi # func_mode_execute arg... func_mode_execute () { - $opt_debug + $debug_cmd + # The first argument is the command name. - cmd="$nonopt" + cmd=$nonopt test -z "$cmd" && \ func_fatal_help "you must specify a COMMAND" # Handle -dlopen flags immediately. for file in $opt_dlopen; do test -f "$file" \ - || func_fatal_help "\`$file' is not a file" + || func_fatal_help "'$file' is not a file" dir= case $file in @@ -2535,7 +4101,7 @@ func_mode_execute () # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$lib' is not a valid libtool archive" + || func_fatal_help "'$lib' is not a valid libtool archive" # Read the libtool library. dlname= @@ -2546,18 +4112,18 @@ func_mode_execute () if test -z "$dlname"; then # Warn if it was a shared library. test -n "$library_names" && \ - func_warning "\`$file' was not linked with \`-export-dynamic'" + func_warning "'$file' was not linked with '-export-dynamic'" continue fi func_dirname "$file" "" "." - dir="$func_dirname_result" + dir=$func_dirname_result if test -f "$dir/$objdir/$dlname"; then func_append dir "/$objdir" else if test ! -f "$dir/$dlname"; then - func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" + func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'" fi fi ;; @@ -2565,18 +4131,18 @@ func_mode_execute () *.lo) # Just add the directory containing the .lo file. func_dirname "$file" "" "." - dir="$func_dirname_result" + dir=$func_dirname_result ;; *) - func_warning "\`-dlopen' is ignored for non-libtool libraries and objects" + func_warning "'-dlopen' is ignored for non-libtool libraries and objects" continue ;; esac # Get the absolute pathname. absdir=`cd "$dir" && pwd` - test -n "$absdir" && dir="$absdir" + test -n "$absdir" && dir=$absdir # Now add the directory to shlibpath_var. if eval "test -z \"\$$shlibpath_var\""; then @@ -2588,7 +4154,7 @@ func_mode_execute () # This variable tells wrapper scripts just to set shlibpath_var # rather than running their programs. - libtool_execute_magic="$magic" + libtool_execute_magic=$magic # Check if any of the arguments is a wrapper script. args= @@ -2601,12 +4167,12 @@ func_mode_execute () if func_ltwrapper_script_p "$file"; then func_source "$file" # Transform arg to wrapped name. - file="$progdir/$program" + file=$progdir/$program elif func_ltwrapper_executable_p "$file"; then func_ltwrapper_scriptname "$file" func_source "$func_ltwrapper_scriptname_result" # Transform arg to wrapped name. - file="$progdir/$program" + file=$progdir/$program fi ;; esac @@ -2614,7 +4180,15 @@ func_mode_execute () func_append_quoted args "$file" done - if test "X$opt_dry_run" = Xfalse; then + if $opt_dry_run; then + # Display what would be done. + if test -n "$shlibpath_var"; then + eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" + echo "export $shlibpath_var" + fi + $ECHO "$cmd$args" + exit $EXIT_SUCCESS + else if test -n "$shlibpath_var"; then # Export the shlibpath_var. eval "export $shlibpath_var" @@ -2631,25 +4205,18 @@ func_mode_execute () done # Now prepare to actually exec the command. - exec_cmd="\$cmd$args" - else - # Display what would be done. - if test -n "$shlibpath_var"; then - eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" - echo "export $shlibpath_var" - fi - $ECHO "$cmd$args" - exit $EXIT_SUCCESS + exec_cmd=\$cmd$args fi } -test "$opt_mode" = execute && func_mode_execute ${1+"$@"} +test execute = "$opt_mode" && func_mode_execute ${1+"$@"} # func_mode_finish arg... func_mode_finish () { - $opt_debug + $debug_cmd + libs= libdirs= admincmds= @@ -2663,11 +4230,11 @@ func_mode_finish () if func_lalib_unsafe_p "$opt"; then func_append libs " $opt" else - func_warning "\`$opt' is not a valid libtool archive" + func_warning "'$opt' is not a valid libtool archive" fi else - func_fatal_error "invalid argument \`$opt'" + func_fatal_error "invalid argument '$opt'" fi done @@ -2682,12 +4249,12 @@ func_mode_finish () # Remove sysroot references if $opt_dry_run; then for lib in $libs; do - echo "removing references to $lt_sysroot and \`=' prefixes from $lib" + echo "removing references to $lt_sysroot and '=' prefixes from $lib" done else tmpdir=`func_mktempdir` for lib in $libs; do - sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ + $SED -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ > $tmpdir/tmp-la mv -f $tmpdir/tmp-la $lib done @@ -2712,7 +4279,7 @@ func_mode_finish () fi # Exit here if they wanted silent mode. - $opt_silent && exit $EXIT_SUCCESS + $opt_quiet && exit $EXIT_SUCCESS if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then echo "----------------------------------------------------------------------" @@ -2723,27 +4290,27 @@ func_mode_finish () echo echo "If you ever happen to want to link against installed libraries" echo "in a given directory, LIBDIR, you must either use libtool, and" - echo "specify the full pathname of the library, or use the \`-LLIBDIR'" + echo "specify the full pathname of the library, or use the '-LLIBDIR'" echo "flag during linking and do at least one of the following:" if test -n "$shlibpath_var"; then - echo " - add LIBDIR to the \`$shlibpath_var' environment variable" + echo " - add LIBDIR to the '$shlibpath_var' environment variable" echo " during execution" fi if test -n "$runpath_var"; then - echo " - add LIBDIR to the \`$runpath_var' environment variable" + echo " - add LIBDIR to the '$runpath_var' environment variable" echo " during linking" fi if test -n "$hardcode_libdir_flag_spec"; then libdir=LIBDIR eval flag=\"$hardcode_libdir_flag_spec\" - $ECHO " - use the \`$flag' linker flag" + $ECHO " - use the '$flag' linker flag" fi if test -n "$admincmds"; then $ECHO " - have your system administrator run these commands:$admincmds" fi if test -f /etc/ld.so.conf; then - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" + echo " - have your system administrator add LIBDIR to '/etc/ld.so.conf'" fi echo @@ -2762,21 +4329,23 @@ func_mode_finish () exit $EXIT_SUCCESS } -test "$opt_mode" = finish && func_mode_finish ${1+"$@"} +test finish = "$opt_mode" && func_mode_finish ${1+"$@"} # func_mode_install arg... func_mode_install () { - $opt_debug + $debug_cmd + # There may be an optional sh(1) argument at the beginning of # install_prog (especially on Windows NT). - if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || + if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" || # Allow the use of GNU shtool's install command. - case $nonopt in *shtool*) :;; *) false;; esac; then + case $nonopt in *shtool*) :;; *) false;; esac + then # Aesthetically quote it. - func_quote_for_eval "$nonopt" - install_prog="$func_quote_for_eval_result " + func_quote_arg pretty "$nonopt" + install_prog="$func_quote_arg_result " arg=$1 shift else @@ -2786,8 +4355,8 @@ func_mode_install () # The real first argument should be the name of the installation program. # Aesthetically quote it. - func_quote_for_eval "$arg" - func_append install_prog "$func_quote_for_eval_result" + func_quote_arg pretty "$arg" + func_append install_prog "$func_quote_arg_result" install_shared_prog=$install_prog case " $install_prog " in *[\\\ /]cp\ *) install_cp=: ;; @@ -2800,7 +4369,7 @@ func_mode_install () opts= prev= install_type= - isdir=no + isdir=false stripme= no_mode=: for arg @@ -2813,7 +4382,7 @@ func_mode_install () fi case $arg in - -d) isdir=yes ;; + -d) isdir=: ;; -f) if $install_cp; then :; else prev=$arg @@ -2831,7 +4400,7 @@ func_mode_install () *) # If the previous option needed an argument, then skip it. if test -n "$prev"; then - if test "x$prev" = x-m && test -n "$install_override_mode"; then + if test X-m = "X$prev" && test -n "$install_override_mode"; then arg2=$install_override_mode no_mode=false fi @@ -2844,24 +4413,24 @@ func_mode_install () esac # Aesthetically quote the argument. - func_quote_for_eval "$arg" - func_append install_prog " $func_quote_for_eval_result" + func_quote_arg pretty "$arg" + func_append install_prog " $func_quote_arg_result" if test -n "$arg2"; then - func_quote_for_eval "$arg2" + func_quote_arg pretty "$arg2" fi - func_append install_shared_prog " $func_quote_for_eval_result" + func_append install_shared_prog " $func_quote_arg_result" done test -z "$install_prog" && \ func_fatal_help "you must specify an install program" test -n "$prev" && \ - func_fatal_help "the \`$prev' option requires an argument" + func_fatal_help "the '$prev' option requires an argument" if test -n "$install_override_mode" && $no_mode; then if $install_cp; then :; else - func_quote_for_eval "$install_override_mode" - func_append install_shared_prog " -m $func_quote_for_eval_result" + func_quote_arg pretty "$install_override_mode" + func_append install_shared_prog " -m $func_quote_arg_result" fi fi @@ -2878,19 +4447,19 @@ func_mode_install () dest=$func_stripname_result # Check to see that the destination is a directory. - test -d "$dest" && isdir=yes - if test "$isdir" = yes; then - destdir="$dest" + test -d "$dest" && isdir=: + if $isdir; then + destdir=$dest destname= else func_dirname_and_basename "$dest" "" "." - destdir="$func_dirname_result" - destname="$func_basename_result" + destdir=$func_dirname_result + destname=$func_basename_result # Not a directory, so check to see that there is only one file specified. set dummy $files; shift test "$#" -gt 1 && \ - func_fatal_help "\`$dest' is not a directory" + func_fatal_help "'$dest' is not a directory" fi case $destdir in [\\/]* | [A-Za-z]:[\\/]*) ;; @@ -2899,7 +4468,7 @@ func_mode_install () case $file in *.lo) ;; *) - func_fatal_help "\`$destdir' must be an absolute directory name" + func_fatal_help "'$destdir' must be an absolute directory name" ;; esac done @@ -2908,7 +4477,7 @@ func_mode_install () # This variable tells wrapper scripts just to set variables rather # than running their programs. - libtool_install_magic="$magic" + libtool_install_magic=$magic staticlibs= future_libdirs= @@ -2928,7 +4497,7 @@ func_mode_install () # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$file' is not a valid libtool archive" + || func_fatal_help "'$file' is not a valid libtool archive" library_names= old_library= @@ -2950,7 +4519,7 @@ func_mode_install () fi func_dirname "$file" "/" "" - dir="$func_dirname_result" + dir=$func_dirname_result func_append dir "$objdir" if test -n "$relink_command"; then @@ -2964,7 +4533,7 @@ func_mode_install () # are installed into $libdir/../bin (currently, that works fine) # but it's something to keep an eye on. test "$inst_prefix_dir" = "$destdir" && \ - func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" + func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir" if test -n "$inst_prefix_dir"; then # Stick the inst_prefix_dir data into the link command. @@ -2973,29 +4542,36 @@ func_mode_install () relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` fi - func_warning "relinking \`$file'" + func_warning "relinking '$file'" func_show_eval "$relink_command" \ - 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"' + 'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"' fi # See the names of the shared library. set dummy $library_names; shift if test -n "$1"; then - realname="$1" + realname=$1 shift - srcname="$realname" - test -n "$relink_command" && srcname="$realname"T + srcname=$realname + test -n "$relink_command" && srcname=${realname}T # Install the shared library and build the symlinks. func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ 'exit $?' - tstripme="$stripme" + tstripme=$stripme case $host_os in cygwin* | mingw* | pw32* | cegcc*) case $realname in *.dll.a) - tstripme="" + tstripme= + ;; + esac + ;; + os2*) + case $realname in + *_dll.a) + tstripme= ;; esac ;; @@ -3006,7 +4582,7 @@ func_mode_install () if test "$#" -gt 0; then # Delete the old symlinks, and create new ones. - # Try `ln -sf' first, because the `ln' binary might depend on + # Try 'ln -sf' first, because the 'ln' binary might depend on # the symlink we replace! Solaris /bin/ln does not understand -f, # so we also need to try rm && ln -s. for linkname @@ -3017,14 +4593,14 @@ func_mode_install () fi # Do each command in the postinstall commands. - lib="$destdir/$realname" + lib=$destdir/$realname func_execute_cmds "$postinstall_cmds" 'exit $?' fi # Install the pseudo-library for information purposes. func_basename "$file" - name="$func_basename_result" - instname="$dir/$name"i + name=$func_basename_result + instname=$dir/${name}i func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' # Maybe install the static library, too. @@ -3036,11 +4612,11 @@ func_mode_install () # Figure out destination file name, if it wasn't already specified. if test -n "$destname"; then - destfile="$destdir/$destname" + destfile=$destdir/$destname else func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" + destfile=$func_basename_result + destfile=$destdir/$destfile fi # Deduce the name of the destination old-style object file. @@ -3050,11 +4626,11 @@ func_mode_install () staticdest=$func_lo2o_result ;; *.$objext) - staticdest="$destfile" + staticdest=$destfile destfile= ;; *) - func_fatal_help "cannot copy a libtool object to \`$destfile'" + func_fatal_help "cannot copy a libtool object to '$destfile'" ;; esac @@ -3063,7 +4639,7 @@ func_mode_install () func_show_eval "$install_prog $file $destfile" 'exit $?' # Install the old object if enabled. - if test "$build_old_libs" = yes; then + if test yes = "$build_old_libs"; then # Deduce the name of the old-style object file. func_lo2o "$file" staticobj=$func_lo2o_result @@ -3075,23 +4651,23 @@ func_mode_install () *) # Figure out destination file name, if it wasn't already specified. if test -n "$destname"; then - destfile="$destdir/$destname" + destfile=$destdir/$destname else func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" + destfile=$func_basename_result + destfile=$destdir/$destfile fi # If the file is missing, and there is a .exe on the end, strip it # because it is most likely a libtool script we actually want to # install - stripped_ext="" + stripped_ext= case $file in *.exe) if test ! -f "$file"; then func_stripname '' '.exe' "$file" file=$func_stripname_result - stripped_ext=".exe" + stripped_ext=.exe fi ;; esac @@ -3119,19 +4695,19 @@ func_mode_install () # Check the variables that should have been set. test -z "$generated_by_libtool_version" && \ - func_fatal_error "invalid libtool wrapper script \`$wrapper'" + func_fatal_error "invalid libtool wrapper script '$wrapper'" - finalize=yes + finalize=: for lib in $notinst_deplibs; do # Check to see that each library is installed. libdir= if test -f "$lib"; then func_source "$lib" fi - libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test + libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'` if test -n "$libdir" && test ! -f "$libfile"; then - func_warning "\`$lib' has not been installed in \`$libdir'" - finalize=no + func_warning "'$lib' has not been installed in '$libdir'" + finalize=false fi done @@ -3139,29 +4715,29 @@ func_mode_install () func_source "$wrapper" outputname= - if test "$fast_install" = no && test -n "$relink_command"; then + if test no = "$fast_install" && test -n "$relink_command"; then $opt_dry_run || { - if test "$finalize" = yes; then + if $finalize; then tmpdir=`func_mktempdir` func_basename "$file$stripped_ext" - file="$func_basename_result" - outputname="$tmpdir/$file" + file=$func_basename_result + outputname=$tmpdir/$file # Replace the output file specification. relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` - $opt_silent || { - func_quote_for_expand "$relink_command" - eval "func_echo $func_quote_for_expand_result" + $opt_quiet || { + func_quote_arg expand,pretty "$relink_command" + eval "func_echo $func_quote_arg_result" } if eval "$relink_command"; then : else - func_error "error: relink \`$file' with the above command before installing it" + func_error "error: relink '$file' with the above command before installing it" $opt_dry_run || ${RM}r "$tmpdir" continue fi - file="$outputname" + file=$outputname else - func_warning "cannot relink \`$file'" + func_warning "cannot relink '$file'" fi } else @@ -3198,10 +4774,10 @@ func_mode_install () for file in $staticlibs; do func_basename "$file" - name="$func_basename_result" + name=$func_basename_result # Set up the ranlib parameters. - oldlib="$destdir/$name" + oldlib=$destdir/$name func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 tool_oldlib=$func_to_tool_file_result @@ -3216,18 +4792,18 @@ func_mode_install () done test -n "$future_libdirs" && \ - func_warning "remember to run \`$progname --finish$future_libdirs'" + func_warning "remember to run '$progname --finish$future_libdirs'" if test -n "$current_libdirs"; then # Maybe just do a dry run. $opt_dry_run && current_libdirs=" -n$current_libdirs" - exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' + exec_cmd='$SHELL "$progpath" $preserve_args --finish$current_libdirs' else exit $EXIT_SUCCESS fi } -test "$opt_mode" = install && func_mode_install ${1+"$@"} +test install = "$opt_mode" && func_mode_install ${1+"$@"} # func_generate_dlsyms outputname originator pic_p @@ -3235,16 +4811,17 @@ test "$opt_mode" = install && func_mode_install ${1+"$@"} # a dlpreopen symbol table. func_generate_dlsyms () { - $opt_debug - my_outputname="$1" - my_originator="$2" - my_pic_p="${3-no}" - my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'` + $debug_cmd + + my_outputname=$1 + my_originator=$2 + my_pic_p=${3-false} + my_prefix=`$ECHO "$my_originator" | $SED 's%[^a-zA-Z0-9]%_%g'` my_dlsyms= - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then if test -n "$NM" && test -n "$global_symbol_pipe"; then - my_dlsyms="${my_outputname}S.c" + my_dlsyms=${my_outputname}S.c else func_error "not configured to extract global symbols from dlpreopened files" fi @@ -3255,7 +4832,7 @@ func_generate_dlsyms () "") ;; *.c) # Discover the nlist of each of the dlfiles. - nlist="$output_objdir/${my_outputname}.nm" + nlist=$output_objdir/$my_outputname.nm func_show_eval "$RM $nlist ${nlist}S ${nlist}T" @@ -3263,34 +4840,36 @@ func_generate_dlsyms () func_verbose "creating $output_objdir/$my_dlsyms" $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\ -/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */ -/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */ +/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */ +/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */ #ifdef __cplusplus extern \"C\" { #endif -#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) +#if defined __GNUC__ && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) #pragma GCC diagnostic ignored \"-Wstrict-prototypes\" #endif /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT_DLSYM_CONST -#elif defined(__osf__) +#elif defined __osf__ /* This system does not cope well with relocations in const data. */ # define LT_DLSYM_CONST #else # define LT_DLSYM_CONST const #endif +#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0) + /* External symbol declarations for the compiler. */\ " - if test "$dlself" = yes; then - func_verbose "generating symbol list for \`$output'" + if test yes = "$dlself"; then + func_verbose "generating symbol list for '$output'" $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" @@ -3298,7 +4877,7 @@ extern \"C\" { progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` for progfile in $progfiles; do func_to_tool_file "$progfile" func_convert_file_msys_to_w32 - func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" + func_verbose "extracting global C symbols from '$func_to_tool_file_result'" $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" done @@ -3318,10 +4897,10 @@ extern \"C\" { # Prepare the list of exported symbols if test -z "$export_symbols"; then - export_symbols="$output_objdir/$outputname.exp" + export_symbols=$output_objdir/$outputname.exp $opt_dry_run || { $RM $export_symbols - eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' case $host in *cygwin* | *mingw* | *cegcc* ) eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' @@ -3331,7 +4910,7 @@ extern \"C\" { } else $opt_dry_run || { - eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' + eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' eval '$MV "$nlist"T "$nlist"' case $host in @@ -3345,22 +4924,22 @@ extern \"C\" { fi for dlprefile in $dlprefiles; do - func_verbose "extracting global C symbols from \`$dlprefile'" + func_verbose "extracting global C symbols from '$dlprefile'" func_basename "$dlprefile" - name="$func_basename_result" + name=$func_basename_result case $host in *cygwin* | *mingw* | *cegcc* ) # if an import library, we need to obtain dlname if func_win32_import_lib_p "$dlprefile"; then func_tr_sh "$dlprefile" eval "curr_lafile=\$libfile_$func_tr_sh_result" - dlprefile_dlbasename="" + dlprefile_dlbasename= if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then # Use subshell, to avoid clobbering current variable values dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` - if test -n "$dlprefile_dlname" ; then + if test -n "$dlprefile_dlname"; then func_basename "$dlprefile_dlname" - dlprefile_dlbasename="$func_basename_result" + dlprefile_dlbasename=$func_basename_result else # no lafile. user explicitly requested -dlpreopen . $sharedlib_from_linklib_cmd "$dlprefile" @@ -3368,7 +4947,7 @@ extern \"C\" { fi fi $opt_dry_run || { - if test -n "$dlprefile_dlbasename" ; then + if test -n "$dlprefile_dlbasename"; then eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' else func_warning "Could not compute DLL name from $name" @@ -3424,6 +5003,11 @@ extern \"C\" { echo '/* NONE */' >> "$output_objdir/$my_dlsyms" fi + func_show_eval '$RM "${nlist}I"' + if test -n "$global_symbol_to_import"; then + eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I' + fi + echo >> "$output_objdir/$my_dlsyms" "\ /* The mapping between symbol names and symbols. */ @@ -3432,11 +5016,30 @@ typedef struct { void *address; } lt_dlsymlist; extern LT_DLSYM_CONST lt_dlsymlist -lt_${my_prefix}_LTX_preloaded_symbols[]; +lt_${my_prefix}_LTX_preloaded_symbols[];\ +" + + if test -s "$nlist"I; then + echo >> "$output_objdir/$my_dlsyms" "\ +static void lt_syminit(void) +{ + LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols; + for (; symbol->name; ++symbol) + {" + $SED 's/.*/ if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms" + echo >> "$output_objdir/$my_dlsyms" "\ + } +}" + fi + echo >> "$output_objdir/$my_dlsyms" "\ LT_DLSYM_CONST lt_dlsymlist lt_${my_prefix}_LTX_preloaded_symbols[] = -{\ - { \"$my_originator\", (void *) 0 }," +{ {\"$my_originator\", (void *) 0}," + + if test -s "$nlist"I; then + echo >> "$output_objdir/$my_dlsyms" "\ + {\"@INIT@\", (void *) <_syminit}," + fi case $need_lib_prefix in no) @@ -3478,9 +5081,7 @@ static const void *lt_preloaded_setup() { *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; *) - if test "X$my_pic_p" != Xno; then - pic_flag_for_symtable=" $pic_flag" - fi + $my_pic_p && pic_flag_for_symtable=" $pic_flag" ;; esac ;; @@ -3497,10 +5098,10 @@ static const void *lt_preloaded_setup() { func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?' # Clean up the generated files. - func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"' + func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"' # Transform the symbol file into the correct name. - symfileobj="$output_objdir/${my_outputname}S.$objext" + symfileobj=$output_objdir/${my_outputname}S.$objext case $host in *cygwin* | *mingw* | *cegcc* ) if test -f "$output_objdir/$my_outputname.def"; then @@ -3518,7 +5119,7 @@ static const void *lt_preloaded_setup() { esac ;; *) - func_fatal_error "unknown suffix for \`$my_dlsyms'" + func_fatal_error "unknown suffix for '$my_dlsyms'" ;; esac else @@ -3532,6 +5133,32 @@ static const void *lt_preloaded_setup() { fi } +# func_cygming_gnu_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is a GNU/binutils-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_gnu_implib_p () +{ + $debug_cmd + + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` + test -n "$func_cygming_gnu_implib_tmp" +} + +# func_cygming_ms_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is an MS-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_ms_implib_p () +{ + $debug_cmd + + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` + test -n "$func_cygming_ms_implib_tmp" +} + # func_win32_libid arg # return the library type of file 'arg' # @@ -3541,8 +5168,9 @@ static const void *lt_preloaded_setup() { # Despite the name, also deal with 64 bit binaries. func_win32_libid () { - $opt_debug - win32_libid_type="unknown" + $debug_cmd + + win32_libid_type=unknown win32_fileres=`file -L $1 2>/dev/null` case $win32_fileres in *ar\ archive\ import\ library*) # definitely import @@ -3552,16 +5180,29 @@ func_win32_libid () # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then - func_to_tool_file "$1" func_convert_file_msys_to_w32 - win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | - $SED -n -e ' + case $nm_interface in + "MS dumpbin") + if func_cygming_ms_implib_p "$1" || + func_cygming_gnu_implib_p "$1" + then + win32_nmres=import + else + win32_nmres= + fi + ;; + *) + func_to_tool_file "$1" func_convert_file_msys_to_w32 + win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | + $SED -n -e ' 1,100{ / I /{ - s,.*,import, + s|.*|import| p q } }'` + ;; + esac case $win32_nmres in import*) win32_libid_type="x86 archive import";; *) win32_libid_type="x86 archive static";; @@ -3593,7 +5234,8 @@ func_win32_libid () # $sharedlib_from_linklib_result func_cygming_dll_for_implib () { - $opt_debug + $debug_cmd + sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` } @@ -3610,7 +5252,8 @@ func_cygming_dll_for_implib () # specified import library. func_cygming_dll_for_implib_fallback_core () { - $opt_debug + $debug_cmd + match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` $OBJDUMP -s --section "$1" "$2" 2>/dev/null | $SED '/^Contents of section '"$match_literal"':/{ @@ -3646,8 +5289,8 @@ func_cygming_dll_for_implib_fallback_core () /./p' | # we now have a list, one entry per line, of the stringified # contents of the appropriate section of all members of the - # archive which possess that section. Heuristic: eliminate - # all those which have a first or second character that is + # archive that possess that section. Heuristic: eliminate + # all those that have a first or second character that is # a '.' (that is, objdump's representation of an unprintable # character.) This should work for all archives with less than # 0x302f exports -- but will fail for DLLs whose name actually @@ -3658,30 +5301,6 @@ func_cygming_dll_for_implib_fallback_core () $SED -e '/^\./d;/^.\./d;q' } -# func_cygming_gnu_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is a GNU/binutils-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_gnu_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` - test -n "$func_cygming_gnu_implib_tmp" -} - -# func_cygming_ms_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is an MS-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_ms_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` - test -n "$func_cygming_ms_implib_tmp" -} - # func_cygming_dll_for_implib_fallback ARG # Platform-specific function to extract the # name of the DLL associated with the specified @@ -3695,16 +5314,17 @@ func_cygming_ms_implib_p () # $sharedlib_from_linklib_result func_cygming_dll_for_implib_fallback () { - $opt_debug - if func_cygming_gnu_implib_p "$1" ; then + $debug_cmd + + if func_cygming_gnu_implib_p "$1"; then # binutils import library sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` - elif func_cygming_ms_implib_p "$1" ; then + elif func_cygming_ms_implib_p "$1"; then # ms-generated import library sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` else # unknown - sharedlib_from_linklib_result="" + sharedlib_from_linklib_result= fi } @@ -3712,10 +5332,11 @@ func_cygming_dll_for_implib_fallback () # func_extract_an_archive dir oldlib func_extract_an_archive () { - $opt_debug - f_ex_an_ar_dir="$1"; shift - f_ex_an_ar_oldlib="$1" - if test "$lock_old_archive_extraction" = yes; then + $debug_cmd + + f_ex_an_ar_dir=$1; shift + f_ex_an_ar_oldlib=$1 + if test yes = "$lock_old_archive_extraction"; then lockfile=$f_ex_an_ar_oldlib.lock until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do func_echo "Waiting for $lockfile to be removed" @@ -3724,7 +5345,7 @@ func_extract_an_archive () fi func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ 'stat=$?; rm -f "$lockfile"; exit $stat' - if test "$lock_old_archive_extraction" = yes; then + if test yes = "$lock_old_archive_extraction"; then $opt_dry_run || rm -f "$lockfile" fi if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then @@ -3738,22 +5359,23 @@ func_extract_an_archive () # func_extract_archives gentop oldlib ... func_extract_archives () { - $opt_debug - my_gentop="$1"; shift + $debug_cmd + + my_gentop=$1; shift my_oldlibs=${1+"$@"} - my_oldobjs="" - my_xlib="" - my_xabs="" - my_xdir="" + my_oldobjs= + my_xlib= + my_xabs= + my_xdir= for my_xlib in $my_oldlibs; do # Extract the objects. case $my_xlib in - [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; + [\\/]* | [A-Za-z]:[\\/]*) my_xabs=$my_xlib ;; *) my_xabs=`pwd`"/$my_xlib" ;; esac func_basename "$my_xlib" - my_xlib="$func_basename_result" + my_xlib=$func_basename_result my_xlib_u=$my_xlib while :; do case " $extracted_archives " in @@ -3765,7 +5387,7 @@ func_extract_archives () esac done extracted_archives="$extracted_archives $my_xlib_u" - my_xdir="$my_gentop/$my_xlib_u" + my_xdir=$my_gentop/$my_xlib_u func_mkdir_p "$my_xdir" @@ -3778,22 +5400,23 @@ func_extract_archives () cd $my_xdir || exit $? darwin_archive=$my_xabs darwin_curdir=`pwd` - darwin_base_archive=`basename "$darwin_archive"` + func_basename "$darwin_archive" + darwin_base_archive=$func_basename_result darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true` if test -n "$darwin_arches"; then darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'` darwin_arch= func_verbose "$darwin_base_archive has multiple architectures $darwin_arches" - for darwin_arch in $darwin_arches ; do - func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}" - $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" - cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" - func_extract_an_archive "`pwd`" "${darwin_base_archive}" + for darwin_arch in $darwin_arches; do + func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch" + $LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive" + cd "unfat-$$/$darwin_base_archive-$darwin_arch" + func_extract_an_archive "`pwd`" "$darwin_base_archive" cd "$darwin_curdir" - $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" + $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" done # $darwin_arches ## Okay now we've a bunch of thin objects, gotta fatten them up :) - darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u` + darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u` darwin_file= darwin_files= for darwin_file in $darwin_filelist; do @@ -3815,7 +5438,7 @@ func_extract_archives () my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` done - func_extract_archives_result="$my_oldobjs" + func_extract_archives_result=$my_oldobjs } @@ -3830,7 +5453,7 @@ func_extract_archives () # # ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR # variable will take. If 'yes', then the emitted script -# will assume that the directory in which it is stored is +# will assume that the directory where it is stored is # the $objdir directory. This is a cygwin/mingw-specific # behavior. func_emit_wrapper () @@ -3841,7 +5464,7 @@ func_emit_wrapper () #! $SHELL # $output - temporary wrapper script for $objdir/$outputname -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# Generated by $PROGRAM (GNU $PACKAGE) $VERSION # # The $output program cannot be directly executed until all the libtool # libraries that it depends on are installed. @@ -3883,7 +5506,8 @@ else if test \"\$libtool_execute_magic\" != \"$magic\"; then file=\"\$0\"" - qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` + func_quote_arg pretty "$ECHO" + qECHO=$func_quote_arg_result $ECHO "\ # A function that is used when there is no print builtin or printf. @@ -3893,14 +5517,14 @@ func_fallback_echo () \$1 _LTECHO_EOF' } - ECHO=\"$qECHO\" + ECHO=$qECHO fi # Very basic option parsing. These options are (a) specific to # the libtool wrapper, (b) are identical between the wrapper -# /script/ and the wrapper /executable/ which is used only on +# /script/ and the wrapper /executable/ that is used only on # windows platforms, and (c) all begin with the string "--lt-" -# (application programs are unlikely to have options which match +# (application programs are unlikely to have options that match # this pattern). # # There are only two supported options: --lt-debug and @@ -3933,7 +5557,7 @@ func_parse_lt_options () # Print the debug banner immediately: if test -n \"\$lt_option_debug\"; then - echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 + echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2 fi } @@ -3944,7 +5568,7 @@ func_lt_dump_args () lt_dump_args_N=1; for lt_arg do - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" + \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\" lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` done } @@ -3958,7 +5582,7 @@ func_exec_program_core () *-*-mingw | *-*-os2* | *-cegcc*) $ECHO "\ if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 + \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2 func_lt_dump_args \${1+\"\$@\"} 1>&2 fi exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} @@ -3968,7 +5592,7 @@ func_exec_program_core () *) $ECHO "\ if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 + \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2 func_lt_dump_args \${1+\"\$@\"} 1>&2 fi exec \"\$progdir/\$program\" \${1+\"\$@\"} @@ -4043,13 +5667,13 @@ func_exec_program () test -n \"\$absdir\" && thisdir=\"\$absdir\" " - if test "$fast_install" = yes; then + if test yes = "$fast_install"; then $ECHO "\ program=lt-'$outputname'$exeext progdir=\"\$thisdir/$objdir\" if test ! -f \"\$progdir/\$program\" || - { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ + { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\ test \"X\$file\" != \"X\$progdir/\$program\"; }; then file=\"\$\$-\$program\" @@ -4066,7 +5690,7 @@ func_exec_program () if test -n \"\$relink_command\"; then if relink_command_output=\`eval \$relink_command 2>&1\`; then : else - $ECHO \"\$relink_command_output\" >&2 + \$ECHO \"\$relink_command_output\" >&2 $RM \"\$progdir/\$file\" exit 1 fi @@ -4101,7 +5725,7 @@ func_exec_program () fi # Export our shlibpath_var if we have one. - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then + if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then $ECHO "\ # Add our own library path to $shlibpath_var $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" @@ -4121,7 +5745,7 @@ func_exec_program () fi else # The program doesn't exist. - \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 + \$ECHO \"\$0: error: '\$progdir/\$program' does not exist\" 1>&2 \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 exit 1 @@ -4140,7 +5764,7 @@ func_emit_cwrapperexe_src () cat < #include +#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0) + /* declarations of non-ANSI functions */ -#if defined(__MINGW32__) +#if defined __MINGW32__ # ifdef __STRICT_ANSI__ int _putenv (const char *); # endif -#elif defined(__CYGWIN__) +#elif defined __CYGWIN__ # ifdef __STRICT_ANSI__ char *realpath (const char *, char *); int putenv (char *); int setenv (const char *, const char *, int); # endif -/* #elif defined (other platforms) ... */ +/* #elif defined other_platform || defined ... */ #endif /* portability defines, excluding path handling macros */ -#if defined(_MSC_VER) +#if defined _MSC_VER # define setmode _setmode # define stat _stat # define chmod _chmod # define getcwd _getcwd # define putenv _putenv # define S_IXUSR _S_IEXEC -# ifndef _INTPTR_T_DEFINED -# define _INTPTR_T_DEFINED -# define intptr_t int -# endif -#elif defined(__MINGW32__) +#elif defined __MINGW32__ # define setmode _setmode # define stat _stat # define chmod _chmod # define getcwd _getcwd # define putenv _putenv -#elif defined(__CYGWIN__) +#elif defined __CYGWIN__ # define HAVE_SETENV # define FOPEN_WB "wb" -/* #elif defined (other platforms) ... */ +/* #elif defined other platforms ... */ #endif -#if defined(PATH_MAX) +#if defined PATH_MAX # define LT_PATHMAX PATH_MAX -#elif defined(MAXPATHLEN) +#elif defined MAXPATHLEN # define LT_PATHMAX MAXPATHLEN #else # define LT_PATHMAX 1024 @@ -4234,8 +5856,8 @@ int setenv (const char *, const char *, int); # define PATH_SEPARATOR ':' #endif -#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ - defined (__OS2__) +#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \ + defined __OS2__ # define HAVE_DOS_BASED_FILE_SYSTEM # define FOPEN_WB "wb" # ifndef DIR_SEPARATOR_2 @@ -4268,10 +5890,10 @@ int setenv (const char *, const char *, int); #define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) #define XFREE(stale) do { \ - if (stale) { free ((void *) stale); stale = 0; } \ + if (stale) { free (stale); stale = 0; } \ } while (0) -#if defined(LT_DEBUGWRAPPER) +#if defined LT_DEBUGWRAPPER static int lt_debug = 1; #else static int lt_debug = 0; @@ -4300,11 +5922,16 @@ void lt_dump_script (FILE *f); EOF cat < 0) && IS_PATH_SEPARATOR (new_value[len-1])) + size_t len = strlen (new_value); + while ((len > 0) && IS_PATH_SEPARATOR (new_value[len-1])) { - new_value[len-1] = '\0'; + new_value[--len] = '\0'; } lt_setenv (name, new_value); XFREE (new_value); @@ -5082,27 +6709,47 @@ EOF # True if ARG is an import lib, as indicated by $file_magic_cmd func_win32_import_lib_p () { - $opt_debug + $debug_cmd + case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in *import*) : ;; *) false ;; esac } +# func_suncc_cstd_abi +# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!! +# Several compiler flags select an ABI that is incompatible with the +# Cstd library. Avoid specifying it if any are in CXXFLAGS. +func_suncc_cstd_abi () +{ + $debug_cmd + + case " $compile_command " in + *" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*) + suncc_use_cstd_abi=no + ;; + *) + suncc_use_cstd_abi=yes + ;; + esac +} + # func_mode_link arg... func_mode_link () { - $opt_debug + $debug_cmd + case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) # It is impossible to link a dll without this setting, and # we shouldn't force the makefile maintainer to figure out - # which system we are compiling for in order to pass an extra + # what system we are compiling for in order to pass an extra # flag for every libtool invocation. # allow_undefined=no # FIXME: Unfortunately, there are problems with the above when trying - # to make a dll which has undefined symbols, in which case not + # to make a dll that has undefined symbols, in which case not # even a static library is built. For now, we need to specify # -no-undefined on the libtool link line when we can be certain # that all symbols are satisfied, otherwise we get a static library. @@ -5146,10 +6793,11 @@ func_mode_link () module=no no_install=no objs= + os2dllname= non_pic_objects= precious_files_regex= prefer_static_libs=no - preload=no + preload=false prev= prevarg= release= @@ -5161,7 +6809,7 @@ func_mode_link () vinfo= vinfo_number=no weak_libs= - single_module="${wl}-single_module" + single_module=$wl-single_module func_infer_tag $base_compile # We need to know -static, to get the right output filenames. @@ -5169,15 +6817,15 @@ func_mode_link () do case $arg in -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" + test yes != "$build_libtool_libs" \ + && func_fatal_configuration "cannot build a shared library" build_old_libs=no break ;; -all-static | -static | -static-libtool-libs) case $arg in -all-static) - if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then + if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then func_warning "complete static linking is impossible in this configuration" fi if test -n "$link_static_flag"; then @@ -5210,11 +6858,11 @@ func_mode_link () # Go through the arguments, transforming them on the way. while test "$#" -gt 0; do - arg="$1" + arg=$1 shift - func_quote_for_eval "$arg" - qarg=$func_quote_for_eval_unquoted_result - func_append libtool_args " $func_quote_for_eval_result" + func_quote_arg pretty,unquoted "$arg" + qarg=$func_quote_arg_unquoted_result + func_append libtool_args " $func_quote_arg_result" # If the previous option needs an argument, assign it. if test -n "$prev"; then @@ -5227,21 +6875,21 @@ func_mode_link () case $prev in bindir) - bindir="$arg" + bindir=$arg prev= continue ;; dlfiles|dlprefiles) - if test "$preload" = no; then + $preload || { # Add the symbol object into the linking commands. func_append compile_command " @SYMFILE@" func_append finalize_command " @SYMFILE@" - preload=yes - fi + preload=: + } case $arg in *.la | *.lo) ;; # We handle these cases below. force) - if test "$dlself" = no; then + if test no = "$dlself"; then dlself=needless export_dynamic=yes fi @@ -5249,9 +6897,9 @@ func_mode_link () continue ;; self) - if test "$prev" = dlprefiles; then + if test dlprefiles = "$prev"; then dlself=yes - elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then + elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then dlself=yes else dlself=needless @@ -5261,7 +6909,7 @@ func_mode_link () continue ;; *) - if test "$prev" = dlfiles; then + if test dlfiles = "$prev"; then func_append dlfiles " $arg" else func_append dlprefiles " $arg" @@ -5272,14 +6920,14 @@ func_mode_link () esac ;; expsyms) - export_symbols="$arg" + export_symbols=$arg test -f "$arg" \ - || func_fatal_error "symbol file \`$arg' does not exist" + || func_fatal_error "symbol file '$arg' does not exist" prev= continue ;; expsyms_regex) - export_symbols_regex="$arg" + export_symbols_regex=$arg prev= continue ;; @@ -5297,7 +6945,13 @@ func_mode_link () continue ;; inst_prefix) - inst_prefix_dir="$arg" + inst_prefix_dir=$arg + prev= + continue + ;; + mllvm) + # Clang does not use LLVM to link, so we can simply discard any + # '-mllvm $arg' options when doing the link step. prev= continue ;; @@ -5321,21 +6975,21 @@ func_mode_link () if test -z "$pic_object" || test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" + test none = "$pic_object" && + test none = "$non_pic_object"; then + func_fatal_error "cannot find name of object for '$arg'" fi # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result - if test "$pic_object" != none; then + if test none != "$pic_object"; then # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" + pic_object=$xdir$pic_object - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + if test dlfiles = "$prev"; then + if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then func_append dlfiles " $pic_object" prev= continue @@ -5346,7 +7000,7 @@ func_mode_link () fi # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then + if test dlprefiles = "$prev"; then # Preload the old-style object. func_append dlprefiles " $pic_object" prev= @@ -5354,23 +7008,23 @@ func_mode_link () # A PIC object. func_append libobjs " $pic_object" - arg="$pic_object" + arg=$pic_object fi # Non-PIC object. - if test "$non_pic_object" != none; then + if test none != "$non_pic_object"; then # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" + non_pic_object=$xdir$non_pic_object # A standard non-PIC object func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" + if test -z "$pic_object" || test none = "$pic_object"; then + arg=$non_pic_object fi else # If the PIC object exists, use it instead. # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" + non_pic_object=$pic_object func_append non_pic_objects " $non_pic_object" fi else @@ -5378,7 +7032,7 @@ func_mode_link () if $opt_dry_run; then # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result func_lo2o "$arg" pic_object=$xdir$objdir/$func_lo2o_result @@ -5386,24 +7040,29 @@ func_mode_link () func_append libobjs " $pic_object" func_append non_pic_objects " $non_pic_object" else - func_fatal_error "\`$arg' is not a valid libtool object" + func_fatal_error "'$arg' is not a valid libtool object" fi fi done else - func_fatal_error "link input file \`$arg' does not exist" + func_fatal_error "link input file '$arg' does not exist" fi arg=$save_arg prev= continue ;; + os2dllname) + os2dllname=$arg + prev= + continue + ;; precious_regex) - precious_files_regex="$arg" + precious_files_regex=$arg prev= continue ;; release) - release="-$arg" + release=-$arg prev= continue ;; @@ -5415,7 +7074,7 @@ func_mode_link () func_fatal_error "only absolute run-paths are allowed" ;; esac - if test "$prev" = rpath; then + if test rpath = "$prev"; then case "$rpath " in *" $arg "*) ;; *) func_append rpath " $arg" ;; @@ -5430,7 +7089,7 @@ func_mode_link () continue ;; shrext) - shrext_cmds="$arg" + shrext_cmds=$arg prev= continue ;; @@ -5439,6 +7098,13 @@ func_mode_link () prev= continue ;; + xassembler) + func_append compiler_flags " -Xassembler $qarg" + prev= + func_append compile_command " -Xassembler $qarg" + func_append finalize_command " -Xassembler $qarg" + continue + ;; xcclinker) func_append linker_flags " $qarg" func_append compiler_flags " $qarg" @@ -5470,7 +7136,7 @@ func_mode_link () esac fi # test -n "$prev" - prevarg="$arg" + prevarg=$arg case $arg in -all-static) @@ -5484,7 +7150,7 @@ func_mode_link () -allow-undefined) # FIXME: remove this flag sometime in the future. - func_fatal_error "\`-allow-undefined' must not be used because it is the default" + func_fatal_error "'-allow-undefined' must not be used because it is the default" ;; -avoid-version) @@ -5516,7 +7182,7 @@ func_mode_link () if test -n "$export_symbols" || test -n "$export_symbols_regex"; then func_fatal_error "more than one -exported-symbols argument is not allowed" fi - if test "X$arg" = "X-export-symbols"; then + if test X-export-symbols = "X$arg"; then prev=expsyms else prev=expsyms_regex @@ -5550,9 +7216,9 @@ func_mode_link () func_stripname "-L" '' "$arg" if test -z "$func_stripname_result"; then if test "$#" -gt 0; then - func_fatal_error "require no space between \`-L' and \`$1'" + func_fatal_error "require no space between '-L' and '$1'" else - func_fatal_error "need path for \`-L' option" + func_fatal_error "need path for '-L' option" fi fi func_resolve_sysroot "$func_stripname_result" @@ -5563,8 +7229,8 @@ func_mode_link () *) absdir=`cd "$dir" && pwd` test -z "$absdir" && \ - func_fatal_error "cannot determine absolute directory name of \`$dir'" - dir="$absdir" + func_fatal_error "cannot determine absolute directory name of '$dir'" + dir=$absdir ;; esac case "$deplibs " in @@ -5599,7 +7265,7 @@ func_mode_link () ;; -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then + if test X-lc = "X$arg" || test X-lm = "X$arg"; then case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) # These systems don't actually have a C or math library (as such) @@ -5607,11 +7273,11 @@ func_mode_link () ;; *-*-os2*) # These systems don't actually have a C library (as such) - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig* | *-*-midnightbsd*) # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; *-*-rhapsody* | *-*-darwin1.[012]) # Rhapsody C and math libraries are in the System framework @@ -5620,16 +7286,16 @@ func_mode_link () ;; *-*-sco3.2v5* | *-*-sco5v6*) # Causes problems with __ctype - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) # Compiler inserts libc in the correct place for threads to work - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; esac - elif test "X$arg" = "X-lc_r"; then + elif test X-lc_r = "X$arg"; then case $host in - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig* | *-*-midnightbsd*) # Do not include libc_r directly, use -pthread flag. continue ;; @@ -5639,6 +7305,11 @@ func_mode_link () continue ;; + -mllvm) + prev=mllvm + continue + ;; + -module) module=yes continue @@ -5654,8 +7325,20 @@ func_mode_link () prev=xcompiler continue ;; - - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + # Solaris ld rejects as of 11.4. Refer to Oracle bug 22985199. + -pthread) + case $host in + *solaris2*) ;; + *) + case "$new_inherited_linker_flags " in + *" $arg "*) ;; + * ) func_append new_inherited_linker_flags " $arg" ;; + esac + ;; + esac + continue + ;; + -mt|-mthreads|-kthread|-Kthread|-pthreads|--thread-safe \ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) func_append compiler_flags " $arg" func_append compile_command " $arg" @@ -5668,7 +7351,7 @@ func_mode_link () ;; -multi_module) - single_module="${wl}-multi_module" + single_module=$wl-multi_module continue ;; @@ -5682,8 +7365,8 @@ func_mode_link () *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) # The PATH hackery in wrapper scripts is required on Windows # and Darwin in order for the loader to find any dlls it needs. - func_warning "\`-no-install' is ignored for $host" - func_warning "assuming \`-no-fast-install' instead" + func_warning "'-no-install' is ignored for $host" + func_warning "assuming '-no-fast-install' instead" fast_install=no ;; *) no_install=yes ;; @@ -5701,6 +7384,11 @@ func_mode_link () continue ;; + -os2dllname) + prev=os2dllname + continue + ;; + -o) prev=output ;; -precious-files-regex) @@ -5788,14 +7476,14 @@ func_mode_link () func_stripname '-Wc,' '' "$arg" args=$func_stripname_result arg= - save_ifs="$IFS"; IFS=',' + save_ifs=$IFS; IFS=, for flag in $args; do - IFS="$save_ifs" - func_quote_for_eval "$flag" - func_append arg " $func_quote_for_eval_result" - func_append compiler_flags " $func_quote_for_eval_result" + IFS=$save_ifs + func_quote_arg pretty "$flag" + func_append arg " $func_quote_arg_result" + func_append compiler_flags " $func_quote_arg_result" done - IFS="$save_ifs" + IFS=$save_ifs func_stripname ' ' '' "$arg" arg=$func_stripname_result ;; @@ -5804,19 +7492,24 @@ func_mode_link () func_stripname '-Wl,' '' "$arg" args=$func_stripname_result arg= - save_ifs="$IFS"; IFS=',' + save_ifs=$IFS; IFS=, for flag in $args; do - IFS="$save_ifs" - func_quote_for_eval "$flag" - func_append arg " $wl$func_quote_for_eval_result" - func_append compiler_flags " $wl$func_quote_for_eval_result" - func_append linker_flags " $func_quote_for_eval_result" + IFS=$save_ifs + func_quote_arg pretty "$flag" + func_append arg " $wl$func_quote_arg_result" + func_append compiler_flags " $wl$func_quote_arg_result" + func_append linker_flags " $func_quote_arg_result" done - IFS="$save_ifs" + IFS=$save_ifs func_stripname ' ' '' "$arg" arg=$func_stripname_result ;; + -Xassembler) + prev=xassembler + continue + ;; + -Xcompiler) prev=xcompiler continue @@ -5834,8 +7527,8 @@ func_mode_link () # -msg_* for osf cc -msg_*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + func_quote_arg pretty "$arg" + arg=$func_quote_arg_result ;; # Flags to be passed through unchanged, with rationale: @@ -5847,25 +7540,53 @@ func_mode_link () # -m*, -t[45]*, -txscale* architecture-specific flags for GCC # -F/path path to uninstalled frameworks, gcc on darwin # -p, -pg, --coverage, -fprofile-* profiling flags for GCC + # -fstack-protector* stack protector flags for GCC # @file GCC response files # -tp=* Portland pgcc target processor selection # --sysroot=* for sysroot support - # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + # -specs=* GCC specs files + # -stdlib=* select c++ std lib with clang + # -fsanitize=* Clang/GCC memory and address sanitizer + # -fuse-ld=* Linker select flags for GCC + # -static-* direct GCC to link specific libraries statically + # -fcilkplus Cilk Plus language extension features for C/C++ + # -Wa,* Pass flags directly to the assembler -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ - -O*|-flto*|-fwhopr*|-fuse-linker-plugin) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ + -specs=*|-fsanitize=*|-fuse-ld=*|-static-*|-fcilkplus|-Wa,*) + func_quote_arg pretty "$arg" + arg=$func_quote_arg_result func_append compile_command " $arg" func_append finalize_command " $arg" func_append compiler_flags " $arg" continue ;; + -Z*) + if test os2 = "`expr $host : '.*\(os2\)'`"; then + # OS/2 uses -Zxxx to specify OS/2-specific options + compiler_flags="$compiler_flags $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + case $arg in + -Zlinker | -Zstack) + prev=xcompiler + ;; + esac + continue + else + # Otherwise treat like 'Some other compiler flag' below + func_quote_arg pretty "$arg" + arg=$func_quote_arg_result + fi + ;; + # Some other compiler flag. -* | +*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + func_quote_arg pretty "$arg" + arg=$func_quote_arg_result ;; *.$objext) @@ -5886,21 +7607,21 @@ func_mode_link () if test -z "$pic_object" || test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" + test none = "$pic_object" && + test none = "$non_pic_object"; then + func_fatal_error "cannot find name of object for '$arg'" fi # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result - if test "$pic_object" != none; then + test none = "$pic_object" || { # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" + pic_object=$xdir$pic_object - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + if test dlfiles = "$prev"; then + if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then func_append dlfiles " $pic_object" prev= continue @@ -5911,7 +7632,7 @@ func_mode_link () fi # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then + if test dlprefiles = "$prev"; then # Preload the old-style object. func_append dlprefiles " $pic_object" prev= @@ -5919,23 +7640,23 @@ func_mode_link () # A PIC object. func_append libobjs " $pic_object" - arg="$pic_object" - fi + arg=$pic_object + } # Non-PIC object. - if test "$non_pic_object" != none; then + if test none != "$non_pic_object"; then # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" + non_pic_object=$xdir$non_pic_object # A standard non-PIC object func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" + if test -z "$pic_object" || test none = "$pic_object"; then + arg=$non_pic_object fi else # If the PIC object exists, use it instead. # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" + non_pic_object=$pic_object func_append non_pic_objects " $non_pic_object" fi else @@ -5943,7 +7664,7 @@ func_mode_link () if $opt_dry_run; then # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result func_lo2o "$arg" pic_object=$xdir$objdir/$func_lo2o_result @@ -5951,7 +7672,7 @@ func_mode_link () func_append libobjs " $pic_object" func_append non_pic_objects " $non_pic_object" else - func_fatal_error "\`$arg' is not a valid libtool object" + func_fatal_error "'$arg' is not a valid libtool object" fi fi ;; @@ -5967,11 +7688,11 @@ func_mode_link () # A libtool-controlled library. func_resolve_sysroot "$arg" - if test "$prev" = dlfiles; then + if test dlfiles = "$prev"; then # This library was specified with -dlopen. func_append dlfiles " $func_resolve_sysroot_result" prev= - elif test "$prev" = dlprefiles; then + elif test dlprefiles = "$prev"; then # The library was specified with -dlpreopen. func_append dlprefiles " $func_resolve_sysroot_result" prev= @@ -5985,8 +7706,8 @@ func_mode_link () *) # Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + func_quote_arg pretty "$arg" + arg=$func_quote_arg_result ;; esac # arg @@ -5998,9 +7719,9 @@ func_mode_link () done # argument parsing loop test -n "$prev" && \ - func_fatal_help "the \`$prevarg' option requires an argument" + func_fatal_help "the '$prevarg' option requires an argument" - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then + if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then eval arg=\"$export_dynamic_flag_spec\" func_append compile_command " $arg" func_append finalize_command " $arg" @@ -6009,20 +7730,23 @@ func_mode_link () oldlibs= # calculate the name of the file, without its directory func_basename "$output" - outputname="$func_basename_result" - libobjs_save="$libobjs" + outputname=$func_basename_result + libobjs_save=$libobjs if test -n "$shlibpath_var"; then # get the directories listed in $shlibpath_var - eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` + eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\` else shlib_search_path= fi eval sys_lib_search_path=\"$sys_lib_search_path_spec\" eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" + # Definition is injected by LT_CONFIG during libtool generation. + func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH" + func_dirname "$output" "/" "" - output_objdir="$func_dirname_result$objdir" + output_objdir=$func_dirname_result$objdir func_to_tool_file "$output_objdir/" tool_output_objdir=$func_to_tool_file_result # Create the object directory. @@ -6045,7 +7769,7 @@ func_mode_link () # Find all interdependent deplibs by searching for libraries # that are linked more than once (e.g. -la -lb -la) for deplib in $deplibs; do - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac @@ -6053,7 +7777,7 @@ func_mode_link () func_append libs " $deplib" done - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then libs="$predeps $libs $compiler_lib_search_path $postdeps" # Compute libraries that are listed more than once in $predeps @@ -6085,7 +7809,7 @@ func_mode_link () case $file in *.la) ;; *) - func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file" + func_fatal_help "libraries can '-dlopen' only libtool libraries: $file" ;; esac done @@ -6093,7 +7817,7 @@ func_mode_link () prog) compile_deplibs= finalize_deplibs= - alldeplibs=no + alldeplibs=false newdlfiles= newdlprefiles= passes="conv scan dlopen dlpreopen link" @@ -6105,32 +7829,32 @@ func_mode_link () for pass in $passes; do # The preopen pass in lib mode reverses $deplibs; put it back here # so that -L comes before libs that need it for instance... - if test "$linkmode,$pass" = "lib,link"; then + if test lib,link = "$linkmode,$pass"; then ## FIXME: Find the place where the list is rebuilt in the wrong ## order, and fix it there properly tmp_deplibs= for deplib in $deplibs; do tmp_deplibs="$deplib $tmp_deplibs" done - deplibs="$tmp_deplibs" + deplibs=$tmp_deplibs fi - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan"; then - libs="$deplibs" + if test lib,link = "$linkmode,$pass" || + test prog,scan = "$linkmode,$pass"; then + libs=$deplibs deplibs= fi - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then case $pass in - dlopen) libs="$dlfiles" ;; - dlpreopen) libs="$dlprefiles" ;; + dlopen) libs=$dlfiles ;; + dlpreopen) libs=$dlprefiles ;; link) libs="$deplibs %DEPLIBS%" test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" ;; esac fi - if test "$linkmode,$pass" = "lib,dlpreopen"; then + if test lib,dlpreopen = "$linkmode,$pass"; then # Collect and forward deplibs of preopened libtool libs for lib in $dlprefiles; do # Ignore non-libtool-libs @@ -6151,26 +7875,26 @@ func_mode_link () esac done done - libs="$dlprefiles" + libs=$dlprefiles fi - if test "$pass" = dlopen; then + if test dlopen = "$pass"; then # Collect dlpreopened libraries - save_deplibs="$deplibs" + save_deplibs=$deplibs deplibs= fi for deplib in $libs; do lib= - found=no + found=false case $deplib in -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else func_append compiler_flags " $deplib" - if test "$linkmode" = lib ; then + if test lib = "$linkmode"; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; * ) func_append new_inherited_linker_flags " $deplib" ;; @@ -6180,13 +7904,13 @@ func_mode_link () continue ;; -l*) - if test "$linkmode" != lib && test "$linkmode" != prog; then - func_warning "\`-l' is ignored for archives/objects" + if test lib != "$linkmode" && test prog != "$linkmode"; then + func_warning "'-l' is ignored for archives/objects" continue fi func_stripname '-l' '' "$deplib" name=$func_stripname_result - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" else searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" @@ -6194,31 +7918,22 @@ func_mode_link () for searchdir in $searchdirs; do for search_ext in .la $std_shrext .so .a; do # Search the libtool library - lib="$searchdir/lib${name}${search_ext}" + lib=$searchdir/lib$name$search_ext if test -f "$lib"; then - if test "$search_ext" = ".la"; then - found=yes + if test .la = "$search_ext"; then + found=: else - found=no + found=false fi break 2 fi done done - if test "$found" != yes; then - # deplib doesn't seem to be a libtool library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - else # deplib is a libtool library + if $found; then + # deplib is a libtool library # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, # We need to do some special things here, and not later. - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $deplib "*) if func_lalib_p "$lib"; then @@ -6226,19 +7941,19 @@ func_mode_link () old_library= func_source "$lib" for l in $old_library $library_names; do - ll="$l" + ll=$l done - if test "X$ll" = "X$old_library" ; then # only static version available - found=no + if test "X$ll" = "X$old_library"; then # only static version available + found=false func_dirname "$lib" "" "." - ladir="$func_dirname_result" + ladir=$func_dirname_result lib=$ladir/$old_library - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" + test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs" fi continue fi @@ -6247,15 +7962,25 @@ func_mode_link () *) ;; esac fi + else + # deplib doesn't seem to be a libtool library + if test prog,link = "$linkmode,$pass"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs" + fi + continue fi ;; # -l *.ltframework) - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else deplibs="$deplib $deplibs" - if test "$linkmode" = lib ; then + if test lib = "$linkmode"; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; * ) func_append new_inherited_linker_flags " $deplib" ;; @@ -6268,18 +7993,18 @@ func_mode_link () case $linkmode in lib) deplibs="$deplib $deplibs" - test "$pass" = conv && continue + test conv = "$pass" && continue newdependency_libs="$deplib $newdependency_libs" func_stripname '-L' '' "$deplib" func_resolve_sysroot "$func_stripname_result" func_append newlib_search_path " $func_resolve_sysroot_result" ;; prog) - if test "$pass" = conv; then + if test conv = "$pass"; then deplibs="$deplib $deplibs" continue fi - if test "$pass" = scan; then + if test scan = "$pass"; then deplibs="$deplib $deplibs" else compile_deplibs="$deplib $compile_deplibs" @@ -6290,13 +8015,13 @@ func_mode_link () func_append newlib_search_path " $func_resolve_sysroot_result" ;; *) - func_warning "\`-L' is ignored for archives/objects" + func_warning "'-L' is ignored for archives/objects" ;; esac # linkmode continue ;; # -L -R*) - if test "$pass" = link; then + if test link = "$pass"; then func_stripname '-R' '' "$deplib" func_resolve_sysroot "$func_stripname_result" dir=$func_resolve_sysroot_result @@ -6314,7 +8039,7 @@ func_mode_link () lib=$func_resolve_sysroot_result ;; *.$libext) - if test "$pass" = conv; then + if test conv = "$pass"; then deplibs="$deplib $deplibs" continue fi @@ -6325,21 +8050,26 @@ func_mode_link () case " $dlpreconveniencelibs " in *" $deplib "*) ;; *) - valid_a_lib=no + valid_a_lib=false case $deplibs_check_method in match_pattern*) set dummy $deplibs_check_method; shift match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ | $EGREP "$match_pattern_regex" > /dev/null; then - valid_a_lib=yes + valid_a_lib=: fi ;; pass_all) - valid_a_lib=yes + valid_a_lib=: ;; esac - if test "$valid_a_lib" != yes; then + if $valid_a_lib; then + echo + $ECHO "*** Warning: Linking the shared library $output against the" + $ECHO "*** static library $deplib is not portable!" + deplibs="$deplib $deplibs" + else echo $ECHO "*** Warning: Trying to link with static lib archive $deplib." echo "*** I have the capability to make that library automatically link in when" @@ -6347,18 +8077,13 @@ func_mode_link () echo "*** shared version of the library, which you do not appear to have" echo "*** because the file extensions .$libext of this argument makes me believe" echo "*** that it is just a static archive that I should not use here." - else - echo - $ECHO "*** Warning: Linking the shared library $output against the" - $ECHO "*** static library $deplib is not portable!" - deplibs="$deplib $deplibs" fi ;; esac continue ;; prog) - if test "$pass" != link; then + if test link != "$pass"; then deplibs="$deplib $deplibs" else compile_deplibs="$deplib $compile_deplibs" @@ -6369,10 +8094,10 @@ func_mode_link () esac # linkmode ;; # *.$libext *.lo | *.$objext) - if test "$pass" = conv; then + if test conv = "$pass"; then deplibs="$deplib $deplibs" - elif test "$linkmode" = prog; then - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then + elif test prog = "$linkmode"; then + if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then # If there is no dlopen support or we're linking statically, # we need to preload. func_append newdlprefiles " $deplib" @@ -6385,22 +8110,20 @@ func_mode_link () continue ;; %DEPLIBS%) - alldeplibs=yes + alldeplibs=: continue ;; esac # case $deplib - if test "$found" = yes || test -f "$lib"; then : - else - func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'" - fi + $found || test -f "$lib" \ + || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'" # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$lib" \ - || func_fatal_error "\`$lib' is not a valid libtool archive" + || func_fatal_error "'$lib' is not a valid libtool archive" func_dirname "$lib" "" "." - ladir="$func_dirname_result" + ladir=$func_dirname_result dlname= dlopen= @@ -6430,19 +8153,19 @@ func_mode_link () done fi dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan" || - { test "$linkmode" != prog && test "$linkmode" != lib; }; then + if test lib,link = "$linkmode,$pass" || + test prog,scan = "$linkmode,$pass" || + { test prog != "$linkmode" && test lib != "$linkmode"; }; then test -n "$dlopen" && func_append dlfiles " $dlopen" test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" fi - if test "$pass" = conv; then + if test conv = "$pass"; then # Only check for convenience libraries deplibs="$lib $deplibs" if test -z "$libdir"; then if test -z "$old_library"; then - func_fatal_error "cannot find name of link library for \`$lib'" + func_fatal_error "cannot find name of link library for '$lib'" fi # It is a libtool convenience library, so add in its objects. func_append convenience " $ladir/$objdir/$old_library" @@ -6450,15 +8173,15 @@ func_mode_link () tmp_libs= for deplib in $dependency_libs; do deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$tmp_libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac fi func_append tmp_libs " $deplib" done - elif test "$linkmode" != prog && test "$linkmode" != lib; then - func_fatal_error "\`$lib' is not a convenience library" + elif test prog != "$linkmode" && test lib != "$linkmode"; then + func_fatal_error "'$lib' is not a convenience library" fi continue fi # $pass = conv @@ -6467,26 +8190,26 @@ func_mode_link () # Get the name of the library we link against. linklib= if test -n "$old_library" && - { test "$prefer_static_libs" = yes || - test "$prefer_static_libs,$installed" = "built,no"; }; then + { test yes = "$prefer_static_libs" || + test built,no = "$prefer_static_libs,$installed"; }; then linklib=$old_library else for l in $old_library $library_names; do - linklib="$l" + linklib=$l done fi if test -z "$linklib"; then - func_fatal_error "cannot find name of link library for \`$lib'" + func_fatal_error "cannot find name of link library for '$lib'" fi # This library was specified with -dlopen. - if test "$pass" = dlopen; then - if test -z "$libdir"; then - func_fatal_error "cannot -dlopen a convenience library: \`$lib'" - fi + if test dlopen = "$pass"; then + test -z "$libdir" \ + && func_fatal_error "cannot -dlopen a convenience library: '$lib'" if test -z "$dlname" || - test "$dlopen_support" != yes || - test "$build_libtool_libs" = no; then + test yes != "$dlopen_support" || + test no = "$build_libtool_libs" + then # If there is no dlname, no dlopen support or we're linking # statically, we need to preload. We also need to preload any # dependent libraries so libltdl's deplib preloader doesn't @@ -6500,40 +8223,40 @@ func_mode_link () # We need an absolute path. case $ladir in - [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; + [\\/]* | [A-Za-z]:[\\/]*) abs_ladir=$ladir ;; *) abs_ladir=`cd "$ladir" && pwd` if test -z "$abs_ladir"; then - func_warning "cannot determine absolute directory name of \`$ladir'" + func_warning "cannot determine absolute directory name of '$ladir'" func_warning "passing it literally to the linker, although it might fail" - abs_ladir="$ladir" + abs_ladir=$ladir fi ;; esac func_basename "$lib" - laname="$func_basename_result" + laname=$func_basename_result # Find the relevant object directory and library name. - if test "X$installed" = Xyes; then + if test yes = "$installed"; then if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then - func_warning "library \`$lib' was moved." - dir="$ladir" - absdir="$abs_ladir" - libdir="$abs_ladir" + func_warning "library '$lib' was moved." + dir=$ladir + absdir=$abs_ladir + libdir=$abs_ladir else - dir="$lt_sysroot$libdir" - absdir="$lt_sysroot$libdir" + dir=$lt_sysroot$libdir + absdir=$lt_sysroot$libdir fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes + test yes = "$hardcode_automatic" && avoidtemprpath=yes else if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then - dir="$ladir" - absdir="$abs_ladir" + dir=$ladir + absdir=$abs_ladir # Remove this search path later func_append notinst_path " $abs_ladir" else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" + dir=$ladir/$objdir + absdir=$abs_ladir/$objdir # Remove this search path later func_append notinst_path " $abs_ladir" fi @@ -6542,11 +8265,11 @@ func_mode_link () name=$func_stripname_result # This library was specified with -dlpreopen. - if test "$pass" = dlpreopen; then - if test -z "$libdir" && test "$linkmode" = prog; then - func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" + if test dlpreopen = "$pass"; then + if test -z "$libdir" && test prog = "$linkmode"; then + func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'" fi - case "$host" in + case $host in # special handling for platforms with PE-DLLs. *cygwin* | *mingw* | *cegcc* ) # Linker will automatically link against shared library if both @@ -6590,9 +8313,9 @@ func_mode_link () if test -z "$libdir"; then # Link the convenience library - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then deplibs="$dir/$old_library $deplibs" - elif test "$linkmode,$pass" = "prog,link"; then + elif test prog,link = "$linkmode,$pass"; then compile_deplibs="$dir/$old_library $compile_deplibs" finalize_deplibs="$dir/$old_library $finalize_deplibs" else @@ -6602,14 +8325,14 @@ func_mode_link () fi - if test "$linkmode" = prog && test "$pass" != link; then + if test prog = "$linkmode" && test link != "$pass"; then func_append newlib_search_path " $ladir" deplibs="$lib $deplibs" - linkalldeplibs=no - if test "$link_all_deplibs" != no || test -z "$library_names" || - test "$build_libtool_libs" = no; then - linkalldeplibs=yes + linkalldeplibs=false + if test no != "$link_all_deplibs" || test -z "$library_names" || + test no = "$build_libtool_libs"; then + linkalldeplibs=: fi tmp_libs= @@ -6621,14 +8344,14 @@ func_mode_link () ;; esac # Need to link against all dependency_libs? - if test "$linkalldeplibs" = yes; then + if $linkalldeplibs; then deplibs="$deplib $deplibs" else # Need to hardcode shared library paths # or/and link against static libraries newdependency_libs="$deplib $newdependency_libs" fi - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$tmp_libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac @@ -6638,15 +8361,15 @@ func_mode_link () continue fi # $linkmode = prog... - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then if test -n "$library_names" && - { { test "$prefer_static_libs" = no || - test "$prefer_static_libs,$installed" = "built,yes"; } || + { { test no = "$prefer_static_libs" || + test built,yes = "$prefer_static_libs,$installed"; } || test -z "$old_library"; }; then # We need to hardcode the library path - if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then + if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then # Make sure the rpath contains only unique directories. - case "$temp_rpath:" in + case $temp_rpath: in *"$absdir:"*) ;; *) func_append temp_rpath "$absdir:" ;; esac @@ -6675,9 +8398,9 @@ func_mode_link () esac fi # $linkmode,$pass = prog,link... - if test "$alldeplibs" = yes && - { test "$deplibs_check_method" = pass_all || - { test "$build_libtool_libs" = yes && + if $alldeplibs && + { test pass_all = "$deplibs_check_method" || + { test yes = "$build_libtool_libs" && test -n "$library_names"; }; }; then # We only need to search for static libraries continue @@ -6686,19 +8409,19 @@ func_mode_link () link_static=no # Whether the deplib will be linked statically use_static_libs=$prefer_static_libs - if test "$use_static_libs" = built && test "$installed" = yes; then + if test built = "$use_static_libs" && test yes = "$installed"; then use_static_libs=no fi if test -n "$library_names" && - { test "$use_static_libs" = no || test -z "$old_library"; }; then + { test no = "$use_static_libs" || test -z "$old_library"; }; then case $host in - *cygwin* | *mingw* | *cegcc*) + *cygwin* | *mingw* | *cegcc* | *os2*) # No point in relinking DLLs because paths are not encoded func_append notinst_deplibs " $lib" need_relink=no ;; *) - if test "$installed" = no; then + if test no = "$installed"; then func_append notinst_deplibs " $lib" need_relink=yes fi @@ -6708,24 +8431,24 @@ func_mode_link () # Warn about portability, can't link against -module's on some # systems (darwin). Don't bleat about dlopened modules though! - dlopenmodule="" + dlopenmodule= for dlpremoduletest in $dlprefiles; do if test "X$dlpremoduletest" = "X$lib"; then - dlopenmodule="$dlpremoduletest" + dlopenmodule=$dlpremoduletest break fi done - if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then + if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then echo - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then $ECHO "*** Warning: Linking the executable $output against the loadable module" else $ECHO "*** Warning: Linking the shared library $output against the loadable module" fi $ECHO "*** $linklib is not portable!" fi - if test "$linkmode" = lib && - test "$hardcode_into_libs" = yes; then + if test lib = "$linkmode" && + test yes = "$hardcode_into_libs"; then # Hardcode the library path. # Skip directories that are in the system default run-time # search path. @@ -6753,43 +8476,43 @@ func_mode_link () # figure out the soname set dummy $library_names shift - realname="$1" + realname=$1 shift libname=`eval "\\$ECHO \"$libname_spec\""` # use dlname if we got it. it's perfectly good, no? if test -n "$dlname"; then - soname="$dlname" + soname=$dlname elif test -n "$soname_spec"; then # bleh windows case $host in - *cygwin* | mingw* | *cegcc*) + *cygwin* | mingw* | *cegcc* | *os2*) func_arith $current - $age major=$func_arith_result - versuffix="-$major" + versuffix=-$major ;; esac eval soname=\"$soname_spec\" else - soname="$realname" + soname=$realname fi # Make a new name for the extract_expsyms_cmds to use - soroot="$soname" + soroot=$soname func_basename "$soroot" - soname="$func_basename_result" + soname=$func_basename_result func_stripname 'lib' '.dll' "$soname" newlib=libimp-$func_stripname_result.a # If the library has no export list, then create one now if test -f "$output_objdir/$soname-def"; then : else - func_verbose "extracting exported symbol list from \`$soname'" + func_verbose "extracting exported symbol list from '$soname'" func_execute_cmds "$extract_expsyms_cmds" 'exit $?' fi # Create $newlib if test -f "$output_objdir/$newlib"; then :; else - func_verbose "generating import library for \`$soname'" + func_verbose "generating import library for '$soname'" func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?' fi # make sure the library variables are pointing to the new library @@ -6797,58 +8520,58 @@ func_mode_link () linklib=$newlib fi # test -n "$old_archive_from_expsyms_cmds" - if test "$linkmode" = prog || test "$opt_mode" != relink; then + if test prog = "$linkmode" || test relink != "$opt_mode"; then add_shlibpath= add_dir= add= lib_linked=yes case $hardcode_action in immediate | unsupported) - if test "$hardcode_direct" = no; then - add="$dir/$linklib" + if test no = "$hardcode_direct"; then + add=$dir/$linklib case $host in - *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; - *-*-sysv4*uw2*) add_dir="-L$dir" ;; + *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;; + *-*-sysv4*uw2*) add_dir=-L$dir ;; *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ - *-*-unixware7*) add_dir="-L$dir" ;; + *-*-unixware7*) add_dir=-L$dir ;; *-*-darwin* ) - # if the lib is a (non-dlopened) module then we can not + # if the lib is a (non-dlopened) module then we cannot # link against it, someone is ignoring the earlier warnings if /usr/bin/file -L $add 2> /dev/null | - $GREP ": [^:]* bundle" >/dev/null ; then + $GREP ": [^:]* bundle" >/dev/null; then if test "X$dlopenmodule" != "X$lib"; then $ECHO "*** Warning: lib $linklib is a module, not a shared library" - if test -z "$old_library" ; then + if test -z "$old_library"; then echo echo "*** And there doesn't seem to be a static archive available" echo "*** The link will probably fail, sorry" else - add="$dir/$old_library" + add=$dir/$old_library fi elif test -n "$old_library"; then - add="$dir/$old_library" + add=$dir/$old_library fi fi esac - elif test "$hardcode_minus_L" = no; then + elif test no = "$hardcode_minus_L"; then case $host in - *-*-sunos*) add_shlibpath="$dir" ;; + *-*-sunos*) add_shlibpath=$dir ;; esac - add_dir="-L$dir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = no; then - add_shlibpath="$dir" - add="-l$name" + add_dir=-L$dir + add=-l$name + elif test no = "$hardcode_shlibpath_var"; then + add_shlibpath=$dir + add=-l$name else lib_linked=no fi ;; relink) - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$dir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$absdir" + if test yes = "$hardcode_direct" && + test no = "$hardcode_direct_absolute"; then + add=$dir/$linklib + elif test yes = "$hardcode_minus_L"; then + add_dir=-L$absdir # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -6857,10 +8580,10 @@ func_mode_link () ;; esac fi - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - add_shlibpath="$dir" - add="-l$name" + add=-l$name + elif test yes = "$hardcode_shlibpath_var"; then + add_shlibpath=$dir + add=-l$name else lib_linked=no fi @@ -6868,7 +8591,7 @@ func_mode_link () *) lib_linked=no ;; esac - if test "$lib_linked" != yes; then + if test yes != "$lib_linked"; then func_fatal_configuration "unsupported hardcode properties" fi @@ -6878,15 +8601,15 @@ func_mode_link () *) func_append compile_shlibpath "$add_shlibpath:" ;; esac fi - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" test -n "$add" && compile_deplibs="$add $compile_deplibs" else test -n "$add_dir" && deplibs="$add_dir $deplibs" test -n "$add" && deplibs="$add $deplibs" - if test "$hardcode_direct" != yes && - test "$hardcode_minus_L" != yes && - test "$hardcode_shlibpath_var" = yes; then + if test yes != "$hardcode_direct" && + test yes != "$hardcode_minus_L" && + test yes = "$hardcode_shlibpath_var"; then case :$finalize_shlibpath: in *":$libdir:"*) ;; *) func_append finalize_shlibpath "$libdir:" ;; @@ -6895,33 +8618,33 @@ func_mode_link () fi fi - if test "$linkmode" = prog || test "$opt_mode" = relink; then + if test prog = "$linkmode" || test relink = "$opt_mode"; then add_shlibpath= add_dir= add= # Finalize command for both is simple: just hardcode it. - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$libdir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$libdir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then + if test yes = "$hardcode_direct" && + test no = "$hardcode_direct_absolute"; then + add=$libdir/$linklib + elif test yes = "$hardcode_minus_L"; then + add_dir=-L$libdir + add=-l$name + elif test yes = "$hardcode_shlibpath_var"; then case :$finalize_shlibpath: in *":$libdir:"*) ;; *) func_append finalize_shlibpath "$libdir:" ;; esac - add="-l$name" - elif test "$hardcode_automatic" = yes; then + add=-l$name + elif test yes = "$hardcode_automatic"; then if test -n "$inst_prefix_dir" && - test -f "$inst_prefix_dir$libdir/$linklib" ; then - add="$inst_prefix_dir$libdir/$linklib" + test -f "$inst_prefix_dir$libdir/$linklib"; then + add=$inst_prefix_dir$libdir/$linklib else - add="$libdir/$linklib" + add=$libdir/$linklib fi else # We cannot seem to hardcode it, guess we'll fake it. - add_dir="-L$libdir" + add_dir=-L$libdir # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -6930,10 +8653,10 @@ func_mode_link () ;; esac fi - add="-l$name" + add=-l$name fi - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" test -n "$add" && finalize_deplibs="$add $finalize_deplibs" else @@ -6941,43 +8664,43 @@ func_mode_link () test -n "$add" && deplibs="$add $deplibs" fi fi - elif test "$linkmode" = prog; then + elif test prog = "$linkmode"; then # Here we assume that one of hardcode_direct or hardcode_minus_L # is not unsupported. This is valid on all known static and # shared platforms. - if test "$hardcode_direct" != unsupported; then - test -n "$old_library" && linklib="$old_library" + if test unsupported != "$hardcode_direct"; then + test -n "$old_library" && linklib=$old_library compile_deplibs="$dir/$linklib $compile_deplibs" finalize_deplibs="$dir/$linklib $finalize_deplibs" else compile_deplibs="-l$name -L$dir $compile_deplibs" finalize_deplibs="-l$name -L$dir $finalize_deplibs" fi - elif test "$build_libtool_libs" = yes; then + elif test yes = "$build_libtool_libs"; then # Not a shared library - if test "$deplibs_check_method" != pass_all; then + if test pass_all != "$deplibs_check_method"; then # We're trying link a shared library against a static one # but the system doesn't support it. # Just print a warning and add the library to dependency_libs so # that the program can be linked against the static library. echo - $ECHO "*** Warning: This system can not link to static lib archive $lib." + $ECHO "*** Warning: This system cannot link to static lib archive $lib." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have." - if test "$module" = yes; then + if test yes = "$module"; then echo "*** But as you try to build a module library, libtool will still create " echo "*** a static module, that should work as long as the dlopening application" echo "*** is linked with the -dlopen flag to resolve symbols at runtime." if test -z "$global_symbol_pipe"; then echo echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** lists from a program, using 'nm' or equivalent, but libtool could" echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." + echo "*** 'nm' from GNU binutils and a full rebuild may help." fi - if test "$build_old_libs" = no; then + if test no = "$build_old_libs"; then build_libtool_libs=module build_old_libs=yes else @@ -6990,11 +8713,11 @@ func_mode_link () fi fi # link shared/static library? - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then if test -n "$dependency_libs" && - { test "$hardcode_into_libs" != yes || - test "$build_old_libs" = yes || - test "$link_static" = yes; }; then + { test yes != "$hardcode_into_libs" || + test yes = "$build_old_libs" || + test yes = "$link_static"; }; then # Extract -R from dependency_libs temp_deplibs= for libdir in $dependency_libs; do @@ -7008,12 +8731,12 @@ func_mode_link () *) func_append temp_deplibs " $libdir";; esac done - dependency_libs="$temp_deplibs" + dependency_libs=$temp_deplibs fi func_append newlib_search_path " $absdir" # Link against this library - test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" + test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs" # ... and its dependency_libs tmp_libs= for deplib in $dependency_libs; do @@ -7023,7 +8746,7 @@ func_mode_link () func_resolve_sysroot "$func_stripname_result";; *) func_resolve_sysroot "$deplib" ;; esac - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$tmp_libs " in *" $func_resolve_sysroot_result "*) func_append specialdeplibs " $func_resolve_sysroot_result" ;; @@ -7032,12 +8755,12 @@ func_mode_link () func_append tmp_libs " $func_resolve_sysroot_result" done - if test "$link_all_deplibs" != no; then + if test no != "$link_all_deplibs"; then # Add the search paths of all dependency libraries for deplib in $dependency_libs; do path= case $deplib in - -L*) path="$deplib" ;; + -L*) path=$deplib ;; *.la) func_resolve_sysroot "$deplib" deplib=$func_resolve_sysroot_result @@ -7045,12 +8768,12 @@ func_mode_link () dir=$func_dirname_result # We need an absolute path. case $dir in - [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; + [\\/]* | [A-Za-z]:[\\/]*) absdir=$dir ;; *) absdir=`cd "$dir" && pwd` if test -z "$absdir"; then - func_warning "cannot determine absolute directory name of \`$dir'" - absdir="$dir" + func_warning "cannot determine absolute directory name of '$dir'" + absdir=$dir fi ;; esac @@ -7058,35 +8781,35 @@ func_mode_link () case $host in *-*-darwin*) depdepl= - eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` - if test -n "$deplibrary_names" ; then - for tmp in $deplibrary_names ; do + eval deplibrary_names=`$SED -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` + if test -n "$deplibrary_names"; then + for tmp in $deplibrary_names; do depdepl=$tmp done - if test -f "$absdir/$objdir/$depdepl" ; then - depdepl="$absdir/$objdir/$depdepl" - darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + if test -f "$absdir/$objdir/$depdepl"; then + depdepl=$absdir/$objdir/$depdepl + darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` if test -z "$darwin_install_name"; then - darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + darwin_install_name=`$OTOOL64 -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` fi - func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" - func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" + func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl" + func_append linker_flags " -dylib_file $darwin_install_name:$depdepl" path= fi fi ;; *) - path="-L$absdir/$objdir" + path=-L$absdir/$objdir ;; esac else - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" + func_fatal_error "'$deplib' is not a valid libtool archive" test "$absdir" != "$libdir" && \ - func_warning "\`$deplib' seems to be moved" + func_warning "'$deplib' seems to be moved" - path="-L$absdir" + path=-L$absdir fi ;; esac @@ -7098,23 +8821,23 @@ func_mode_link () fi # link_all_deplibs != no fi # linkmode = lib done # for deplib in $libs - if test "$pass" = link; then - if test "$linkmode" = "prog"; then + if test link = "$pass"; then + if test prog = "$linkmode"; then compile_deplibs="$new_inherited_linker_flags $compile_deplibs" finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" else compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` fi fi - dependency_libs="$newdependency_libs" - if test "$pass" = dlpreopen; then + dependency_libs=$newdependency_libs + if test dlpreopen = "$pass"; then # Link the dlpreopened libraries before other libraries for deplib in $save_deplibs; do deplibs="$deplib $deplibs" done fi - if test "$pass" != dlopen; then - if test "$pass" != conv; then + if test dlopen != "$pass"; then + test conv = "$pass" || { # Make sure lib_search_path contains only unique directories. lib_search_path= for dir in $newlib_search_path; do @@ -7124,12 +8847,12 @@ func_mode_link () esac done newlib_search_path= - fi + } - if test "$linkmode,$pass" != "prog,link"; then - vars="deplibs" - else + if test prog,link = "$linkmode,$pass"; then vars="compile_deplibs finalize_deplibs" + else + vars=deplibs fi for var in $vars dependency_libs; do # Add libraries to $var in reverse order @@ -7187,62 +8910,93 @@ func_mode_link () eval $var=\"$tmp_libs\" done # for var fi + + # Add Sun CC postdeps if required: + test CXX = "$tagname" && { + case $host_os in + linux*) + case `$CC -V 2>&1 | $SED 5q` in + *Sun\ C*) # Sun C++ 5.9 + func_suncc_cstd_abi + + if test no != "$suncc_use_cstd_abi"; then + func_append postdeps ' -library=Cstd -library=Crun' + fi + ;; + esac + ;; + + solaris*) + func_cc_basename "$CC" + case $func_cc_basename_result in + CC* | sunCC*) + func_suncc_cstd_abi + + if test no != "$suncc_use_cstd_abi"; then + func_append postdeps ' -library=Cstd -library=Crun' + fi + ;; + esac + ;; + esac + } + # Last step: remove runtime libs from dependency_libs # (they stay in deplibs) tmp_libs= - for i in $dependency_libs ; do + for i in $dependency_libs; do case " $predeps $postdeps $compiler_lib_search_path " in *" $i "*) - i="" + i= ;; esac - if test -n "$i" ; then + if test -n "$i"; then func_append tmp_libs " $i" fi done dependency_libs=$tmp_libs done # for pass - if test "$linkmode" = prog; then - dlfiles="$newdlfiles" + if test prog = "$linkmode"; then + dlfiles=$newdlfiles fi - if test "$linkmode" = prog || test "$linkmode" = lib; then - dlprefiles="$newdlprefiles" + if test prog = "$linkmode" || test lib = "$linkmode"; then + dlprefiles=$newdlprefiles fi case $linkmode in oldlib) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for archives" + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then + func_warning "'-dlopen' is ignored for archives" fi case " $deplibs" in *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for archives" ;; + func_warning "'-l' and '-L' are ignored for archives" ;; esac test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for archives" + func_warning "'-rpath' is ignored for archives" test -n "$xrpath" && \ - func_warning "\`-R' is ignored for archives" + func_warning "'-R' is ignored for archives" test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for archives" + func_warning "'-version-info/-version-number' is ignored for archives" test -n "$release" && \ - func_warning "\`-release' is ignored for archives" + func_warning "'-release' is ignored for archives" test -n "$export_symbols$export_symbols_regex" && \ - func_warning "\`-export-symbols' is ignored for archives" + func_warning "'-export-symbols' is ignored for archives" # Now set the variables for building old libraries. build_libtool_libs=no - oldlibs="$output" + oldlibs=$output func_append objs "$old_deplibs" ;; lib) - # Make sure we only generate libraries of the form `libNAME.la'. + # Make sure we only generate libraries of the form 'libNAME.la'. case $outputname in lib*) func_stripname 'lib' '.la' "$outputname" @@ -7251,10 +9005,10 @@ func_mode_link () eval libname=\"$libname_spec\" ;; *) - test "$module" = no && \ - func_fatal_help "libtool library \`$output' must begin with \`lib'" + test no = "$module" \ + && func_fatal_help "libtool library '$output' must begin with 'lib'" - if test "$need_lib_prefix" != no; then + if test no != "$need_lib_prefix"; then # Add the "lib" prefix for modules if required func_stripname '' '.la' "$outputname" name=$func_stripname_result @@ -7268,8 +9022,8 @@ func_mode_link () esac if test -n "$objs"; then - if test "$deplibs_check_method" != pass_all; then - func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" + if test pass_all != "$deplibs_check_method"; then + func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs" else echo $ECHO "*** Warning: Linking the shared library $output against the non-libtool" @@ -7278,21 +9032,21 @@ func_mode_link () fi fi - test "$dlself" != no && \ - func_warning "\`-dlopen self' is ignored for libtool libraries" + test no = "$dlself" \ + || func_warning "'-dlopen self' is ignored for libtool libraries" set dummy $rpath shift - test "$#" -gt 1 && \ - func_warning "ignoring multiple \`-rpath's for a libtool library" + test 1 -lt "$#" \ + && func_warning "ignoring multiple '-rpath's for a libtool library" - install_libdir="$1" + install_libdir=$1 oldlibs= if test -z "$rpath"; then - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then # Building a libtool convenience library. - # Some compilers have problems with a `.al' extension so + # Some compilers have problems with a '.al' extension so # convenience libraries should have the same extension an # archive normally would. oldlibs="$output_objdir/$libname.$libext $oldlibs" @@ -7301,20 +9055,20 @@ func_mode_link () fi test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for convenience libraries" + func_warning "'-version-info/-version-number' is ignored for convenience libraries" test -n "$release" && \ - func_warning "\`-release' is ignored for convenience libraries" + func_warning "'-release' is ignored for convenience libraries" else # Parse the version information argument. - save_ifs="$IFS"; IFS=':' + save_ifs=$IFS; IFS=: set dummy $vinfo 0 0 0 shift - IFS="$save_ifs" + IFS=$save_ifs test -n "$7" && \ - func_fatal_help "too many parameters to \`-version-info'" + func_fatal_help "too many parameters to '-version-info'" # convert absolute version numbers to libtool ages # this retains compatibility with .la files and attempts @@ -7322,45 +9076,45 @@ func_mode_link () case $vinfo_number in yes) - number_major="$1" - number_minor="$2" - number_revision="$3" + number_major=$1 + number_minor=$2 + number_revision=$3 # # There are really only two kinds -- those that # use the current revision as the major version # and those that subtract age and use age as # a minor version. But, then there is irix - # which has an extra 1 added just for fun + # that has an extra 1 added just for fun # case $version_type in # correct linux to gnu/linux during the next big refactor - darwin|linux|osf|windows|none) + darwin|freebsd-elf|linux|midnightbsd-elf|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result - age="$number_minor" - revision="$number_revision" + age=$number_minor + revision=$number_revision ;; - freebsd-aout|freebsd-elf|qnx|sunos) - current="$number_major" - revision="$number_minor" - age="0" + freebsd-aout|qnx|sunos) + current=$number_major + revision=$number_minor + age=0 ;; irix|nonstopux) func_arith $number_major + $number_minor current=$func_arith_result - age="$number_minor" - revision="$number_minor" + age=$number_minor + revision=$number_minor lt_irix_increment=no ;; *) - func_fatal_configuration "$modename: unknown library version type \`$version_type'" + func_fatal_configuration "$modename: unknown library version type '$version_type'" ;; esac ;; no) - current="$1" - revision="$2" - age="$3" + current=$1 + revision=$2 + age=$3 ;; esac @@ -7368,30 +9122,30 @@ func_mode_link () case $current in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "CURRENT \`$current' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "CURRENT '$current' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" ;; esac case $revision in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "REVISION \`$revision' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "REVISION '$revision' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" ;; esac case $age in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "AGE \`$age' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "AGE '$age' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" ;; esac if test "$age" -gt "$current"; then - func_error "AGE \`$age' is greater than the current interface number \`$current'" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "AGE '$age' is greater than the current interface number '$current'" + func_fatal_error "'$vinfo' is not valid version information" fi # Calculate the version variables. @@ -7406,26 +9160,36 @@ func_mode_link () # verstring for coding it into the library header func_arith $current - $age major=.$func_arith_result - versuffix="$major.$age.$revision" + versuffix=$major.$age.$revision # Darwin ld doesn't like 0 for these options... func_arith $current + 1 minor_current=$func_arith_result - xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" + xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision" verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + # On Darwin other compilers + case $CC in + nagfor*) + verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision" + ;; + *) + verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + ;; + esac ;; freebsd-aout) - major=".$current" - versuffix=".$current.$revision"; + major=.$current + versuffix=.$current.$revision ;; - freebsd-elf) - major=".$current" - versuffix=".$current" + freebsd-elf | midnightbsd-elf) + func_arith $current - $age + major=.$func_arith_result + versuffix=$major.$age.$revision ;; irix | nonstopux) - if test "X$lt_irix_increment" = "Xno"; then + if test no = "$lt_irix_increment"; then func_arith $current - $age else func_arith $current - $age + 1 @@ -7436,69 +9200,74 @@ func_mode_link () nonstopux) verstring_prefix=nonstopux ;; *) verstring_prefix=sgi ;; esac - verstring="$verstring_prefix$major.$revision" + verstring=$verstring_prefix$major.$revision # Add in all the interfaces that we are compatible with. loop=$revision - while test "$loop" -ne 0; do + while test 0 -ne "$loop"; do func_arith $revision - $loop iface=$func_arith_result func_arith $loop - 1 loop=$func_arith_result - verstring="$verstring_prefix$major.$iface:$verstring" + verstring=$verstring_prefix$major.$iface:$verstring done - # Before this point, $major must not contain `.'. + # Before this point, $major must not contain '.'. major=.$major - versuffix="$major.$revision" + versuffix=$major.$revision ;; linux) # correct to gnu/linux during the next big refactor func_arith $current - $age major=.$func_arith_result - versuffix="$major.$age.$revision" + versuffix=$major.$age.$revision ;; osf) func_arith $current - $age major=.$func_arith_result - versuffix=".$current.$age.$revision" - verstring="$current.$age.$revision" + versuffix=.$current.$age.$revision + verstring=$current.$age.$revision # Add in all the interfaces that we are compatible with. loop=$age - while test "$loop" -ne 0; do + while test 0 -ne "$loop"; do func_arith $current - $loop iface=$func_arith_result func_arith $loop - 1 loop=$func_arith_result - verstring="$verstring:${iface}.0" + verstring=$verstring:$iface.0 done # Make executables depend on our current version. - func_append verstring ":${current}.0" + func_append verstring ":$current.0" ;; qnx) - major=".$current" - versuffix=".$current" + major=.$current + versuffix=.$current + ;; + + sco) + major=.$current + versuffix=.$current ;; sunos) - major=".$current" - versuffix=".$current.$revision" + major=.$current + versuffix=.$current.$revision ;; windows) # Use '-' rather than '.', since we only want one - # extension on DOS 8.3 filesystems. + # extension on DOS 8.3 file systems. func_arith $current - $age major=$func_arith_result - versuffix="-$major" + versuffix=-$major ;; *) - func_fatal_configuration "unknown library version type \`$version_type'" + func_fatal_configuration "unknown library version type '$version_type'" ;; esac @@ -7512,42 +9281,45 @@ func_mode_link () verstring= ;; *) - verstring="0.0" + verstring=0.0 ;; esac - if test "$need_version" = no; then + if test no = "$need_version"; then versuffix= else - versuffix=".0.0" + versuffix=.0.0 fi fi # Remove version info from name if versioning should be avoided - if test "$avoid_version" = yes && test "$need_version" = no; then + if test yes,no = "$avoid_version,$need_version"; then major= versuffix= - verstring="" + verstring= fi # Check to see if the archive will have undefined symbols. - if test "$allow_undefined" = yes; then - if test "$allow_undefined_flag" = unsupported; then - func_warning "undefined symbols not allowed in $host shared libraries" - build_libtool_libs=no - build_old_libs=yes + if test yes = "$allow_undefined"; then + if test unsupported = "$allow_undefined_flag"; then + if test yes = "$build_old_libs"; then + func_warning "undefined symbols not allowed in $host shared libraries; building static only" + build_libtool_libs=no + else + func_fatal_error "can't build $host shared library unless -no-undefined is specified" + fi fi else # Don't allow undefined symbols. - allow_undefined_flag="$no_undefined_flag" + allow_undefined_flag=$no_undefined_flag fi fi - func_generate_dlsyms "$libname" "$libname" "yes" + func_generate_dlsyms "$libname" "$libname" : func_append libobjs " $symfileobj" - test "X$libobjs" = "X " && libobjs= + test " " = "$libobjs" && libobjs= - if test "$opt_mode" != relink; then + if test relink != "$opt_mode"; then # Remove our outputs, but don't remove object files since they # may have been created when compiling PIC objects. removelist= @@ -7556,8 +9328,8 @@ func_mode_link () case $p in *.$objext | *.gcno) ;; - $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) - if test "X$precious_files_regex" != "X"; then + $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*) + if test -n "$precious_files_regex"; then if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 then continue @@ -7573,11 +9345,11 @@ func_mode_link () fi # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then + if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then func_append oldlibs " $output_objdir/$libname.$libext" # Transform .lo files to .o files. - oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` + oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP` fi # Eliminate all temporary directories. @@ -7598,13 +9370,13 @@ func_mode_link () *) func_append finalize_rpath " $libdir" ;; esac done - if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then + if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then dependency_libs="$temp_xrpath $dependency_libs" fi fi # Make sure dlfiles contains only unique files that won't be dlpreopened - old_dlfiles="$dlfiles" + old_dlfiles=$dlfiles dlfiles= for lib in $old_dlfiles; do case " $dlprefiles $dlfiles " in @@ -7614,7 +9386,7 @@ func_mode_link () done # Make sure dlprefiles contains only unique files - old_dlprefiles="$dlprefiles" + old_dlprefiles=$dlprefiles dlprefiles= for lib in $old_dlprefiles; do case "$dlprefiles " in @@ -7623,7 +9395,7 @@ func_mode_link () esac done - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then if test -n "$rpath"; then case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) @@ -7636,7 +9408,7 @@ func_mode_link () *-*-netbsd*) # Don't link with libc until the a.out ld.so is fixed. ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-midnightbsd*) # Do not include libc due to us having libc/libc_r. ;; *-*-sco3.2v5* | *-*-sco5v6*) @@ -7647,7 +9419,7 @@ func_mode_link () ;; *) # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then + if test yes = "$build_libtool_need_lc"; then func_append deplibs " -lc" fi ;; @@ -7663,9 +9435,9 @@ func_mode_link () # I'm not sure if I'm treating the release correctly. I think # release should show up in the -l (ie -lgmp5) so we don't want to # add it in twice. Is that correct? - release="" - versuffix="" - major="" + release= + versuffix= + major= newdeplibs= droppeddeps=no case $deplibs_check_method in @@ -7694,20 +9466,20 @@ EOF -l*) func_stripname -l '' "$i" name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $i "*) func_append newdeplibs " $i" - i="" + i= ;; esac fi - if test -n "$i" ; then + if test -n "$i"; then libname=`eval "\\$ECHO \"$libname_spec\""` deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` set dummy $deplib_matches; shift deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then func_append newdeplibs " $i" else droppeddeps=yes @@ -7737,20 +9509,20 @@ EOF $opt_dry_run || $RM conftest if $LTCC $LTCFLAGS -o conftest conftest.c $i; then ldd_output=`ldd conftest` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $i "*) func_append newdeplibs " $i" - i="" + i= ;; esac fi - if test -n "$i" ; then + if test -n "$i"; then libname=`eval "\\$ECHO \"$libname_spec\""` deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` set dummy $deplib_matches; shift deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then func_append newdeplibs " $i" else droppeddeps=yes @@ -7787,24 +9559,24 @@ EOF -l*) func_stripname -l '' "$a_deplib" name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $a_deplib "*) func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= ;; esac fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then libname=`eval "\\$ECHO \"$libname_spec\""` if test -n "$file_magic_glob"; then libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` else libnameglob=$libname fi - test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` + test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob` for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - if test "$want_nocaseglob" = yes; then + if test yes = "$want_nocaseglob"; then shopt -s nocaseglob potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` $nocaseglob @@ -7822,25 +9594,25 @@ EOF # We might still enter an endless loop, since a link # loop can be closed while we follow links, # but so what? - potlib="$potent_lib" + potlib=$potent_lib while test -h "$potlib" 2>/dev/null; do - potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` + potliblink=`ls -ld $potlib | $SED 's/.* -> //'` case $potliblink in - [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; + [\\/]* | [A-Za-z]:[\\/]*) potlib=$potliblink;; + *) potlib=`$ECHO "$potlib" | $SED 's|[^/]*$||'`"$potliblink";; esac done if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | $SED -e 10q | $EGREP "$file_magic_regex" > /dev/null; then func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= break 2 fi done done fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then droppeddeps=yes echo $ECHO "*** Warning: linker path does not have real file for library $a_deplib." @@ -7848,7 +9620,7 @@ EOF echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have" echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then + if test -z "$potlib"; then $ECHO "*** with $libname but no candidates were found. (...for file magic test)" else $ECHO "*** with $libname and none of the candidates passed a file format test" @@ -7871,30 +9643,30 @@ EOF -l*) func_stripname -l '' "$a_deplib" name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $a_deplib "*) func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= ;; esac fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then libname=`eval "\\$ECHO \"$libname_spec\""` for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do potential_libs=`ls $i/$libname[.-]* 2>/dev/null` for potent_lib in $potential_libs; do - potlib="$potent_lib" # see symlink-check above in file_magic test + potlib=$potent_lib # see symlink-check above in file_magic test if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ $EGREP "$match_pattern_regex" > /dev/null; then func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= break 2 fi done done fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then droppeddeps=yes echo $ECHO "*** Warning: linker path does not have real file for library $a_deplib." @@ -7902,7 +9674,7 @@ EOF echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have" echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then + if test -z "$potlib"; then $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" else $ECHO "*** with $libname and none of the candidates passed a file format test" @@ -7918,18 +9690,18 @@ EOF done # Gone through all deplibs. ;; none | unknown | *) - newdeplibs="" + newdeplibs= tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - for i in $predeps $postdeps ; do + if test yes = "$allow_libtool_libs_with_static_runtimes"; then + for i in $predeps $postdeps; do # can't use Xsed below, because $i might contain '/' - tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` + tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s|$i||"` done fi case $tmp_deplibs in *[!\ \ ]*) echo - if test "X$deplibs_check_method" = "Xnone"; then + if test none = "$deplibs_check_method"; then echo "*** Warning: inter-library dependencies are not supported in this platform." else echo "*** Warning: inter-library dependencies are not known to be supported." @@ -7953,8 +9725,8 @@ EOF ;; esac - if test "$droppeddeps" = yes; then - if test "$module" = yes; then + if test yes = "$droppeddeps"; then + if test yes = "$module"; then echo echo "*** Warning: libtool could not satisfy all declared inter-library" $ECHO "*** dependencies of module $libname. Therefore, libtool will create" @@ -7963,12 +9735,12 @@ EOF if test -z "$global_symbol_pipe"; then echo echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** lists from a program, using 'nm' or equivalent, but libtool could" echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." + echo "*** 'nm' from GNU binutils and a full rebuild may help." fi - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" + if test no = "$build_old_libs"; then + oldlibs=$output_objdir/$libname.$libext build_libtool_libs=module build_old_libs=yes else @@ -7979,14 +9751,14 @@ EOF echo "*** automatically added whenever a program is linked with this library" echo "*** or is declared to -dlopen it." - if test "$allow_undefined" = no; then + if test no = "$allow_undefined"; then echo echo "*** Since this library must not contain undefined symbols," echo "*** because either the platform does not support them or" echo "*** it was explicitly requested with -no-undefined," echo "*** libtool will only create a static version of it." - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" + if test no = "$build_old_libs"; then + oldlibs=$output_objdir/$libname.$libext build_libtool_libs=module build_old_libs=yes else @@ -8032,7 +9804,7 @@ EOF *) func_append new_libs " $deplib" ;; esac done - deplibs="$new_libs" + deplibs=$new_libs # All the library-specific variables (install_libdir is set above). library_names= @@ -8040,25 +9812,25 @@ EOF dlname= # Test again, we may have decided not to build it any more - if test "$build_libtool_libs" = yes; then - # Remove ${wl} instances when linking with ld. + if test yes = "$build_libtool_libs"; then + # Remove $wl instances when linking with ld. # FIXME: should test the right _cmds variable. case $archive_cmds in *\$LD\ *) wl= ;; esac - if test "$hardcode_into_libs" = yes; then + if test yes = "$hardcode_into_libs"; then # Hardcode the library paths hardcode_libdirs= dep_rpath= - rpath="$finalize_rpath" - test "$opt_mode" != relink && rpath="$compile_rpath$rpath" + rpath=$finalize_rpath + test relink = "$opt_mode" || rpath=$compile_rpath$rpath for libdir in $rpath; do if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then func_replace_sysroot "$libdir" libdir=$func_replace_sysroot_result if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -8083,7 +9855,7 @@ EOF # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" + libdir=$hardcode_libdirs eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" fi if test -n "$runpath_var" && test -n "$perm_rpath"; then @@ -8097,8 +9869,8 @@ EOF test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" fi - shlibpath="$finalize_shlibpath" - test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" + shlibpath=$finalize_shlibpath + test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath if test -n "$shlibpath"; then eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" fi @@ -8108,19 +9880,19 @@ EOF eval library_names=\"$library_names_spec\" set dummy $library_names shift - realname="$1" + realname=$1 shift if test -n "$soname_spec"; then eval soname=\"$soname_spec\" else - soname="$realname" + soname=$realname fi if test -z "$dlname"; then dlname=$soname fi - lib="$output_objdir/$realname" + lib=$output_objdir/$realname linknames= for link do @@ -8134,7 +9906,7 @@ EOF delfiles= if test -n "$export_symbols" && test -n "$include_expsyms"; then $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" - export_symbols="$output_objdir/$libname.uexp" + export_symbols=$output_objdir/$libname.uexp func_append delfiles " $export_symbols" fi @@ -8143,31 +9915,31 @@ EOF cygwin* | mingw* | cegcc*) if test -n "$export_symbols" && test -z "$export_symbols_regex"; then # exporting using user supplied symfile - if test "x`$SED 1q $export_symbols`" != xEXPORTS; then + func_dll_def_p "$export_symbols" || { # and it's NOT already a .def file. Must figure out # which of the given symbols are data symbols and tag # them as such. So, trigger use of export_symbols_cmds. # export_symbols gets reassigned inside the "prepare # the list of exported symbols" if statement, so the # include_expsyms logic still works. - orig_export_symbols="$export_symbols" + orig_export_symbols=$export_symbols export_symbols= always_export_symbols=yes - fi + } fi ;; esac # Prepare the list of exported symbols if test -z "$export_symbols"; then - if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" + if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then + func_verbose "generating symbol list for '$libname.la'" + export_symbols=$output_objdir/$libname.exp $opt_dry_run || $RM $export_symbols cmds=$export_symbols_cmds - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd1 in $cmds; do - IFS="$save_ifs" + IFS=$save_ifs # Take the normal branch if the nm_file_list_spec branch # doesn't work or if tool conversion is not needed. case $nm_file_list_spec~$to_tool_file_cmd in @@ -8181,7 +9953,7 @@ EOF try_normal_branch=no ;; esac - if test "$try_normal_branch" = yes \ + if test yes = "$try_normal_branch" \ && { test "$len" -lt "$max_cmd_len" \ || test "$max_cmd_len" -le -1; } then @@ -8192,7 +9964,7 @@ EOF output_la=$func_basename_result save_libobjs=$libobjs save_output=$output - output=${output_objdir}/${output_la}.nm + output=$output_objdir/$output_la.nm func_to_tool_file "$output" libobjs=$nm_file_list_spec$func_to_tool_file_result func_append delfiles " $output" @@ -8215,8 +9987,8 @@ EOF break fi done - IFS="$save_ifs" - if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then + IFS=$save_ifs + if test -n "$export_symbols_regex" && test : != "$skipped_export"; then func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' func_show_eval '$MV "${export_symbols}T" "$export_symbols"' fi @@ -8224,16 +9996,16 @@ EOF fi if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" + tmp_export_symbols=$export_symbols + test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi - if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then + if test : != "$skipped_export" && test -n "$orig_export_symbols"; then # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" + func_verbose "filter symbol list for '$libname.la' to tag DATA exports" # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine + # 's' commands, which not all seds can handle. GNU sed should be fine # though. Also, the filter scales superlinearly with the number of # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. @@ -8252,11 +10024,11 @@ EOF ;; esac done - deplibs="$tmp_deplibs" + deplibs=$tmp_deplibs if test -n "$convenience"; then if test -n "$whole_archive_flag_spec" && - test "$compiler_needs_object" = yes && + test yes = "$compiler_needs_object" && test -z "$libobjs"; then # extract the archives, so we have objects to list. # TODO: could optimize this to just extract one archive. @@ -8267,7 +10039,7 @@ EOF eval libobjs=\"\$libobjs $whole_archive_flag_spec\" test "X$libobjs" = "X " && libobjs= else - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $convenience @@ -8276,18 +10048,18 @@ EOF fi fi - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then + if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then eval flag=\"$thread_safe_flag_spec\" func_append linker_flags " $flag" fi # Make a backup of the uninstalled library when relinking - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? fi # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then + if test yes = "$module" && test -n "$module_cmds"; then if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then eval test_cmds=\"$module_expsym_cmds\" cmds=$module_expsym_cmds @@ -8305,7 +10077,7 @@ EOF fi fi - if test "X$skipped_export" != "X:" && + if test : != "$skipped_export" && func_len " $test_cmds" && len=$func_len_result && test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then @@ -8338,8 +10110,8 @@ EOF last_robj= k=1 - if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then - output=${output_objdir}/${output_la}.lnkscript + if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then + output=$output_objdir/$output_la.lnkscript func_verbose "creating GNU ld script: $output" echo 'INPUT (' > $output for obj in $save_libobjs @@ -8351,14 +10123,14 @@ EOF func_append delfiles " $output" func_to_tool_file "$output" output=$func_to_tool_file_result - elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then - output=${output_objdir}/${output_la}.lnk + elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then + output=$output_objdir/$output_la.lnk func_verbose "creating linker input file list: $output" : > $output set x $save_libobjs shift firstobj= - if test "$compiler_needs_object" = yes; then + if test yes = "$compiler_needs_object"; then firstobj="$1 " shift fi @@ -8373,7 +10145,7 @@ EOF else if test -n "$save_libobjs"; then func_verbose "creating reloadable object files..." - output=$output_objdir/$output_la-${k}.$objext + output=$output_objdir/$output_la-$k.$objext eval test_cmds=\"$reload_cmds\" func_len " $test_cmds" len0=$func_len_result @@ -8385,13 +10157,13 @@ EOF func_len " $obj" func_arith $len + $func_len_result len=$func_arith_result - if test "X$objlist" = X || + if test -z "$objlist" || test "$len" -lt "$max_cmd_len"; then func_append objlist " $obj" else # The command $test_cmds is almost too long, add a # command to the queue. - if test "$k" -eq 1 ; then + if test 1 -eq "$k"; then # The first file doesn't have a previous command to add. reload_objs=$objlist eval concat_cmds=\"$reload_cmds\" @@ -8401,10 +10173,10 @@ EOF reload_objs="$objlist $last_robj" eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" fi - last_robj=$output_objdir/$output_la-${k}.$objext + last_robj=$output_objdir/$output_la-$k.$objext func_arith $k + 1 k=$func_arith_result - output=$output_objdir/$output_la-${k}.$objext + output=$output_objdir/$output_la-$k.$objext objlist=" $obj" func_len " $last_robj" func_arith $len0 + $func_len_result @@ -8416,9 +10188,9 @@ EOF # files will link in the last one created. test -z "$concat_cmds" || concat_cmds=$concat_cmds~ reload_objs="$objlist $last_robj" - eval concat_cmds=\"\${concat_cmds}$reload_cmds\" + eval concat_cmds=\"\$concat_cmds$reload_cmds\" if test -n "$last_robj"; then - eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" + eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" fi func_append delfiles " $output" @@ -8426,9 +10198,9 @@ EOF output= fi - if ${skipped_export-false}; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" + ${skipped_export-false} && { + func_verbose "generating symbol list for '$libname.la'" + export_symbols=$output_objdir/$libname.exp $opt_dry_run || $RM $export_symbols libobjs=$output # Append the command to create the export file. @@ -8437,24 +10209,24 @@ EOF if test -n "$last_robj"; then eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" fi - fi + } test -n "$save_libobjs" && func_verbose "creating a temporary reloadable object file: $output" # Loop through the commands generated above and execute them. - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd in $concat_cmds; do - IFS="$save_ifs" - $opt_silent || { - func_quote_for_expand "$cmd" - eval "func_echo $func_quote_for_expand_result" + IFS=$save_ifs + $opt_quiet || { + func_quote_arg expand,pretty "$cmd" + eval "func_echo $func_quote_arg_result" } $opt_dry_run || eval "$cmd" || { lt_exit=$? # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -8463,7 +10235,7 @@ EOF exit $lt_exit } done - IFS="$save_ifs" + IFS=$save_ifs if test -n "$export_symbols_regex" && ${skipped_export-false}; then func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' @@ -8471,18 +10243,18 @@ EOF fi fi - if ${skipped_export-false}; then + ${skipped_export-false} && { if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" + tmp_export_symbols=$export_symbols + test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi if test -n "$orig_export_symbols"; then # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" + func_verbose "filter symbol list for '$libname.la' to tag DATA exports" # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine + # 's' commands, which not all seds can handle. GNU sed should be fine # though. Also, the filter scales superlinearly with the number of # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. @@ -8491,7 +10263,7 @@ EOF export_symbols=$output_objdir/$libname.def $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi - fi + } libobjs=$output # Restore the value of output. @@ -8505,7 +10277,7 @@ EOF # value of $libobjs for piecewise linking. # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then + if test yes = "$module" && test -n "$module_cmds"; then if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then cmds=$module_expsym_cmds else @@ -8527,7 +10299,7 @@ EOF # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $dlprefiles @@ -8535,19 +10307,20 @@ EOF test "X$libobjs" = "X " && libobjs= fi - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd in $cmds; do - IFS="$save_ifs" + IFS=$sp$nl eval cmd=\"$cmd\" - $opt_silent || { - func_quote_for_expand "$cmd" - eval "func_echo $func_quote_for_expand_result" + IFS=$save_ifs + $opt_quiet || { + func_quote_arg expand,pretty "$cmd" + eval "func_echo $func_quote_arg_result" } $opt_dry_run || eval "$cmd" || { lt_exit=$? # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -8556,10 +10329,10 @@ EOF exit $lt_exit } done - IFS="$save_ifs" + IFS=$save_ifs # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? if test -n "$convenience"; then @@ -8579,39 +10352,39 @@ EOF done # If -module or -export-dynamic was specified, set the dlname. - if test "$module" = yes || test "$export_dynamic" = yes; then + if test yes = "$module" || test yes = "$export_dynamic"; then # On all known operating systems, these are identical. - dlname="$soname" + dlname=$soname fi fi ;; obj) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for objects" + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then + func_warning "'-dlopen' is ignored for objects" fi case " $deplibs" in *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for objects" ;; + func_warning "'-l' and '-L' are ignored for objects" ;; esac test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for objects" + func_warning "'-rpath' is ignored for objects" test -n "$xrpath" && \ - func_warning "\`-R' is ignored for objects" + func_warning "'-R' is ignored for objects" test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for objects" + func_warning "'-version-info' is ignored for objects" test -n "$release" && \ - func_warning "\`-release' is ignored for objects" + func_warning "'-release' is ignored for objects" case $output in *.lo) test -n "$objs$old_deplibs" && \ - func_fatal_error "cannot build library object \`$output' from non-libtool objects" + func_fatal_error "cannot build library object '$output' from non-libtool objects" libobj=$output func_lo2o "$libobj" @@ -8619,7 +10392,7 @@ EOF ;; *) libobj= - obj="$output" + obj=$output ;; esac @@ -8632,17 +10405,19 @@ EOF # the extraction. reload_conv_objs= gentop= - # reload_cmds runs $LD directly, so let us get rid of - # -Wl from whole_archive_flag_spec and hope we can get by with - # turning comma into space.. - wl= - + # if reload_cmds runs $LD directly, get rid of -Wl from + # whole_archive_flag_spec and hope we can get by with turning comma + # into space. + case $reload_cmds in + *\$LD[\ \$]*) wl= ;; + esac if test -n "$convenience"; then if test -n "$whole_archive_flag_spec"; then eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` + test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` + reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags else - gentop="$output_objdir/${obj}x" + gentop=$output_objdir/${obj}x func_append generated " $gentop" func_extract_archives $gentop $convenience @@ -8651,12 +10426,12 @@ EOF fi # If we're not building shared, we need to use non_pic_objs - test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" + test yes = "$build_libtool_libs" || libobjs=$non_pic_objects # Create the old-style object. - reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test + reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs - output="$obj" + output=$obj func_execute_cmds "$reload_cmds" 'exit $?' # Exit if we aren't doing a library object file. @@ -8668,7 +10443,7 @@ EOF exit $EXIT_SUCCESS fi - if test "$build_libtool_libs" != yes; then + test yes = "$build_libtool_libs" || { if test -n "$gentop"; then func_show_eval '${RM}r "$gentop"' fi @@ -8678,12 +10453,12 @@ EOF # $show "echo timestamp > $libobj" # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? exit $EXIT_SUCCESS - fi + } - if test -n "$pic_flag" || test "$pic_mode" != default; then + if test -n "$pic_flag" || test default != "$pic_mode"; then # Only do commands if we really have different PIC objects. reload_objs="$libobjs $reload_conv_objs" - output="$libobj" + output=$libobj func_execute_cmds "$reload_cmds" 'exit $?' fi @@ -8700,16 +10475,14 @@ EOF output=$func_stripname_result.exe;; esac test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for programs" + func_warning "'-version-info' is ignored for programs" test -n "$release" && \ - func_warning "\`-release' is ignored for programs" + func_warning "'-release' is ignored for programs" - test "$preload" = yes \ - && test "$dlopen_support" = unknown \ - && test "$dlopen_self" = unknown \ - && test "$dlopen_self_static" = unknown && \ - func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support." + $preload \ + && test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \ + && func_warning "'LT_INIT([dlopen])' not used. Assuming no dlopen support." case $host in *-*-rhapsody* | *-*-darwin1.[012]) @@ -8723,11 +10496,11 @@ EOF *-*-darwin*) # Don't allow lazy linking, it breaks C++ global constructors # But is supposedly fixed on 10.4 or later (yay!). - if test "$tagname" = CXX ; then + if test CXX = "$tagname"; then case ${MACOSX_DEPLOYMENT_TARGET-10.0} in 10.[0123]) - func_append compile_command " ${wl}-bind_at_load" - func_append finalize_command " ${wl}-bind_at_load" + func_append compile_command " $wl-bind_at_load" + func_append finalize_command " $wl-bind_at_load" ;; esac fi @@ -8763,7 +10536,7 @@ EOF *) func_append new_libs " $deplib" ;; esac done - compile_deplibs="$new_libs" + compile_deplibs=$new_libs func_append compile_command " $compile_deplibs" @@ -8787,7 +10560,7 @@ EOF if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -8810,7 +10583,7 @@ EOF fi case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` + testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$libdir:"*) ;; ::) dllsearchpath=$libdir;; @@ -8827,10 +10600,10 @@ EOF # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" + libdir=$hardcode_libdirs eval rpath=\" $hardcode_libdir_flag_spec\" fi - compile_rpath="$rpath" + compile_rpath=$rpath rpath= hardcode_libdirs= @@ -8838,7 +10611,7 @@ EOF if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -8863,45 +10636,43 @@ EOF # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" + libdir=$hardcode_libdirs eval rpath=\" $hardcode_libdir_flag_spec\" fi - finalize_rpath="$rpath" + finalize_rpath=$rpath - if test -n "$libobjs" && test "$build_old_libs" = yes; then + if test -n "$libobjs" && test yes = "$build_old_libs"; then # Transform all the library objects into standard objects. compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP` finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP` fi - func_generate_dlsyms "$outputname" "@PROGRAM@" "no" + func_generate_dlsyms "$outputname" "@PROGRAM@" false # template prelinking step if test -n "$prelink_cmds"; then func_execute_cmds "$prelink_cmds" 'exit $?' fi - wrappers_required=yes + wrappers_required=: case $host in *cegcc* | *mingw32ce*) # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. - wrappers_required=no + wrappers_required=false ;; *cygwin* | *mingw* ) - if test "$build_libtool_libs" != yes; then - wrappers_required=no - fi + test yes = "$build_libtool_libs" || wrappers_required=false ;; *) - if test "$need_relink" = no || test "$build_libtool_libs" != yes; then - wrappers_required=no + if test no = "$need_relink" || test yes != "$build_libtool_libs"; then + wrappers_required=false fi ;; esac - if test "$wrappers_required" = no; then + $wrappers_required || { # Replace the output file specification. compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` - link_command="$compile_command$compile_rpath" + link_command=$compile_command$compile_rpath # We have no uninstalled library dependencies, so finalize right now. exit_status=0 @@ -8914,12 +10685,12 @@ EOF fi # Delete the generated files. - if test -f "$output_objdir/${outputname}S.${objext}"; then - func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' + if test -f "$output_objdir/${outputname}S.$objext"; then + func_show_eval '$RM "$output_objdir/${outputname}S.$objext"' fi exit $exit_status - fi + } if test -n "$compile_shlibpath$finalize_shlibpath"; then compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" @@ -8949,9 +10720,9 @@ EOF fi fi - if test "$no_install" = yes; then + if test yes = "$no_install"; then # We don't need to create a wrapper script. - link_command="$compile_var$compile_command$compile_rpath" + link_command=$compile_var$compile_command$compile_rpath # Replace the output file specification. link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` # Delete the old output file. @@ -8968,27 +10739,28 @@ EOF exit $EXIT_SUCCESS fi - if test "$hardcode_action" = relink; then - # Fast installation is not supported - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" + case $hardcode_action,$fast_install in + relink,*) + # Fast installation is not supported + link_command=$compile_var$compile_command$compile_rpath + relink_command=$finalize_var$finalize_command$finalize_rpath - func_warning "this platform does not like uninstalled shared libraries" - func_warning "\`$output' will be relinked during installation" - else - if test "$fast_install" != no; then - link_command="$finalize_var$compile_command$finalize_rpath" - if test "$fast_install" = yes; then - relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` - else - # fast_install is set to needless - relink_command= - fi - else - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - fi - fi + func_warning "this platform does not like uninstalled shared libraries" + func_warning "'$output' will be relinked during installation" + ;; + *,yes) + link_command=$finalize_var$compile_command$finalize_rpath + relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` + ;; + *,no) + link_command=$compile_var$compile_command$compile_rpath + relink_command=$finalize_var$finalize_command$finalize_rpath + ;; + *,needless) + link_command=$finalize_var$compile_command$finalize_rpath + relink_command= + ;; + esac # Replace the output file specification. link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` @@ -9016,12 +10788,13 @@ EOF elif eval var_value=\$$var; test -z "$var_value"; then relink_command="$var=; export $var; $relink_command" else - func_quote_for_eval "$var_value" - relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" + func_quote_arg pretty "$var_value" + relink_command="$var=$func_quote_arg_result; export $var; $relink_command" fi done - relink_command="(cd `pwd`; $relink_command)" - relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` + func_quote eval cd "`pwd`" + func_quote_arg pretty,unquoted "($func_quote_result; $relink_command)" + relink_command=$func_quote_arg_unquoted_result fi # Only actually do things if not in dry run mode. @@ -9045,8 +10818,8 @@ EOF func_dirname_and_basename "$output" "" "." output_name=$func_basename_result output_path=$func_dirname_result - cwrappersource="$output_path/$objdir/lt-$output_name.c" - cwrapper="$output_path/$output_name.exe" + cwrappersource=$output_path/$objdir/lt-$output_name.c + cwrapper=$output_path/$output_name.exe $RM $cwrappersource $cwrapper trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 @@ -9067,7 +10840,7 @@ EOF trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15 $opt_dry_run || { # note: this script will not be executed, so do not chmod. - if test "x$build" = "x$host" ; then + if test "x$build" = "x$host"; then $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result else func_emit_wrapper no > $func_ltwrapper_scriptname_result @@ -9090,25 +10863,27 @@ EOF # See if we need to build an old-fashioned archive. for oldlib in $oldlibs; do - if test "$build_libtool_libs" = convenience; then - oldobjs="$libobjs_save $symfileobj" - addlibs="$convenience" - build_libtool_libs=no - else - if test "$build_libtool_libs" = module; then - oldobjs="$libobjs_save" + case $build_libtool_libs in + convenience) + oldobjs="$libobjs_save $symfileobj" + addlibs=$convenience build_libtool_libs=no - else + ;; + module) + oldobjs=$libobjs_save + addlibs=$old_convenience + build_libtool_libs=no + ;; + *) oldobjs="$old_deplibs $non_pic_objects" - if test "$preload" = yes && test -f "$symfileobj"; then - func_append oldobjs " $symfileobj" - fi - fi - addlibs="$old_convenience" - fi + $preload && test -f "$symfileobj" \ + && func_append oldobjs " $symfileobj" + addlibs=$old_convenience + ;; + esac if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $addlibs @@ -9116,13 +10891,13 @@ EOF fi # Do each command in the archive commands. - if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then + if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then cmds=$old_archive_from_new_cmds else # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $dlprefiles @@ -9143,7 +10918,7 @@ EOF : else echo "copying selected object files to avoid basename conflicts..." - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_mkdir_p "$gentop" save_oldobjs=$oldobjs @@ -9152,7 +10927,7 @@ EOF for obj in $save_oldobjs do func_basename "$obj" - objbase="$func_basename_result" + objbase=$func_basename_result case " $oldobjs " in " ") oldobjs=$obj ;; *[\ /]"$objbase "*) @@ -9221,18 +10996,18 @@ EOF else # the above command should be used before it gets too long oldobjs=$objlist - if test "$obj" = "$last_oldobj" ; then + if test "$obj" = "$last_oldobj"; then RANLIB=$save_RANLIB fi test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" + eval concat_cmds=\"\$concat_cmds$old_archive_cmds\" objlist= len=$len0 fi done RANLIB=$save_RANLIB oldobjs=$objlist - if test "X$oldobjs" = "X" ; then + if test -z "$oldobjs"; then eval cmds=\"\$concat_cmds\" else eval cmds=\"\$concat_cmds~\$old_archive_cmds\" @@ -9249,7 +11024,7 @@ EOF case $output in *.la) old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" + test yes = "$build_old_libs" && old_library=$libname.$libext func_verbose "creating $output" # Preserve any variables that may affect compiler behavior @@ -9259,36 +11034,38 @@ EOF elif eval var_value=\$$var; test -z "$var_value"; then relink_command="$var=; export $var; $relink_command" else - func_quote_for_eval "$var_value" - relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" + func_quote_arg pretty,unquoted "$var_value" + relink_command="$var=$func_quote_arg_unquoted_result; export $var; $relink_command" fi done # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` - if test "$hardcode_automatic" = yes ; then + func_quote eval cd "`pwd`" + relink_command="($func_quote_result; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" + func_quote_arg pretty,unquoted "$relink_command" + relink_command=$func_quote_arg_unquoted_result + if test yes = "$hardcode_automatic"; then relink_command= fi # Only create the output if not a dry run. $opt_dry_run || { for installed in no yes; do - if test "$installed" = yes; then + if test yes = "$installed"; then if test -z "$install_libdir"; then break fi - output="$output_objdir/$outputname"i + output=$output_objdir/${outputname}i # Replace all uninstalled libtool libraries with the installed ones newdependency_libs= for deplib in $dependency_libs; do case $deplib in *.la) func_basename "$deplib" - name="$func_basename_result" + name=$func_basename_result func_resolve_sysroot "$deplib" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" + func_fatal_error "'$deplib' is not a valid libtool archive" func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" ;; -L*) @@ -9304,23 +11081,23 @@ EOF *) func_append newdependency_libs " $deplib" ;; esac done - dependency_libs="$newdependency_libs" + dependency_libs=$newdependency_libs newdlfiles= for lib in $dlfiles; do case $lib in *.la) func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + name=$func_basename_result + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" + func_fatal_error "'$lib' is not a valid libtool archive" func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" ;; *) func_append newdlfiles " $lib" ;; esac done - dlfiles="$newdlfiles" + dlfiles=$newdlfiles newdlprefiles= for lib in $dlprefiles; do case $lib in @@ -9330,34 +11107,34 @@ EOF # didn't already link the preopened objects directly into # the library: func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + name=$func_basename_result + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" + func_fatal_error "'$lib' is not a valid libtool archive" func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" ;; esac done - dlprefiles="$newdlprefiles" + dlprefiles=$newdlprefiles else newdlfiles= for lib in $dlfiles; do case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;; *) abs=`pwd`"/$lib" ;; esac func_append newdlfiles " $abs" done - dlfiles="$newdlfiles" + dlfiles=$newdlfiles newdlprefiles= for lib in $dlprefiles; do case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;; *) abs=`pwd`"/$lib" ;; esac func_append newdlprefiles " $abs" done - dlprefiles="$newdlprefiles" + dlprefiles=$newdlprefiles fi $RM $output # place dlname in correct position for cygwin @@ -9373,10 +11150,9 @@ EOF case $host,$output,$installed,$module,$dlname in *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) # If a -bindir argument was supplied, place the dll there. - if test "x$bindir" != x ; - then + if test -n "$bindir"; then func_relative_path "$install_libdir" "$bindir" - tdlname=$func_relative_path_result$dlname + tdlname=$func_relative_path_result/$dlname else # Otherwise fall back on heuristic. tdlname=../bin/$dlname @@ -9385,7 +11161,7 @@ EOF esac $ECHO > $output "\ # $outputname - a libtool library file -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# Generated by $PROGRAM (GNU $PACKAGE) $VERSION # # Please DO NOT delete this file! # It is necessary for linking the library. @@ -9399,7 +11175,7 @@ library_names='$library_names' # The name of the static archive. old_library='$old_library' -# Linker flags that can not go in dependency_libs. +# Linker flags that cannot go in dependency_libs. inherited_linker_flags='$new_inherited_linker_flags' # Libraries that this one depends upon. @@ -9425,7 +11201,7 @@ dlpreopen='$dlprefiles' # Directory that this library needs to be installed in: libdir='$install_libdir'" - if test "$installed" = no && test "$need_relink" = yes; then + if test no,yes = "$installed,$need_relink"; then $ECHO >> $output "\ relink_command=\"$relink_command\"" fi @@ -9440,27 +11216,29 @@ relink_command=\"$relink_command\"" exit $EXIT_SUCCESS } -{ test "$opt_mode" = link || test "$opt_mode" = relink; } && - func_mode_link ${1+"$@"} +if test link = "$opt_mode" || test relink = "$opt_mode"; then + func_mode_link ${1+"$@"} +fi # func_mode_uninstall arg... func_mode_uninstall () { - $opt_debug - RM="$nonopt" + $debug_cmd + + RM=$nonopt files= - rmforce= + rmforce=false exit_status=0 # This variable tells wrapper scripts just to set variables rather # than running their programs. - libtool_install_magic="$magic" + libtool_install_magic=$magic for arg do case $arg in - -f) func_append RM " $arg"; rmforce=yes ;; + -f) func_append RM " $arg"; rmforce=: ;; -*) func_append RM " $arg" ;; *) func_append files " $arg" ;; esac @@ -9473,18 +11251,18 @@ func_mode_uninstall () for file in $files; do func_dirname "$file" "" "." - dir="$func_dirname_result" - if test "X$dir" = X.; then - odir="$objdir" + dir=$func_dirname_result + if test . = "$dir"; then + odir=$objdir else - odir="$dir/$objdir" + odir=$dir/$objdir fi func_basename "$file" - name="$func_basename_result" - test "$opt_mode" = uninstall && odir="$dir" + name=$func_basename_result + test uninstall = "$opt_mode" && odir=$dir # Remember odir for removal later, being careful to avoid duplicates - if test "$opt_mode" = clean; then + if test clean = "$opt_mode"; then case " $rmdirs " in *" $odir "*) ;; *) func_append rmdirs " $odir" ;; @@ -9499,11 +11277,11 @@ func_mode_uninstall () elif test -d "$file"; then exit_status=1 continue - elif test "$rmforce" = yes; then + elif $rmforce; then continue fi - rmfiles="$file" + rmfiles=$file case $name in *.la) @@ -9517,7 +11295,7 @@ func_mode_uninstall () done test -n "$old_library" && func_append rmfiles " $odir/$old_library" - case "$opt_mode" in + case $opt_mode in clean) case " $library_names " in *" $dlname "*) ;; @@ -9528,12 +11306,12 @@ func_mode_uninstall () uninstall) if test -n "$library_names"; then # Do each command in the postuninstall commands. - func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' + func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1' fi if test -n "$old_library"; then # Do each command in the old_postuninstall commands. - func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' + func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1' fi # FIXME: should reinstall the best remaining shared library. ;; @@ -9549,21 +11327,19 @@ func_mode_uninstall () func_source $dir/$name # Add PIC object to the list of files to remove. - if test -n "$pic_object" && - test "$pic_object" != none; then + if test -n "$pic_object" && test none != "$pic_object"; then func_append rmfiles " $dir/$pic_object" fi # Add non-PIC object to the list of files to remove. - if test -n "$non_pic_object" && - test "$non_pic_object" != none; then + if test -n "$non_pic_object" && test none != "$non_pic_object"; then func_append rmfiles " $dir/$non_pic_object" fi fi ;; *) - if test "$opt_mode" = clean ; then + if test clean = "$opt_mode"; then noexename=$name case $file in *.exe) @@ -9590,12 +11366,12 @@ func_mode_uninstall () # note $name still contains .exe if it was in $file originally # as does the version of $file that was added into $rmfiles - func_append rmfiles " $odir/$name $odir/${name}S.${objext}" - if test "$fast_install" = yes && test -n "$relink_command"; then + func_append rmfiles " $odir/$name $odir/${name}S.$objext" + if test yes = "$fast_install" && test -n "$relink_command"; then func_append rmfiles " $odir/lt-$name" fi - if test "X$noexename" != "X$name" ; then - func_append rmfiles " $odir/lt-${noexename}.c" + if test "X$noexename" != "X$name"; then + func_append rmfiles " $odir/lt-$noexename.c" fi fi fi @@ -9604,7 +11380,7 @@ func_mode_uninstall () func_show_eval "$RM $rmfiles" 'exit_status=1' done - # Try to remove the ${objdir}s in the directories where we deleted files + # Try to remove the $objdir's in the directories where we deleted files for dir in $rmdirs; do if test -d "$dir"; then func_show_eval "rmdir $dir >/dev/null 2>&1" @@ -9614,16 +11390,17 @@ func_mode_uninstall () exit $exit_status } -{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && - func_mode_uninstall ${1+"$@"} +if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then + func_mode_uninstall ${1+"$@"} +fi test -z "$opt_mode" && { - help="$generic_help" + help=$generic_help func_fatal_help "you must specify a MODE" } test -z "$exec_cmd" && \ - func_fatal_help "invalid operation mode \`$opt_mode'" + func_fatal_help "invalid operation mode '$opt_mode'" if test -n "$exec_cmd"; then eval exec "$exec_cmd" @@ -9634,7 +11411,7 @@ exit $exit_status # The TAGs below are defined such that we never get into a situation -# in which we disable both kinds of libraries. Given conflicting +# where we disable both kinds of libraries. Given conflicting # choices, we go for a static library, that is the most portable, # since we can't tell whether shared libraries were disabled because # the user asked for that or because the platform doesn't support @@ -9657,5 +11434,3 @@ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` # mode:shell-script # sh-indentation:2 # End: -# vi:sw=2 - diff --git a/libratbox/src/Makefile.am b/libratbox/src/Makefile.am index 7dfd5c42..bbc053fe 100644 --- a/libratbox/src/Makefile.am +++ b/libratbox/src/Makefile.am @@ -11,7 +11,6 @@ version.c: version.c.SH ../CREDITS libratbox_la_SOURCES = \ unix.c \ - win32.c \ crypt.c \ commio.c \ openssl.c \ diff --git a/libratbox/src/Makefile.in b/libratbox/src/Makefile.in index 098d9554..301ecd7c 100644 --- a/libratbox/src/Makefile.in +++ b/libratbox/src/Makefile.in @@ -14,7 +14,6 @@ @SET_MAKE@ - VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -130,11 +129,11 @@ am__uninstall_files_from_dir = { \ am__installdirs = "$(DESTDIR)$(libdir)" LTLIBRARIES = $(lib_LTLIBRARIES) libratbox_la_DEPENDENCIES = -am_libratbox_la_OBJECTS = unix.lo win32.lo crypt.lo commio.lo \ - openssl.lo gnutls.lo nossl.lo event.lo ratbox_lib.lo \ - rb_memory.lo linebuf.lo snprintf.lo rb_tools.lo helper.lo \ - devpoll.lo epoll.lo poll.lo ports.lo select.lo kqueue.lo \ - rawbuf.lo patricia.lo arc4random.lo mbedtls.lo version.lo +am_libratbox_la_OBJECTS = unix.lo crypt.lo commio.lo openssl.lo \ + gnutls.lo nossl.lo event.lo ratbox_lib.lo rb_memory.lo \ + linebuf.lo snprintf.lo rb_tools.lo helper.lo devpoll.lo \ + epoll.lo poll.lo ports.lo select.lo kqueue.lo rawbuf.lo \ + patricia.lo arc4random.lo mbedtls.lo version.lo libratbox_la_OBJECTS = $(am_libratbox_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -234,6 +233,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXTRA_WARNINGS = @EXTRA_WARNINGS@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ GNUTLS_LIBS = @GNUTLS_LIBS@ GREP = @GREP@ @@ -252,6 +252,7 @@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -335,7 +336,6 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -348,7 +348,6 @@ AUTOMAKE_OPTIONS = foreign BUILT_SOURCES = version.c libratbox_la_SOURCES = \ unix.c \ - win32.c \ crypt.c \ commio.c \ openssl.c \ @@ -479,7 +478,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/snprintf.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unix.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/win32.Plo@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/libratbox/src/arc4random.c b/libratbox/src/arc4random.c index c023ed2a..abdf2944 100644 --- a/libratbox/src/arc4random.c +++ b/libratbox/src/arc4random.c @@ -32,7 +32,6 @@ #include "ratbox_lib.h" #if !defined(HAVE_OPENSSL) && !defined(HAVE_GNUTLS) && !defined(HAVE_MBEDTLS) && !defined(HAVE_ARC4RANDOM) - #include #include @@ -106,66 +105,37 @@ arc4_stir(struct arc4_stream *as) arc4_addrandom(as, (void *)&tv.tv_usec, sizeof(&tv.tv_usec)); #if defined(HAVE_GETRUSAGE) && defined(RUSAGE_SELF) - { - struct rusage buf; - getrusage(RUSAGE_SELF, &buf); - arc4_addrandom(as, (void *)&buf, sizeof(buf)); - memset(&buf, 0, sizeof(buf));} + struct rusage buf; + getrusage(RUSAGE_SELF, &buf); + arc4_addrandom(as, (void *)&buf, sizeof(buf)); + memset(&buf, 0, sizeof(buf)); #endif -#if !defined(_WIN32) + uint8_t rnd[128]; + int fd; + ssize_t total = 0; + fd = open("/dev/urandom", O_RDONLY); + if(fd != -1) { - uint8_t rnd[128]; - int fd; - ssize_t total = 0; - fd = open("/dev/urandom", O_RDONLY); - if(fd != -1) + while(total < (ssize_t)sizeof(rnd)) { - while(total < (ssize_t)sizeof(rnd)) + ssize_t ret = read(fd, rnd + total, sizeof(rnd) - total); + if(ret > 0) { - ssize_t ret = read(fd, rnd + total, sizeof(rnd) - total); - if(ret > 0) - { - total += ret; - continue; - } - if(ret == 0) - break; - if(errno == EINTR) - continue; - break; - } - close(fd); - if(total > 0) - arc4_addrandom(as, (void *)rnd, (int)total); - memset(&rnd, 0, sizeof(rnd)); - } - - } -#else - { - LARGE_INTEGER performanceCount; - if(QueryPerformanceCounter(&performanceCount)) - { - arc4_addrandom(as, (void *)&performanceCount, sizeof(performanceCount)); - } - HMODULE lib = LoadLibrary("ADVAPI32.DLL"); - if(lib) - { - uint8_t rnd[128]; - BOOLEAN(APIENTRY * pfn) (void *, ULONG) = - (BOOLEAN(APIENTRY *) (void *, ULONG))GetProcAddress(lib, - "SystemFunction036"); - if(pfn) - { - if(pfn(rnd, sizeof(rnd)) == TRUE) - arc4_addrandom(as, (void *)rnd, sizeof(rnd)); - memset(&rnd, 0, sizeof(rnd)); + total += ret; + continue; } + if(ret == 0) + break; + if(errno == EINTR) + continue; + break; } + close(fd); + if(total > 0) + arc4_addrandom(as, (void *)rnd, (int)total); + memset(&rnd, 0, sizeof(rnd)); } -#endif - /* * Throw away the first N words of output, as suggested in the diff --git a/libratbox/src/commio.c b/libratbox/src/commio.c index c8667aee..9303c37f 100644 --- a/libratbox/src/commio.c +++ b/libratbox/src/commio.c @@ -147,7 +147,6 @@ rb_fd_hack(int *fd) static void rb_close_all(void) { -#ifndef _WIN32 int i; /* XXX someone tell me why we care about 4 fd's ? */ @@ -156,7 +155,6 @@ rb_close_all(void) { close(i); } -#endif } /* @@ -629,7 +627,6 @@ rb_socketpair(int family, int sock_type, int proto, rb_fde_t **F1, rb_fde_t **F2 int rb_pipe(rb_fde_t **F1, rb_fde_t **F2, const char *desc) { -#ifndef _WIN32 int fd[2]; if(number_fd >= rb_maxconnections) { @@ -661,12 +658,6 @@ rb_pipe(rb_fde_t **F1, rb_fde_t **F2, const char *desc) return 0; -#else - /* Its not a pipe..but its selectable. I'll take dirty hacks - * for $500 Alex. - */ - return rb_socketpair(AF_INET, SOCK_STREAM, 0, F1, F2, desc); -#endif } /* @@ -794,18 +785,7 @@ void rb_fdlist_init(int closeall, int maxfds) { static int initialized = 0; -#ifdef _WIN32 - WSADATA wsaData; - int err; - int vers = MAKEWORD(2, 0); - - err = WSAStartup(vers, &wsaData); - if(err != 0) - { - rb_lib_die("WSAStartup failed"); - } -#endif if(!initialized) { rb_maxconnections = maxfds; @@ -886,16 +866,7 @@ rb_close(rb_fde_t *F) } number_fd--; - -#ifdef _WIN32 - if(type & (RB_FD_SOCKET | RB_FD_PIPE)) - { - closesocket(fd); - return; - } - else -#endif - close(fd); + close(fd); } @@ -1041,7 +1012,7 @@ rb_write(rb_fde_t *F, const void *buf, size_t count) return write(F->fd, buf, count); } -#if defined(HAVE_SSL) || defined(WIN32) || !defined(HAVE_WRITEV) +#if defined(HAVE_SSL) || !defined(HAVE_WRITEV) static ssize_t rb_fake_writev(rb_fde_t *F, const struct rb_iovec *vp, int vpcount) { @@ -1065,7 +1036,7 @@ rb_fake_writev(rb_fde_t *F, const struct rb_iovec *vp, int vpcount) } #endif -#if defined(WIN32) || !defined(HAVE_WRITEV) +#if !defined(HAVE_WRITEV) ssize_t rb_writev(rb_fde_t *F, struct rb_iovec * vecount, int count) { @@ -1609,12 +1580,6 @@ rb_inet_socketpair_udp(rb_fde_t **newF1, rb_fde_t **newF2) *newF2 = F[1]; return 0; -#ifdef _WIN32 -#ifndef ECONNABORTED -#define ECONNABORTED WSAECONNABORTED -#endif -#endif - abort_failed: rb_get_errno(); errno = ECONNABORTED; @@ -2049,7 +2014,7 @@ rb_ignore_errno(int error) } -#if defined(HAVE_SENDMSG) && !defined(WIN32) +#if defined(HAVE_SENDMSG) ssize_t rb_recv_fd_buf(rb_fde_t *F, void *data, size_t datasize, rb_fde_t **xF, unsigned int nfds) { @@ -2166,7 +2131,6 @@ rb_send_fd_buf(rb_fde_t *xF, rb_fde_t **F, unsigned int count, void *data, size_ } #else -#ifndef _WIN32 int rb_recv_fd_buf(rb_fde_t *F, void *data, size_t datasize, rb_fde_t **xF, int nfds) { @@ -2181,4 +2145,3 @@ rb_send_fd_buf(rb_fde_t *xF, rb_fde_t **F, int count, void *data, size_t datasiz return -1; } #endif -#endif diff --git a/libratbox/src/helper.c b/libratbox/src/helper.c index 3958964f..7e53c3e2 100644 --- a/libratbox/src/helper.c +++ b/libratbox/src/helper.c @@ -59,7 +59,6 @@ rb_helper_child(rb_helper_cb * read_cb, rb_helper_cb * error_cb, log_cb * ilog, ofd = (int)strtol(tofd, NULL, 10); maxfd = (int)strtol(tmaxfd, NULL, 10); -#ifndef _WIN32 int x; for(x = 0; x < maxfd; x++) { @@ -75,7 +74,6 @@ rb_helper_child(rb_helper_cb * read_cb, rb_helper_cb * error_cb, log_cb * ilog, dup2(x, 2); if(x > 2) /* don't undo what we just did */ close(x); -#endif rb_lib_init(ilog, irestart, idie, 0, maxfd); rb_linebuf_init(); @@ -146,11 +144,6 @@ rb_helper_start(const char *name, const char *fullpath, rb_helper_cb * read_cb, parv[0] = buf; parv[1] = NULL; -#ifdef _WIN32 - SetHandleInformation((HANDLE) rb_get_fd(in_f[1]), HANDLE_FLAG_INHERIT, 1); - SetHandleInformation((HANDLE) rb_get_fd(out_f[0]), HANDLE_FLAG_INHERIT, 1); -#endif - pid = rb_spawn_process(fullpath, (const char **)parv); if(pid == -1) diff --git a/libratbox/src/select.c b/libratbox/src/select.c index dd94c451..ee7c5374 100644 --- a/libratbox/src/select.c +++ b/libratbox/src/select.c @@ -27,19 +27,12 @@ #include "ratbox_lib.h" #include "commio-int.h" -#if defined(HAVE_SELECT) || defined(_WIN32) - -#ifdef _WIN32 -#define MY_FD_SET(x, y) FD_SET((SOCKET)x, y) -#define MY_FD_CLR(x, y) FD_CLR((SOCKET)x, y) -#else -#define MY_FD_SET(x, y) FD_SET(x, y) -#define MY_FD_CLR(x, y) FD_CLR(x, y) -#endif - #ifdef HAVE_SYS_SELECT_H #include #endif + +#if defined(HAVE_SELECT) + /* * Note that this is only a single list - multiple lists is kinda pointless * under select because the list size is a function of the highest FD :-) @@ -74,12 +67,12 @@ select_update_selectfds(rb_fde_t *F, short event, PF * handler) { if(handler) { - MY_FD_SET(F->fd, &select_readfds); + FD_SET(F->fd, &select_readfds); F->pflags |= RB_SELECT_READ; } else { - MY_FD_CLR(F->fd, &select_readfds); + FD_CLR(F->fd, &select_readfds); F->pflags &= ~RB_SELECT_READ; } } @@ -88,12 +81,12 @@ select_update_selectfds(rb_fde_t *F, short event, PF * handler) { if(handler) { - MY_FD_SET(F->fd, &select_writefds); + FD_SET(F->fd, &select_writefds); F->pflags |= RB_SELECT_WRITE; } else { - MY_FD_CLR(F->fd, &select_writefds); + FD_CLR(F->fd, &select_writefds); F->pflags &= ~RB_SELECT_WRITE; } } diff --git a/libratbox/src/unix.c b/libratbox/src/unix.c index e89f1e8e..840fa2ea 100644 --- a/libratbox/src/unix.c +++ b/libratbox/src/unix.c @@ -25,8 +25,6 @@ #include "ratbox_lib.h" -#ifndef _WIN32 - #include @@ -144,6 +142,3 @@ rb_getpid(void) { return getpid(); } - - -#endif /* !WIN32 */ diff --git a/libratbox/src/win32.c b/libratbox/src/win32.c deleted file mode 100644 index 7d74e9d2..00000000 --- a/libratbox/src/win32.c +++ /dev/null @@ -1,642 +0,0 @@ -/* - * ircd-ratbox: A slightly useful ircd. - * win32.c: select() compatible network routines. - * - * Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center - * Copyright (C) 1996-2002 Hybrid Development Team - * Copyright (C) 2001 Adrian Chadd - * Copyright (C) 2005-2006 Aaron Sethman - * Copyright (C) 2002-2026 ircd-ratbox development team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - * USA - */ - -#include "libratbox_config.h" -#include "ratbox_lib.h" -#include "commio-int.h" - -#ifdef _WIN32 - -static HWND hwnd; - -#define WM_SOCKET WM_USER -/* - * having gettimeofday is nice... - */ - -typedef union -{ - unsigned __int64 ft_i64; - FILETIME ft_val; -} FT_t; - -#ifdef __GNUC__ -#define Const64(x) x##LL -#else -#define Const64(x) x##i64 -#endif -/* Number of 100 nanosecond units from 1/1/1601 to 1/1/1970 */ -#define EPOCH_BIAS Const64(116444736000000000) - -pid_t -rb_getpid() -{ - return GetCurrentProcessId(); -} - - -int -rb_gettimeofday(struct timeval *tp, void *not_used) -{ - FT_t ft; - - /* this returns time in 100-nanosecond units (i.e. tens of usecs) */ - GetSystemTimeAsFileTime(&ft.ft_val); - - /* seconds since epoch */ - tp->tv_sec = (long)((ft.ft_i64 - EPOCH_BIAS) / Const64(10000000)); - - /* microseconds remaining */ - tp->tv_usec = (long)((ft.ft_i64 / Const64(10)) % Const64(1000000)); - - return 0; -} - - -pid_t -rb_spawn_process(const char *path, const char **argv) -{ - PROCESS_INFORMATION pi; - STARTUPINFO si; - char cmd[MAX_PATH]; - memset(&pi, 0, sizeof(pi)); - memset(&si, 0, sizeof(si)); - rb_strlcpy(cmd, path, sizeof(cmd)); - if(CreateProcess(cmd, cmd, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi) == FALSE) - return -1; - - return (pi.dwProcessId); -} - -pid_t -rb_waitpid(int pid, int *status, int flags) -{ - DWORD timeout = (flags & WNOHANG) ? 0 : INFINITE; - HANDLE hProcess; - DWORD waitcode; - - hProcess = OpenProcess(PROCESS_ALL_ACCESS, TRUE, pid); - if(hProcess) - { - waitcode = WaitForSingleObject(hProcess, timeout); - if(waitcode == WAIT_TIMEOUT) - { - CloseHandle(hProcess); - return 0; - } - else if(waitcode == WAIT_OBJECT_0) - { - if(GetExitCodeProcess(hProcess, &waitcode)) - { - *status = (int)((waitcode & 0xff) << 8); - CloseHandle(hProcess); - return pid; - } - } - CloseHandle(hProcess); - } - else - errno = ECHILD; - - return -1; -} - -int -rb_setenv(const char *name, const char *value, int overwrite) -{ - char *buf; - int len; - if(!overwrite) - { - if((buf = getenv(name)) != NULL) - { - if(strlen(buf) > 0) - { - return 0; - } - } - } - if(name == NULL || value == NULL) - return -1; - len = strlen(name) + strlen(value) + 5; - buf = rb_malloc(len); - snprintf(buf, len, "%s=%s", name, value); - len = putenv(buf); - rb_free(buf); - return (len); -} - -int -rb_kill(int pid, int sig) -{ - HANDLE hProcess; - hProcess = OpenProcess(PROCESS_ALL_ACCESS, TRUE, pid); - int ret = -1; - if(hProcess) - { - switch (sig) - { - case 0: - ret = 0; - break; - - default: - if(TerminateProcess(hProcess, sig)) - ret = 0; - break; - } - CloseHandle(hProcess); - } - else - errno = EINVAL; - - return ret; - - -} - -/* - * packet format is - uint32_t magic - uint8_t protocol count - WSAPROTOCOL_INFO * count - size_t datasize - data - - */ - -static int -make_wsaprotocol_info(pid_t process, rb_fde_t *F, WSAPROTOCOL_INFO * inf) -{ - WSAPROTOCOL_INFO info; - if(!WSADuplicateSocket((SOCKET) rb_get_fd(F), process, &info)) - { - memcpy(inf, &info, sizeof(WSAPROTOCOL_INFO)); - return 1; - } - return 0; -} - -static rb_fde_t * -make_fde_from_wsaprotocol_info(void *data) -{ - WSAPROTOCOL_INFO *info = data; - SOCKET t; - t = WSASocket(FROM_PROTOCOL_INFO, FROM_PROTOCOL_INFO, FROM_PROTOCOL_INFO, info, 0, 0); - if(t == INVALID_SOCKET) - { - rb_get_errno(); - return NULL; - } - return rb_open(t, RB_FD_SOCKET, "remote_socket"); -} - -static uint8_t fd_buf[16384]; -#define MAGIC_CONTROL 0xFF0ACAFE - -ssize_t -rb_send_fd_buf(rb_fde_t *xF, rb_fde_t **F, unsigned int count, void *data, size_t datasize, pid_t pid) -{ - size_t bufsize = - sizeof(uint32_t) + sizeof(uint8_t) + (sizeof(WSAPROTOCOL_INFO) * (size_t)count) + - sizeof(size_t) + datasize; - int i; - uint32_t magic = MAGIC_CONTROL; - void *ptr; - if(count > 4) - { - errno = EINVAL; - return -1; - } - if(bufsize > sizeof(fd_buf)) - { - errno = EINVAL; - return -1; - } - memset(fd_buf, 0, sizeof(fd_buf)); - - ptr = fd_buf; - memcpy(ptr, &magic, sizeof(magic)); - ptr = (void *)((uintptr_t)ptr + (uintptr_t)sizeof(magic)); - *((uint8_t *)ptr) = count; - ptr = (void *)((uintptr_t)ptr + (uintptr_t)sizeof(uint8_t)); - - for(i = 0; i < count; i++) - { - make_wsaprotocol_info(pid, F[i], (WSAPROTOCOL_INFO *) ptr); - ptr = (void *)((uintptr_t)ptr + (uintptr_t)sizeof(WSAPROTOCOL_INFO)); - } - memcpy(ptr, &datasize, sizeof(size_t)); - ptr = (void *)((uintptr_t)ptr + (uintptr_t)sizeof(size_t)); - memcpy(ptr, data, datasize); - return rb_write(xF, fd_buf, bufsize); -} - -#ifdef MYMIN -#undef MYMIN -#endif -#define MYMIN(a, b) ((a) < (b) ? (a) : (b)) - -ssize_t -rb_recv_fd_buf(rb_fde_t *F, void *data, size_t datasize, rb_fde_t **xF, unsigned int nfds) -{ - size_t minsize = sizeof(uint32_t) + sizeof(uint8_t) + sizeof(size_t); - size_t datalen; - ssize_t retlen; - uint32_t magic; - uint8_t count; - unsigned int i; - void *ptr; - ssize_t ret; - memset(fd_buf, 0, sizeof(fd_buf)); /* some paranoia here... */ - ret = rb_read(F, fd_buf, sizeof(fd_buf)); - if(ret <= 0) - { - return ret; - } - if(ret < (ssize_t) minsize) - { - errno = EINVAL; - return -1; - } - ptr = fd_buf; - memcpy(&magic, ptr, sizeof(uint32_t)); - if(magic != MAGIC_CONTROL) - { - errno = EAGAIN; - return -1; - } - ptr = (void *)((uintptr_t)ptr + (uintptr_t)sizeof(uint32_t)); - memcpy(&count, ptr, sizeof(uint8_t)); - ptr = (void *)((uintptr_t)ptr + (uintptr_t)sizeof(uint8_t)); - for(i = 0; i < count && i < (unsigned int)nfds; i++) - { - rb_fde_t *tF = make_fde_from_wsaprotocol_info(ptr); - if(tF == NULL) - return -1; - xF[i] = tF; - ptr = (void *)((uintptr_t)ptr + (uintptr_t)sizeof(WSAPROTOCOL_INFO)); - } - memcpy(&datalen, ptr, sizeof(size_t)); - ptr = (void *)((uintptr_t)ptr + (uintptr_t)sizeof(size_t)); - retlen = MYMIN(datalen, datasize); - memcpy(data, ptr, retlen); - return retlen; -} - -static LRESULT CALLBACK -rb_process_events(HWND nhwnd, UINT umsg, WPARAM wparam, LPARAM lparam) -{ - rb_fde_t *F; - PF *hdl; - void *data; - switch (umsg) - { - case WM_SOCKET: - { - F = rb_find_fd(wparam); - - if(F != NULL && IsFDOpen(F)) - { - switch (WSAGETSELECTEVENT(lparam)) - { - case FD_ACCEPT: - case FD_CLOSE: - case FD_READ: - { - if((hdl = F->read_handler) != NULL) - { - F->read_handler = NULL; - data = F->read_data; - F->read_data = NULL; - hdl(F, data); - } - break; - } - - case FD_CONNECT: - case FD_WRITE: - { - if((hdl = F->write_handler) != NULL) - { - F->write_handler = NULL; - data = F->write_data; - F->write_data = NULL; - hdl(F, data); - } - } - } - - } - return 0; - } - case WM_DESTROY: - { - PostQuitMessage(0); - return 0; - } - - default: - return DefWindowProc(nhwnd, umsg, wparam, lparam); - } - return 0; -} - -int -rb_init_netio_win32(void) -{ - /* this muchly sucks, but i'm too lazy to do overlapped i/o, maybe someday... -androsyn */ - WNDCLASS wc; - static const char *classname = "ircd-ratbox-class"; - - wc.style = 0; - wc.lpfnWndProc = (WNDPROC) rb_process_events; - wc.cbClsExtra = 0; - wc.cbWndExtra = 0; - wc.hIcon = NULL; - wc.hCursor = NULL; - wc.hbrBackground = NULL; - wc.lpszMenuName = NULL; - wc.lpszClassName = classname; - wc.hInstance = GetModuleHandle(NULL); - - if(!RegisterClass(&wc)) - rb_lib_die("cannot register window class"); - - hwnd = CreateWindow(classname, classname, WS_POPUP, CW_USEDEFAULT, - CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - (HWND) NULL, (HMENU) NULL, wc.hInstance, NULL); - if(!hwnd) - rb_lib_die("could not create window"); - return 0; -} - -void -rb_sleep(unsigned int seconds, unsigned int useconds) -{ - DWORD msec = seconds * 1000;; - Sleep(msec); -} - -int -rb_setup_fd_win32(rb_fde_t *F) -{ - if(F == NULL) - return 0; - - SetHandleInformation((HANDLE) F->fd, HANDLE_FLAG_INHERIT, 0); - switch (F->type) - { - case RB_FD_SOCKET: - { - u_long nonb = 1; - if(ioctlsocket((SOCKET) F->fd, FIONBIO, &nonb) == -1) - { - rb_get_errno(); - return 0; - } - return 1; - } - default: - return 1; - - } -} - -void -rb_setselect_win32(rb_fde_t *F, unsigned int type, PF * handler, void *client_data) -{ - int old_flags = F->pflags; - - lrb_assert(IsFDOpen(F)); - - /* Update the list, even though we're not using it .. */ - if(type & RB_SELECT_READ) - { - if(handler != NULL) - F->pflags |= FD_CLOSE | FD_READ | FD_ACCEPT; - else - F->pflags &= ~(FD_CLOSE | FD_READ | FD_ACCEPT); - F->read_handler = handler; - F->read_data = client_data; - } - - if(type & RB_SELECT_WRITE) - { - if(handler != NULL) - F->pflags |= FD_WRITE | FD_CONNECT; - else - F->pflags &= ~(FD_WRITE | FD_CONNECT); - F->write_handler = handler; - F->write_data = client_data; - } - - if(old_flags == 0 && F->pflags == 0) - return; - - if(F->pflags != old_flags) - { - WSAAsyncSelect(F->fd, hwnd, WM_SOCKET, F->pflags); - } - -} - - -static int has_set_timer = 0; - -int -rb_select_win32(long delay) -{ - MSG msg; - if(has_set_timer == 0) - { - /* XXX should probably have this handle all the events - * instead of busy looping - */ - SetTimer(hwnd, 0, delay, NULL); - has_set_timer = 1; - } - - if(GetMessage(&msg, NULL, 0, 0) == FALSE) - { - rb_lib_die("GetMessage failed..byebye"); - } - rb_set_time(); - - DispatchMessage(&msg); - return RB_OK; -} - -#ifdef strerror -#undef strerror -#endif - -static const char * -_rb_strerror(int error) -{ - switch (error) - { - case 0: - return "Success"; - case WSAEINTR: - return "Interrupted system call"; - case WSAEBADF: - return "Bad file number"; - case WSAEACCES: - return "Permission denied"; - case WSAEFAULT: - return "Bad address"; - case WSAEINVAL: - return "Invalid argument"; - case WSAEMFILE: - return "Too many open sockets"; - case WSAEWOULDBLOCK: - return "Operation would block"; - case WSAEINPROGRESS: - return "Operation now in progress"; - case WSAEALREADY: - return "Operation already in progress"; - case WSAENOTSOCK: - return "Socket operation on non-socket"; - case WSAEDESTADDRREQ: - return "Destination address required"; - case WSAEMSGSIZE: - return "Message too long"; - case WSAEPROTOTYPE: - return "Protocol wrong type for socket"; - case WSAENOPROTOOPT: - return "Bad protocol option"; - case WSAEPROTONOSUPPORT: - return "Protocol not supported"; - case WSAESOCKTNOSUPPORT: - return "Socket type not supported"; - case WSAEOPNOTSUPP: - return "Operation not supported on socket"; - case WSAEPFNOSUPPORT: - return "Protocol family not supported"; - case WSAEAFNOSUPPORT: - return "Address family not supported"; - case WSAEADDRINUSE: - return "Address already in use"; - case WSAEADDRNOTAVAIL: - return "Can't assign requested address"; - case WSAENETDOWN: - return "Network is down"; - case WSAENETUNREACH: - return "Network is unreachable"; - case WSAENETRESET: - return "Net connection reset"; - case WSAECONNABORTED: - return "Software caused connection abort"; - case WSAECONNRESET: - return "Connection reset by peer"; - case WSAENOBUFS: - return "No buffer space available"; - case WSAEISCONN: - return "Socket is already connected"; - case WSAENOTCONN: - return "Socket is not connected"; - case WSAESHUTDOWN: - return "Can't send after socket shutdown"; - case WSAETOOMANYREFS: - return "Too many references, can't splice"; - case WSAETIMEDOUT: - return "Connection timed out"; - case WSAECONNREFUSED: - return "Connection refused"; - case WSAELOOP: - return "Too many levels of symbolic links"; - case WSAENAMETOOLONG: - return "File name too long"; - case WSAEHOSTDOWN: - return "Host is down"; - case WSAEHOSTUNREACH: - return "No route to host"; - case WSAENOTEMPTY: - return "Directory not empty"; - case WSAEPROCLIM: - return "Too many processes"; - case WSAEUSERS: - return "Too many users"; - case WSAEDQUOT: - return "Disc quota exceeded"; - case WSAESTALE: - return "Stale NFS file handle"; - case WSAEREMOTE: - return "Too many levels of remote in path"; - case WSASYSNOTREADY: - return "Network system is unavailable"; - case WSAVERNOTSUPPORTED: - return "Winsock version out of range"; - case WSANOTINITIALISED: - return "WSAStartup not yet called"; - case WSAEDISCON: - return "Graceful shutdown in progress"; - case WSAHOST_NOT_FOUND: - return "Host not found"; - case WSANO_DATA: - return "No host data of that type was found"; - default: - return strerror(error); - } -}; - -char * -rb_strerror(int error) -{ - static char buf[128]; - rb_strlcpy(buf, _rb_strerror(error), sizeof(buf)); - return buf; -} -#else /* win32 not supported */ -int -rb_init_netio_win32(void) -{ - errno = ENOSYS; - return -1; -} - -void -rb_setselect_win32(rb_fde_t *F, unsigned int type, PF * handler, void *client_data) -{ - errno = ENOSYS; - return; -} - -int -rb_select_win32(long delay) -{ - errno = ENOSYS; - return -1; -} - -int -rb_setup_fd_win32(rb_fde_t *F) -{ - errno = ENOSYS; - return -1; -} -#endif /* _WIN32 */ From 374ca347d095904ef3a5c68ee35f1fd2c5577a8b Mon Sep 17 00:00:00 2001 From: Aaron Sethman Date: Tue, 27 Jan 2026 15:50:17 -0500 Subject: [PATCH 04/32] More win32 related evictions --- libratbox/src/commio.c | 49 ++---------------------------------------- modules/m_stats.c | 2 -- src/bandbi.c | 12 +++-------- src/dns.c | 12 ++++------- src/ircd.c | 17 +++------------ src/ircd_signal.c | 17 --------------- src/s_log.c | 4 ---- src/sslproc.c | 18 +++++----------- 8 files changed, 17 insertions(+), 114 deletions(-) diff --git a/libratbox/src/commio.c b/libratbox/src/commio.c index 9303c37f..09162b15 100644 --- a/libratbox/src/commio.c +++ b/libratbox/src/commio.c @@ -174,7 +174,6 @@ rb_get_sockerr(rb_fde_t *F) if(!(F->type & RB_FD_SOCKET)) return errno; - rb_get_errno(); errtmp = errno; #ifdef SO_ERROR @@ -343,7 +342,6 @@ rb_accept_tryaccept(rb_fde_t *F, void *data) while(1) { new_fd = accept(F->fd, (struct sockaddr *)&st, &addrlen); - rb_get_errno(); if(new_fd < 0) { rb_setselect(F, RB_SELECT_ACCEPT, rb_accept_tryaccept, NULL); @@ -365,7 +363,6 @@ rb_accept_tryaccept(rb_fde_t *F, void *data) if(rb_unlikely(!rb_set_nb(new_F))) { - rb_get_errno(); rb_lib_log("rb_accept: Couldn't set FD %d non blocking!", new_F->fd); rb_close(new_F); } @@ -524,7 +521,6 @@ rb_connect_tryconnect(rb_fde_t *F, void *notused) * which is a good thing. * -- adrian */ - rb_get_errno(); if(errno == EISCONN) rb_connect_callback(F, RB_OK); else if(rb_ignore_errno(errno)) @@ -957,7 +953,6 @@ rb_get_fde(int fd) ssize_t rb_read(rb_fde_t *F, void *buf, size_t count) { - ssize_t ret; if(F == NULL) return 0; @@ -972,12 +967,7 @@ rb_read(rb_fde_t *F, void *buf, size_t count) #endif if(F->type & RB_FD_SOCKET) { - ret = recv(F->fd, buf, count, 0); - if(ret < 0) - { - rb_get_errno(); - } - return ret; + return recv(F->fd, buf, count, 0); } @@ -989,7 +979,6 @@ rb_read(rb_fde_t *F, void *buf, size_t count) ssize_t rb_write(rb_fde_t *F, const void *buf, size_t count) { - ssize_t ret; if(F == NULL) return 0; @@ -1001,12 +990,7 @@ rb_write(rb_fde_t *F, const void *buf, size_t count) #endif if(F->type & RB_FD_SOCKET) { - ret = send(F->fd, buf, count, MSG_NOSIGNAL); - if(ret < 0) - { - rb_get_errno(); - } - return ret; + return send(F->fd, buf, count, MSG_NOSIGNAL); } return write(F->fd, buf, count); @@ -1581,11 +1565,8 @@ rb_inet_socketpair_udp(rb_fde_t **newF1, rb_fde_t **newF2) return 0; abort_failed: - rb_get_errno(); errno = ECONNABORTED; failed: - if(errno != ECONNABORTED) - rb_get_errno(); int o_errno = errno; if(F[0] != NULL) rb_close(F[0]); @@ -1814,24 +1795,6 @@ try_poll(void) return -1; } -static int -try_win32(void) -{ - if(!rb_init_netio_win32()) - { - setselect_handler = rb_setselect_win32; - select_handler = rb_select_win32; - setup_fd_handler = rb_setup_fd_win32; - io_sched_event = NULL; - io_unsched_event = NULL; - io_init_event = NULL; - io_supports_event = rb_unsupported_event; - rb_strlcpy(iotype, "win32", sizeof(iotype)); - return 0; - } - return -1; -} - static int try_select(void) { @@ -1930,12 +1893,6 @@ rb_init_netio(void) if(!try_select()) return; } - if(!strcmp("win32", ioenv)) - { - if(!try_win32()) - return; - } - } #if 0 if(!try_libevent()) @@ -1951,8 +1908,6 @@ rb_init_netio(void) return; if(!try_poll()) return; - if(!try_win32()) - return; if(!try_select()) return; diff --git a/modules/m_stats.c b/modules/m_stats.c index 829e4599..06e4a04f 100644 --- a/modules/m_stats.c +++ b/modules/m_stats.c @@ -829,7 +829,6 @@ stats_resv(struct Client *source_p) static void stats_usage(struct Client *source_p) { -#ifndef _WIN32 struct rusage rus; time_t secs; time_t rup; @@ -840,7 +839,6 @@ stats_usage(struct Client *source_p) #define hzz HZ #else int hzz = 1; -#endif #endif if(getrusage(RUSAGE_SELF, &rus) == -1) diff --git a/src/bandbi.c b/src/bandbi.c index ae84929b..f8f6fb71 100644 --- a/src/bandbi.c +++ b/src/bandbi.c @@ -87,22 +87,16 @@ static int bandb_start(void) { char fullpath[PATH_MAX + 1]; -#ifdef _WIN32 - const char *suffix = ".exe"; -#else - const char *suffix = ""; -#endif - rb_setenv("BANDB_DPATH", ServerInfo.bandb_path, 1); if(bandb_path == NULL) { - snprintf(fullpath, sizeof(fullpath), "%s/bandb%s", LIBEXEC_DIR, suffix); + snprintf(fullpath, sizeof(fullpath), "%s/bandb", LIBEXEC_DIR); if(access(fullpath, X_OK) == -1) { - snprintf(fullpath, sizeof(fullpath), "%s/libexec/ircd-ratbox/bandb%s", - ConfigFileEntry.dpath, suffix); + snprintf(fullpath, sizeof(fullpath), "%s/libexec/ircd-ratbox/bandb", + ConfigFileEntry.dpath); if(access(fullpath, X_OK) == -1) { diff --git a/src/dns.c b/src/dns.c index 01f3319e..8c47d539 100644 --- a/src/dns.c +++ b/src/dns.c @@ -193,19 +193,15 @@ static int start_resolver(void) { char fullpath[PATH_MAX + 1]; -#ifdef _WIN32 - const char *suffix = ".exe"; -#else - const char *suffix = ""; -#endif + if(resolver_path == NULL) { - snprintf(fullpath, sizeof(fullpath), "%s/resolver%s", LIBEXEC_DIR, suffix); + snprintf(fullpath, sizeof(fullpath), "%s/resolver", LIBEXEC_DIR); if(access(fullpath, X_OK) == -1) { - snprintf(fullpath, sizeof(fullpath), "%s/libexec/ircd-ratbox/resolver%s", - ConfigFileEntry.dpath, suffix); + snprintf(fullpath, sizeof(fullpath), "%s/libexec/ircd-ratbox/resolver", + ConfigFileEntry.dpath); if(access(fullpath, X_OK) == -1) { ilog(L_MAIN, diff --git a/src/ircd.c b/src/ircd.c index 83e01715..9b0f2be3 100644 --- a/src/ircd.c +++ b/src/ircd.c @@ -162,12 +162,8 @@ get_vm_top(void) * offset from 0 (NULL), so the result of sbrk is cast to a size_t and * returned. We really shouldn't be using it here but... */ -#ifndef _WIN32 void *vptr = sbrk(0); - return (unsigned long)vptr; -#else - return 0; -#endif + return (uintptr_t)vptr; } /* @@ -232,7 +228,6 @@ init_sys(void) static int make_daemon(void) { -#ifndef _WIN32 int pid, fd; if((pid = fork()) < 0) @@ -254,7 +249,6 @@ make_daemon(void) dup2(fd, 1); dup2(fd, 2); close(fd); -#endif return 0; } @@ -489,13 +483,12 @@ ratbox_main(int argc, char *argv[]) char emptyname[] = ""; int r; /* Check to see if the user is running us as root, which is a nono */ -#ifndef _WIN32 if(geteuid() == 0) { fprintf(stderr, "Don't run ircd as root!!!\n"); exit(EXIT_FAILURE); } -#endif + initialVMTop = get_vm_top(); init_sys(); @@ -604,7 +597,7 @@ ratbox_main(int argc, char *argv[]) -#if defined(__CYGWIN__) || defined(_WIN32) || defined(RATBOX_PROFILE) +#if defined(__CYGWIN__) || defined(RATBOX_PROFILE) server_state_foreground = 1; #endif @@ -757,19 +750,15 @@ server_reboot(void) * bah, for now, the program ain't coming back to here, so forcibly * close everything the "wrong" way for now, and just LEAVE... */ -#ifndef _WIN32 int i; for(i = 0; i < maxconnections; ++i) close(i); -#endif unlink(pidFileName); -#ifndef _WIN32 int fd = open("/dev/null", O_RDWR); dup2(fd, 0); dup2(fd, 1); dup2(fd, 2); -#endif execv(SPATH, (void *)myargv); diff --git a/src/ircd_signal.c b/src/ircd_signal.c index 196e193a..b35a6f5f 100644 --- a/src/ircd_signal.c +++ b/src/ircd_signal.c @@ -27,7 +27,6 @@ #include "dns.h" #include "s_auth.h" -#ifndef _WIN32 /* * dummy_handler - don't know if this is really needed but if alarm is still * being used we probably will @@ -222,19 +221,3 @@ setup_reboot_signals(void) } - - - -#else -void -setup_signals() -{ -/* this is a stub for mingw32 */ -} - -void -setup_reboot_signals() -{ -/* this is a stub for mingw32 */ -} -#endif diff --git a/src/s_log.c b/src/s_log.c index 1bc3d92f..f48fc1ce 100644 --- a/src/s_log.c +++ b/src/s_log.c @@ -179,15 +179,11 @@ ilog(ilogfile dest, const char *format, ...) va_end(args); snprintf(buf2, sizeof(buf2), "%s %s\n", smalldate(rb_current_time()), buf); -#ifndef _WIN32 if(logfile == NULL || server_state_foreground) { -#endif fputs(buf2, stderr); fflush(stderr); -#ifndef _WIN32 } -#endif if(logfile == NULL) return; diff --git a/src/sslproc.c b/src/sslproc.c index d6dad408..3ffb5fdc 100644 --- a/src/sslproc.c +++ b/src/sslproc.c @@ -209,11 +209,6 @@ start_ssldaemon(int count, const char *ssl_ca_cert, const char *ssl_cert, const { rb_fde_t *F1, *F2; rb_fde_t *P1, *P2; -#ifdef _WIN32 - const char *suffix = ".exe"; -#else - const char *suffix = ""; -#endif char fullpath[PATH_MAX + 1]; char fdarg[6]; const char *parv[2]; @@ -238,17 +233,17 @@ start_ssldaemon(int count, const char *ssl_ca_cert, const char *ssl_cert, const last_spin = rb_current_time(); if(ssld_path == NULL) { - snprintf(fullpath, sizeof(fullpath), "%s/ssld%s", LIBEXEC_DIR, suffix); + snprintf(fullpath, sizeof(fullpath), "%s/ssld", LIBEXEC_DIR); if(access(fullpath, X_OK) == -1) { - snprintf(fullpath, sizeof(fullpath), "%s/libexec/ircd-ratbox/ssld%s", - ConfigFileEntry.dpath, suffix); + snprintf(fullpath, sizeof(fullpath), "%s/libexec/ircd-ratbox/ssld", + ConfigFileEntry.dpath); if(access(fullpath, X_OK) == -1) { ilog(L_MAIN, "Unable to execute ssld%s in %s/libexec/ircd-ratbox or %s", - ConfigFileEntry.dpath, suffix, LIBEXEC_DIR); + ConfigFileEntry.dpath, LIBEXEC_DIR); return 0; } } @@ -279,10 +274,7 @@ start_ssldaemon(int count, const char *ssl_ca_cert, const char *ssl_cert, const rb_setenv("CTL_PIPE", fdarg, 1); snprintf(s_pid, sizeof(s_pid), "%d", (int)getpid()); rb_setenv("CTL_PPID", s_pid, 1); -#ifdef _WIN32 - SetHandleInformation((HANDLE) rb_get_fd(F2), HANDLE_FLAG_INHERIT, 1); - SetHandleInformation((HANDLE) rb_get_fd(P1), HANDLE_FLAG_INHERIT, 1); -#endif + pid = rb_spawn_process(ssld_path, (const char **)parv); if(pid == -1) { From 43b2718cd514ebf01f66cd0d303853abd5f2849b Mon Sep 17 00:00:00 2001 From: Aaron Sethman Date: Tue, 27 Jan 2026 15:57:41 -0500 Subject: [PATCH 05/32] More win32 related evictions. --- Makefile.in | 3 +- bandb/Makefile.in | 2 +- bandb/sqlite3/Makefile.in | 1 + contrib/Makefile.in | 1 + help/Makefile.in | 2 +- modules/Makefile.in | 1 + resolver/Makefile.am | 4 - resolver/Makefile.in | 18 +- resolver/getaddrinfo.c | 615 -------------------------------------- resolver/getnameinfo.c | 240 --------------- resolver/reslib.c | 34 --- resolver/reslist.c | 276 ----------------- src/Makefile.in | 1 + ssld/Makefile.in | 1 + ssld/ssld.c | 6 - tools/Makefile.in | 2 +- 16 files changed, 15 insertions(+), 1192 deletions(-) delete mode 100644 resolver/getaddrinfo.c delete mode 100644 resolver/getnameinfo.c delete mode 100644 resolver/reslist.c diff --git a/Makefile.in b/Makefile.in index cd81c300..09c31e3a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -220,7 +220,7 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/install-mod.sh.in \ $(top_srcdir)/libltdl/config/depcomp \ $(top_srcdir)/libltdl/config/install-sh \ $(top_srcdir)/libltdl/config/ltmain.sh \ - $(top_srcdir)/libltdl/config/missing ChangeLog INSTALL compile \ + $(top_srcdir)/libltdl/config/missing INSTALL compile \ config.guess config.sub depcomp install-sh \ libltdl/config/compile libltdl/config/config.guess \ libltdl/config/config.sub libltdl/config/depcomp \ @@ -385,6 +385,7 @@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ ac_cv_have_struct_mallinfo = @ac_cv_have_struct_mallinfo@ +ac_cv_have_struct_mallinfo2 = @ac_cv_have_struct_mallinfo2@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff --git a/bandb/Makefile.in b/bandb/Makefile.in index 5646261f..fe5e9d18 100644 --- a/bandb/Makefile.in +++ b/bandb/Makefile.in @@ -340,6 +340,7 @@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ ac_cv_have_struct_mallinfo = @ac_cv_have_struct_mallinfo@ +ac_cv_have_struct_mallinfo2 = @ac_cv_have_struct_mallinfo2@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -396,7 +397,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ - AUTOMAKE_OPTIONS = foreign subdir-objects @BUILD_SQLITE_TRUE@SUBDIRS = sqlite3 @BUILD_SQLITE_TRUE@@sqlite3_CFLAGS@ = "-Isqlite3" diff --git a/bandb/sqlite3/Makefile.in b/bandb/sqlite3/Makefile.in index 4f05d0e3..549d0b8e 100644 --- a/bandb/sqlite3/Makefile.in +++ b/bandb/sqlite3/Makefile.in @@ -293,6 +293,7 @@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ ac_cv_have_struct_mallinfo = @ac_cv_have_struct_mallinfo@ +ac_cv_have_struct_mallinfo2 = @ac_cv_have_struct_mallinfo2@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff --git a/contrib/Makefile.in b/contrib/Makefile.in index 697731bd..569c7ca8 100644 --- a/contrib/Makefile.in +++ b/contrib/Makefile.in @@ -245,6 +245,7 @@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ ac_cv_have_struct_mallinfo = @ac_cv_have_struct_mallinfo@ +ac_cv_have_struct_mallinfo2 = @ac_cv_have_struct_mallinfo2@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff --git a/help/Makefile.in b/help/Makefile.in index eb486f6e..3121dd75 100644 --- a/help/Makefile.in +++ b/help/Makefile.in @@ -13,7 +13,6 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -243,6 +242,7 @@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ ac_cv_have_struct_mallinfo = @ac_cv_have_struct_mallinfo@ +ac_cv_have_struct_mallinfo2 = @ac_cv_have_struct_mallinfo2@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff --git a/modules/Makefile.in b/modules/Makefile.in index 14875b38..17ce761b 100644 --- a/modules/Makefile.in +++ b/modules/Makefile.in @@ -1031,6 +1031,7 @@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ ac_cv_have_struct_mallinfo = @ac_cv_have_struct_mallinfo@ +ac_cv_have_struct_mallinfo2 = @ac_cv_have_struct_mallinfo2@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff --git a/resolver/Makefile.am b/resolver/Makefile.am index b353d557..cb312296 100644 --- a/resolver/Makefile.am +++ b/resolver/Makefile.am @@ -3,11 +3,7 @@ libexec_PROGRAMS = resolver AM_CPPFLAGS = -I../include -I. -I../libratbox/include AM_CFLAGS=$(WARNFLAGS) -if MINGW -resolver_SOURCES = resolver.c res.c reslib.c getaddrinfo.c getnameinfo.c reslist.c -else resolver_SOURCES = resolver.c res.c reslib.c -endif resolver_LDADD = ../libratbox/src/libratbox.la diff --git a/resolver/Makefile.in b/resolver/Makefile.in index 85904633..212f3cb4 100644 --- a/resolver/Makefile.in +++ b/resolver/Makefile.in @@ -108,13 +108,8 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(libexecdir)" PROGRAMS = $(libexec_PROGRAMS) -am__resolver_SOURCES_DIST = resolver.c res.c reslib.c getaddrinfo.c \ - getnameinfo.c reslist.c -@MINGW_FALSE@am_resolver_OBJECTS = resolver.$(OBJEXT) res.$(OBJEXT) \ -@MINGW_FALSE@ reslib.$(OBJEXT) -@MINGW_TRUE@am_resolver_OBJECTS = resolver.$(OBJEXT) res.$(OBJEXT) \ -@MINGW_TRUE@ reslib.$(OBJEXT) getaddrinfo.$(OBJEXT) \ -@MINGW_TRUE@ getnameinfo.$(OBJEXT) reslist.$(OBJEXT) +am_resolver_OBJECTS = resolver.$(OBJEXT) res.$(OBJEXT) \ + reslib.$(OBJEXT) resolver_OBJECTS = $(am_resolver_OBJECTS) resolver_DEPENDENCIES = ../libratbox/src/libratbox.la AM_V_lt = $(am__v_lt_@AM_V@) @@ -156,7 +151,7 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = SOURCES = $(resolver_SOURCES) -DIST_SOURCES = $(am__resolver_SOURCES_DIST) +DIST_SOURCES = $(resolver_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -300,6 +295,7 @@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ ac_cv_have_struct_mallinfo = @ac_cv_have_struct_mallinfo@ +ac_cv_have_struct_mallinfo2 = @ac_cv_have_struct_mallinfo2@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -358,8 +354,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I../include -I. -I../libratbox/include AM_CFLAGS = $(WARNFLAGS) -@MINGW_FALSE@resolver_SOURCES = resolver.c res.c reslib.c -@MINGW_TRUE@resolver_SOURCES = resolver.c res.c reslib.c getaddrinfo.c getnameinfo.c reslist.c +resolver_SOURCES = resolver.c res.c reslib.c resolver_LDADD = ../libratbox/src/libratbox.la all: all-am @@ -454,11 +449,8 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getaddrinfo.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getnameinfo.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/res.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reslib.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reslist.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resolver.Po@am__quote@ .c.o: diff --git a/resolver/getaddrinfo.c b/resolver/getaddrinfo.c deleted file mode 100644 index f0dae242..00000000 --- a/resolver/getaddrinfo.c +++ /dev/null @@ -1,615 +0,0 @@ -/* - * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the project nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -#include "getaddrinfo.h" - -/* */ - -static const char in_addrany[] = { 0, 0, 0, 0 }; -static const char in_loopback[] = { 127, 0, 0, 1 }; -static const char in6_addrany[] = { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -}; -static const char in6_loopback[] = { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 -}; - -static const struct afd { - int a_af; - int a_addrlen; - int a_socklen; - int a_off; - const char *a_addrany; - const char *a_loopback; - int a_scoped; -} afdl [] = { -#define N_INET6 0 -#ifdef IPV6 - {PF_INET6, sizeof(struct in6_addr), - sizeof(struct sockaddr_in6), - offsetof(struct sockaddr_in6, sin6_addr), - in6_addrany, in6_loopback, 1}, -#endif -#define N_INET 1 - {PF_INET, sizeof(struct in_addr), - sizeof(struct sockaddr_in), - offsetof(struct sockaddr_in, sin_addr), - in_addrany, in_loopback, 0}, - {0, 0, 0, 0, NULL, NULL, 0}, -}; - -struct explore { - int e_af; - int e_socktype; - int e_protocol; - const char *e_protostr; - int e_wild; -#define WILD_AF(ex) ((ex)->e_wild & 0x01) -#define WILD_SOCKTYPE(ex) ((ex)->e_wild & 0x02) -#define WILD_PROTOCOL(ex) ((ex)->e_wild & 0x04) -}; - -static const struct explore explore[] = { -#ifdef IPV6 - { PF_INET6, SOCK_DGRAM, IPPROTO_UDP, "udp", 0x07 }, - { PF_INET6, SOCK_STREAM, IPPROTO_TCP, "tcp", 0x07 }, - { PF_INET6, SOCK_RAW, ANY, NULL, 0x05 }, -#endif - { PF_INET, SOCK_DGRAM, IPPROTO_UDP, "udp", 0x07 }, - { PF_INET, SOCK_STREAM, IPPROTO_TCP, "tcp", 0x07 }, - { PF_INET, SOCK_RAW, ANY, NULL, 0x05 }, - { PF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP, "udp", 0x07 }, - { PF_UNSPEC, SOCK_STREAM, IPPROTO_TCP, "tcp", 0x07 }, - { PF_UNSPEC, SOCK_RAW, ANY, NULL, 0x05 }, - { -1, 0, 0, NULL, 0 }, -}; - -#define PTON_MAX 16 - -static int str_isnumber(const char *); -static int explore_null(const struct rb_addrinfo *, - const char *, struct rb_addrinfo **); -static int explore_numeric(const struct rb_addrinfo *, const char *, - const char *, struct rb_addrinfo **); -static struct rb_addrinfo *get_ai(const struct rb_addrinfo *, - const struct afd *, const char *); -static int get_portmatch(const struct rb_addrinfo *, const char *); -static int get_port(struct rb_addrinfo *, const char *, int); -static const struct afd *find_afd(int); -#if 0 -/* We will need this should we ever want gai_strerror() */ -static char *ai_errlist[] = { - "Success", - "Address family for hostname not supported", /* EAI_ADDRFAMILY */ - "Temporary failure in name resolution", /* EAI_AGAIN */ - "Invalid value for ai_flags", /* EAI_BADFLAGS */ - "Non-recoverable failure in name resolution", /* EAI_FAIL */ - "ai_family not supported", /* EAI_FAMILY */ - "Memory allocation failure", /* EAI_MEMORY */ - "No address associated with hostname", /* EAI_NODATA */ - "hostname nor servname provided, or not known", /* EAI_NONAME */ - "servname not supported for ai_socktype", /* EAI_SERVICE */ - "ai_socktype not supported", /* EAI_SOCKTYPE */ - "System error returned in errno", /* EAI_SYSTEM */ - "Invalid value for hints", /* EAI_BADHINTS */ - "Resolved protocol is unknown", /* EAI_PROTOCOL */ - "Unknown error", /* EAI_MAX */ -}; -#endif -/* XXX macros that make external reference is BAD. */ - -#define GET_AI(ai, afd, addr) \ -do { \ - /* external reference: pai, error, and label free */ \ - (ai) = get_ai(pai, (afd), (addr)); \ - if ((ai) == NULL) { \ - error = EAI_MEMORY; \ - goto free; \ - } \ -} while (/*CONSTCOND*/0) - -#define GET_PORT(ai, serv) \ -do { \ - /* external reference: error and label free */ \ - error = get_port((ai), (serv), 0); \ - if (error != 0) \ - goto free; \ -} while (/*CONSTCOND*/0) - -#define ERR(err) \ -do { \ - /* external reference: error, and label bad */ \ - error = (err); \ - goto bad; \ - /*NOTREACHED*/ \ -} while (/*CONSTCOND*/0) - -#define MATCH_FAMILY(x, y, w) \ - ((x) == (y) || (/*CONSTCOND*/(w) && ((x) == PF_UNSPEC || (y) == PF_UNSPEC))) -#define MATCH(x, y, w) \ - ((x) == (y) || (/*CONSTCOND*/(w) && ((x) == ANY || (y) == ANY))) - -#if 0 -/* We will need this should we ever want gai_strerror() */ -char * -gai_strerror(int ecode) -{ - if (ecode < 0 || ecode > EAI_MAX) - ecode = EAI_MAX; - return ai_errlist[ecode]; -} -#endif - -void -rb_freeaddrinfo(struct rb_addrinfo *ai) -{ - struct rb_addrinfo *next; - - do { - next = ai->ai_next; - if (ai->ai_canonname) - rb_free(ai->ai_canonname); - /* no need to free(ai->ai_addr) */ - rb_free(ai); - ai = next; - } while (ai); -} - -static int -str_isnumber(const char *p) -{ - char *ep; - - if (*p == '\0') - return NO; - ep = NULL; - errno = 0; - (void)strtoul(p, &ep, 10); - if (errno == 0 && ep && *ep == '\0') - return YES; - else - return NO; -} - -int -rb_getaddrinfo(const char *hostname, const char *servname, - const struct rb_addrinfo *hints, struct rb_addrinfo **res) -{ - struct rb_addrinfo sentinel; - struct rb_addrinfo *cur; - int error = 0; - struct rb_addrinfo ai; - struct rb_addrinfo ai0; - struct rb_addrinfo *pai; - const struct explore *ex; - - memset(&sentinel, 0, sizeof(sentinel)); - cur = &sentinel; - pai = &ai; - pai->ai_flags = 0; - pai->ai_family = PF_UNSPEC; - pai->ai_socktype = ANY; - pai->ai_protocol = ANY; - pai->ai_addrlen = 0; - pai->ai_canonname = NULL; - pai->ai_addr = NULL; - pai->ai_next = NULL; - - if (hostname == NULL && servname == NULL) - return EAI_NONAME; - if (hints) { - /* error check for hints */ - if (hints->ai_addrlen || hints->ai_canonname || - hints->ai_addr || hints->ai_next) - ERR(EAI_BADHINTS); /* xxx */ - if (hints->ai_flags & ~AI_MASK) - ERR(EAI_BADFLAGS); - switch (hints->ai_family) { - case PF_UNSPEC: - case PF_INET: -#ifdef IPV6 - case PF_INET6: -#endif - break; - default: - ERR(EAI_FAMILY); - } - memcpy(pai, hints, sizeof(*pai)); - - /* - * if both socktype/protocol are specified, check if they - * are meaningful combination. - */ - if (pai->ai_socktype != ANY && pai->ai_protocol != ANY) { - for (ex = explore; ex->e_af >= 0; ex++) { - if (pai->ai_family != ex->e_af) - continue; - if (ex->e_socktype == ANY) - continue; - if (ex->e_protocol == ANY) - continue; - if (pai->ai_socktype == ex->e_socktype && - pai->ai_protocol != ex->e_protocol) { - ERR(EAI_BADHINTS); - } - } - } - } - - /* - * check for special cases. (1) numeric servname is disallowed if - * socktype/protocol are left unspecified. (2) servname is disallowed - * for raw and other inet{,6} sockets. - */ - if (MATCH_FAMILY(pai->ai_family, PF_INET, 1) -#ifdef IPV6 - || MATCH_FAMILY(pai->ai_family, PF_INET6, 1) -#endif - ) { - ai0 = *pai; /* backup *pai */ - - if (pai->ai_family == PF_UNSPEC) { -#ifdef IPV6 - pai->ai_family = PF_INET6; -#else - pai->ai_family = PF_INET; -#endif - } - error = get_portmatch(pai, servname); - if (error) - ERR(error); - - *pai = ai0; - } - - ai0 = *pai; - - /* NULL hostname, or numeric hostname */ - for (ex = explore; ex->e_af >= 0; ex++) { - *pai = ai0; - - /* PF_UNSPEC entries are prepared for DNS queries only */ - if (ex->e_af == PF_UNSPEC) - continue; - - if (!MATCH_FAMILY(pai->ai_family, ex->e_af, WILD_AF(ex))) - continue; - if (!MATCH(pai->ai_socktype, ex->e_socktype, WILD_SOCKTYPE(ex))) - continue; - if (!MATCH(pai->ai_protocol, ex->e_protocol, WILD_PROTOCOL(ex))) - continue; - - if (pai->ai_family == PF_UNSPEC) - pai->ai_family = ex->e_af; - if (pai->ai_socktype == ANY && ex->e_socktype != ANY) - pai->ai_socktype = ex->e_socktype; - if (pai->ai_protocol == ANY && ex->e_protocol != ANY) - pai->ai_protocol = ex->e_protocol; - - if (hostname == NULL) - error = explore_null(pai, servname, &cur->ai_next); - else - error = explore_numeric(pai, hostname, servname, &cur->ai_next); - - if (error) - goto free; - - while (cur && cur->ai_next) - cur = cur->ai_next; - } - - /* - * XXX - * If numreic representation of AF1 can be interpreted as FQDN - * representation of AF2, we need to think again about the code below. - */ - if (sentinel.ai_next) - goto good; - - if (pai->ai_flags & AI_NUMERICHOST) - ERR(EAI_NONAME); - if (hostname == NULL) - ERR(EAI_NODATA); - - /* XXX */ - if (sentinel.ai_next) - error = 0; - - if (error) - goto free; - if (error == 0) { - if (sentinel.ai_next) { - good: - *res = sentinel.ai_next; - return SUCCESS; - } else - error = EAI_FAIL; - } - free: - bad: - if (sentinel.ai_next) - rb_freeaddrinfo(sentinel.ai_next); - *res = NULL; - return error; -} - -/* - * hostname == NULL. - * passive socket -> anyaddr (0.0.0.0 or ::) - * non-passive socket -> localhost (127.0.0.1 or ::1) - */ -static int -explore_null(const struct rb_addrinfo *pai, const char *servname, struct rb_addrinfo **res) -{ - int s; - const struct afd *afd; - struct rb_addrinfo *cur; - struct rb_addrinfo sentinel; - int error; - - *res = NULL; - sentinel.ai_next = NULL; - cur = &sentinel; - - /* - * filter out AFs that are not supported by the kernel - * XXX errno? - */ - s = socket(pai->ai_family, SOCK_DGRAM, 0); - if (s < 0) { -#ifdef _WIN32 - errno = WSAGetLastError(); -#endif - if (errno != EMFILE) - return 0; - } else -#ifdef _WIN32 - closesocket(s); -#else - close(s); -#endif - - /* - * if the servname does not match socktype/protocol, ignore it. - */ - if (get_portmatch(pai, servname) != 0) - return 0; - - afd = find_afd(pai->ai_family); - if (afd == NULL) - return 0; - - if (pai->ai_flags & AI_PASSIVE) { - GET_AI(cur->ai_next, afd, afd->a_addrany); - GET_PORT(cur->ai_next, servname); - } else { - GET_AI(cur->ai_next, afd, afd->a_loopback); - GET_PORT(cur->ai_next, servname); - } - cur = cur->ai_next; - - *res = sentinel.ai_next; - return 0; - -free: - if (sentinel.ai_next) - rb_freeaddrinfo(sentinel.ai_next); - return error; -} - -/* - * numeric hostname - */ -static int -explore_numeric(const struct rb_addrinfo *pai, const char *hostname, - const char *servname, struct rb_addrinfo **res) -{ - const struct afd *afd; - struct rb_addrinfo *cur; - struct rb_addrinfo sentinel; - int error; - char pton[PTON_MAX]; - - *res = NULL; - sentinel.ai_next = NULL; - cur = &sentinel; - - /* - * if the servname does not match socktype/protocol, ignore it. - */ - if (get_portmatch(pai, servname) != 0) - return 0; - - afd = find_afd(pai->ai_family); - if (afd == NULL) - return 0; - - switch (afd->a_af) { -#if 0 /*X/Open spec*/ - case AF_INET: - if (rb_inet_pton - if (inet_aton(hostname, (struct in_addr *)pton) == 1) { - if (pai->ai_family == afd->a_af || - pai->ai_family == PF_UNSPEC /*?*/) { - GET_AI(cur->ai_next, afd, pton); - GET_PORT(cur->ai_next, servname); - while (cur && cur->ai_next) - cur = cur->ai_next; - } else - ERR(EAI_FAMILY); /*xxx*/ - } - break; -#endif - default: - if (rb_inet_pton(afd->a_af, hostname, pton) == 1) { - if (pai->ai_family == afd->a_af || - pai->ai_family == PF_UNSPEC /*?*/) { - GET_AI(cur->ai_next, afd, pton); - GET_PORT(cur->ai_next, servname); - while (cur && cur->ai_next) - cur = cur->ai_next; - } else - ERR(EAI_FAMILY); /* XXX */ - } - break; - } - - *res = sentinel.ai_next; - return 0; - -free: -bad: - if (sentinel.ai_next) - rb_freeaddrinfo(sentinel.ai_next); - return error; -} - -static struct rb_addrinfo * -get_ai(const struct rb_addrinfo *pai, const struct afd *afd, const char *addr) -{ - char *p; - struct rb_addrinfo *ai; - - ai = (struct rb_addrinfo *)rb_malloc(sizeof(struct rb_addrinfo) - + (afd->a_socklen)); - if (ai == NULL) - return NULL; - - memcpy(ai, pai, sizeof(struct rb_addrinfo)); - ai->ai_addr = (struct sockaddr *)(void *)(ai + 1); - memset(ai->ai_addr, 0, (size_t)afd->a_socklen); - ai->ai_addrlen = afd->a_socklen; - ai->ai_addr->sa_family = ai->ai_family = afd->a_af; - p = (char *)(void *)(ai->ai_addr); - memcpy(p + afd->a_off, addr, (size_t)afd->a_addrlen); - return ai; -} - -static int -get_portmatch(const struct rb_addrinfo *ai, const char *servname) -{ - struct rb_addrinfo xai; - memcpy(&xai, ai, sizeof(struct rb_addrinfo)); - return(get_port(&xai, servname, 1)); -} - -static int -get_port(struct rb_addrinfo *ai, const char *servname, int matchonly) -{ - const char *proto; - struct servent *sp; - int port; - int allownumeric; - - if (servname == NULL) - return 0; - switch (ai->ai_family) { - case AF_INET: -#ifdef AF_INET6 - case AF_INET6: -#endif - break; - default: - return 0; - } - - switch (ai->ai_socktype) { - case SOCK_RAW: - return EAI_SERVICE; - case SOCK_DGRAM: - case SOCK_STREAM: - allownumeric = 1; - break; - case ANY: - allownumeric = 0; - break; - default: - return EAI_SOCKTYPE; - } - - if (str_isnumber(servname)) { - if (!allownumeric) - return EAI_SERVICE; - port = atoi(servname); - if (port < 0 || port > 65535) - return EAI_SERVICE; - port = htons(port); - } else { - switch (ai->ai_socktype) { - case SOCK_DGRAM: - proto = "udp"; - break; - case SOCK_STREAM: - proto = "tcp"; - break; - default: - proto = NULL; - break; - } - - if ((sp = getservbyname(servname, proto)) == NULL) - return EAI_SERVICE; - port = sp->s_port; - } - - if (!matchonly) { - switch (ai->ai_family) { - case AF_INET: - ((struct sockaddr_in *)(void *) - ai->ai_addr)->sin_port = port; - break; -#ifdef IPV6 - case AF_INET6: - ((struct sockaddr_in6 *)(void *) - ai->ai_addr)->sin6_port = port; - break; -#endif - } - } - - return 0; -} - -static const struct afd * -find_afd(int af) -{ - const struct afd *afd; - - if (af == PF_UNSPEC) - return(NULL); - - for (afd = afdl; afd->a_af; afd++) - { - if (afd->a_af == af) - return(afd); - } - - return(NULL); -} diff --git a/resolver/getnameinfo.c b/resolver/getnameinfo.c deleted file mode 100644 index 971a2484..00000000 --- a/resolver/getnameinfo.c +++ /dev/null @@ -1,240 +0,0 @@ -/* - * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the project nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -/* - * Issues to be discussed: - * - Thread safe-ness must be checked - * - RFC2553 says that we should raise error on short buffer. X/Open says - * we need to truncate the result. We obey RFC2553 (and X/Open should be - * modified). ipngwg rough consensus seems to follow RFC2553. - * - What is "local" in NI_FQDN? - * - NI_NAMEREQD and NI_NUMERICHOST conflict with each other. - * - (KAME extension) always attach textual scopeid (fe80::1%lo0), if - * sin6_scope_id is filled - standardization status? - * XXX breaks backward compat for code that expects no scopeid. - * beware on merge. - */ - -#include -#include "getaddrinfo.h" -#include "getnameinfo.h" - -/* */ - -static const struct afd { - int a_af; - int a_addrlen; - rb_socklen_t a_socklen; - int a_off; -} afdl [] = { -#ifdef IPV6 - {PF_INET6, sizeof(struct in6_addr), sizeof(struct sockaddr_in6), - offsetof(struct sockaddr_in6, sin6_addr)}, -#endif - {PF_INET, sizeof(struct in_addr), sizeof(struct sockaddr_in), - offsetof(struct sockaddr_in, sin_addr)}, - {0, 0, 0, 0}, -}; - -struct sockinet -{ - unsigned char si_len; - unsigned char si_family; - unsigned short si_port; -}; - -#ifdef IPV6 -static int ip6_parsenumeric(const struct sockaddr *, const char *, char *, - size_t, int); -#endif - -int -rb_getnameinfo(const struct sockaddr *sa, rb_socklen_t salen, char *host, - size_t hostlen, char *serv, size_t servlen, int flags) -{ - const struct afd *afd; - struct servent *sp; - unsigned short port; - int family, i; - const char *addr; - uint32_t v4a; - char numserv[512]; - char numaddr[512]; - - if (sa == NULL) - return EAI_FAIL; - -/* if (sa->sa_len != salen) - return EAI_FAIL; -*/ - family = sa->sa_family; - for (i = 0; afdl[i].a_af; i++) - if (afdl[i].a_af == family) { - afd = &afdl[i]; - goto found; - } - return EAI_FAMILY; - - found: - if (salen != afd->a_socklen) - return EAI_FAIL; - - /* network byte order */ - port = ((const struct sockinet *)sa)->si_port; - addr = (const char *)sa + afd->a_off; - - if (serv == NULL || servlen == 0) { - /* - * do nothing in this case. - * in case you are wondering if "&&" is more correct than - * "||" here: rfc2553bis-03 says that serv == NULL OR - * servlen == 0 means that the caller does not want the result. - */ - } else { - if (flags & NI_NUMERICSERV) - sp = NULL; - else { - sp = getservbyport(port, - (flags & NI_DGRAM) ? "udp" : "tcp"); - } - if (sp) { - if (strlen(sp->s_name) + 1 > servlen) - return EAI_MEMORY; - rb_strlcpy(serv, sp->s_name, servlen); - } else { - snprintf(numserv, sizeof(numserv), "%u", ntohs(port)); - if (strlen(numserv) + 1 > servlen) - return EAI_MEMORY; - rb_strlcpy(serv, numserv, servlen); - } - } - - switch (sa->sa_family) { - case AF_INET: - v4a = (uint32_t) - ntohl(((const struct sockaddr_in *)sa)->sin_addr.s_addr); - if (IN_MULTICAST(v4a) || IN_EXPERIMENTAL(v4a)) - flags |= NI_NUMERICHOST; - v4a >>= IN_CLASSA_NSHIFT; - if (v4a == 0) - flags |= NI_NUMERICHOST; - break; -#ifdef IPV6 - case AF_INET6: - { - const struct sockaddr_in6 *sin6; - sin6 = (const struct sockaddr_in6 *)sa; - switch (sin6->sin6_addr.s6_addr[0]) { - case 0x00: - if (IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr)) - ; - else if (IN6_IS_ADDR_LOOPBACK(&sin6->sin6_addr)) - ; - else - flags |= NI_NUMERICHOST; - break; - default: - if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr)) { - flags |= NI_NUMERICHOST; - } - else if (IN6_IS_ADDR_MULTICAST(&sin6->sin6_addr)) - flags |= NI_NUMERICHOST; - break; - } - } - break; -#endif - } - if (host == NULL || hostlen == 0) { - /* - * do nothing in this case. - * in case you are wondering if "&&" is more correct than - * "||" here: rfc2553bis-03 says that host == NULL or - * hostlen == 0 means that the caller does not want the result. - */ - } else if (flags & NI_NUMERICHOST) { - size_t numaddrlen; - - /* NUMERICHOST and NAMEREQD conflicts with each other */ - if (flags & NI_NAMEREQD) - return EAI_NONAME; - - switch(afd->a_af) { -#ifdef IPV6 - case AF_INET6: - { - int error; - - if ((error = ip6_parsenumeric(sa, addr, host, - hostlen, flags)) != 0) - return(error); - break; - } -#endif - default: - if (rb_inet_ntop(afd->a_af, addr, numaddr, sizeof(numaddr)) - == NULL) - return EAI_SYSTEM; - numaddrlen = strlen(numaddr); - if (numaddrlen + 1 > hostlen) /* don't forget terminator */ - return EAI_MEMORY; - rb_strlcpy(host, numaddr, hostlen); - break; - } - } - return(0); -} - -#ifdef IPV6 -static int -ip6_parsenumeric(const struct sockaddr *sa, const char *addr, - char *host, size_t hostlen, int flags) -{ - size_t numaddrlen; - char numaddr[512]; - - if (rb_inet_ntop(AF_INET6, addr, numaddr, sizeof(numaddr)) == NULL) - return(EAI_SYSTEM); - - numaddrlen = strlen(numaddr); - - if (numaddrlen + 1 > hostlen) /* don't forget terminator */ - return(EAI_MEMORY); - - if (*numaddr == ':') - { - *host = '0'; - rb_strlcpy(host+1, numaddr, hostlen-1); - } - else - rb_strlcpy(host, numaddr, hostlen); - - return(0); -} -#endif diff --git a/resolver/reslib.c b/resolver/reslib.c index f53b6634..76cefc4f 100644 --- a/resolver/reslib.c +++ b/resolver/reslib.c @@ -85,17 +85,7 @@ #include "setup.h" -#ifndef _WIN32 #include -#else -#include "getaddrinfo.h" -#include "getnameinfo.h" -#define getaddrinfo rb_getaddrinfo -#define getnameinfo rb_getnameinfo -#define freeaddrinfo rb_freeaddrinfo - -extern const char * get_windows_nameservers(void); -#endif #include "res.h" #include "reslib.h" @@ -130,11 +120,7 @@ static const char digitvalue[256] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /*256*/ }; -#ifndef _WIN32 static int parse_resvconf(void); -#else -static void parse_windows_resolvers(void); -#endif static void add_nameserver(const char *); static const char digits[] = "0123456789"; @@ -161,31 +147,12 @@ int irc_res_init(void) { irc_nscount = 0; -#ifndef _WIN32 parse_resvconf(); -#else - parse_windows_resolvers(); -#endif if (irc_nscount == 0) add_nameserver("127.0.0.1"); return 0; } -#ifdef _WIN32 -static void -parse_windows_resolvers(void) -{ - const char *ns = get_windows_nameservers(); - char *server; - char *p; - char *buf = rb_strdup(ns); - for(server = rb_strtok_r(buf, " ", &p); server != NULL;server = rb_strtok_r(NULL, " ", &p)) - { - add_nameserver(server); - } - rb_free(buf); -} -#else /* parse_resvconf() * * inputs - NONE @@ -251,7 +218,6 @@ parse_resvconf(void) fclose(file); return 0; } -#endif /* add_nameserver() * diff --git a/resolver/reslist.c b/resolver/reslist.c deleted file mode 100644 index f9ec268c..00000000 --- a/resolver/reslist.c +++ /dev/null @@ -1,276 +0,0 @@ -/* - * reslist.c - get nameservers from windows * - * - * ircd-ratbox related changes are as follows - * - * Copyright (C) 2008 Aaron Sethman - * Copyright (C) 2008-2026 ircd-ratbox development team - * - * pretty much all of this was yanked from c-ares ares_init.c here is the original - * header from there -- - * - * Id: ares_init.c,v 1.72 2008-05-15 00:00:19 yangtse Exp $ - * Copyright 1998 by the Massachusetts Institute of Technology. - * Copyright (C) 2007-2008 by Daniel Stenberg - * - * Permission to use, copy, modify, and distribute this - * software and its documentation for any purpose and without - * fee is hereby granted, provided that the above copyright - * notice appear in all copies and that both that copyright - * notice and this permission notice appear in supporting - * documentation, and that the name of M.I.T. not be used in - * advertising or publicity pertaining to distribution of the - * software without specific, written prior permission. - * M.I.T. makes no representations about the suitability of - * this software for any purpose. It is provided "as is" - * without express or implied warranty. - * - * - */ - -#ifdef _WIN32 -#include - -#include -#include - -const char *get_windows_nameservers(void); - - -#define IS_NT() ((int)GetVersion() > 0) -#define WIN_NS_9X "System\\CurrentControlSet\\Services\\VxD\\MSTCP" -#define WIN_NS_NT_KEY "System\\CurrentControlSet\\Services\\Tcpip\\Parameters" -#define NAMESERVER "NameServer" -#define DHCPNAMESERVER "DhcpNameServer" -#define DATABASEPATH "DatabasePath" -#define WIN_PATH_HOSTS "\\hosts" - -static int -get_iphlpapi_dns_info(char *ret_buf, size_t ret_size) -{ - FIXED_INFO *fi = alloca(sizeof(*fi)); - DWORD size = sizeof(*fi); - typedef DWORD(WINAPI * get_net_param_func) (FIXED_INFO *, DWORD *); - get_net_param_func xxGetNetworkParams; /* available only on Win-98/2000+ */ - HMODULE handle; - IP_ADDR_STRING *ipAddr; - int i, count = 0; - int debug = 0; - size_t ip_size = sizeof("255.255.255.255,") - 1; - size_t left = ret_size; - char *ret = ret_buf; - HRESULT res; - - if(!fi) - return (0); - - handle = LoadLibrary("iphlpapi.dll"); - if(!handle) - return (0); - - xxGetNetworkParams = (get_net_param_func) GetProcAddress(handle, "GetNetworkParams"); - if(!xxGetNetworkParams) - goto quit; - - res = (*xxGetNetworkParams) (fi, &size); - if((res != ERROR_BUFFER_OVERFLOW) && (res != ERROR_SUCCESS)) - goto quit; - - fi = alloca(size); - if(!fi || (*xxGetNetworkParams) (fi, &size) != ERROR_SUCCESS) - goto quit; - - if(debug) - { - printf("Host Name: %s\n", fi->HostName); - printf("Domain Name: %s\n", fi->DomainName); - printf("DNS Servers:\n" " %s (primary)\n", fi->DnsServerList.IpAddress.String); - } - if(strlen(fi->DnsServerList.IpAddress.String) > 0 && - inet_addr(fi->DnsServerList.IpAddress.String) != INADDR_NONE && left > ip_size) - { - ret += sprintf(ret, "%s,", fi->DnsServerList.IpAddress.String); - left -= ret - ret_buf; - count++; - } - - for(i = 0, ipAddr = fi->DnsServerList.Next; ipAddr && left > ip_size; - ipAddr = ipAddr->Next, i++) - { - if(inet_addr(ipAddr->IpAddress.String) != INADDR_NONE) - { - ret += sprintf(ret, "%s,", ipAddr->IpAddress.String); - left -= ret - ret_buf; - count++; - } - if(debug) - printf(" %s (secondary %d)\n", ipAddr->IpAddress.String, i + 1); - } - - quit: - if(handle) - FreeLibrary(handle); - - if(debug && left <= ip_size) - printf("Too many nameservers. Truncating to %d addressess", count); - if(ret > ret_buf) - ret[-1] = '\0'; - return (count); -} - -/* - * Warning: returns a dynamically allocated buffer, the user MUST - * use free() / rb_free() if the function returns 1 - */ -static int -get_res_nt(HKEY hKey, const char *subkey, char **obuf) -{ - /* Test for the size we need */ - DWORD size = 0; - int result; - - result = RegQueryValueEx(hKey, subkey, 0, NULL, NULL, &size); - if((result != ERROR_SUCCESS && result != ERROR_MORE_DATA) || !size) - return 0; - *obuf = rb_malloc(size + 1); - if(!*obuf) - return 0; - - if(RegQueryValueEx(hKey, subkey, 0, NULL, (LPBYTE) * obuf, &size) != ERROR_SUCCESS) - { - rb_free(*obuf); - return 0; - } - if(size == 1) - { - rb_free(*obuf); - return 0; - } - return 1; -} - -static int -get_res_interfaces_nt(HKEY hKey, const char *subkey, char **obuf) -{ - char enumbuf[39]; /* GUIDs are 38 chars + 1 for NULL */ - DWORD enum_size = 39; - int idx = 0; - HKEY hVal; - - while(RegEnumKeyEx(hKey, idx++, enumbuf, &enum_size, 0, - NULL, NULL, NULL) != ERROR_NO_MORE_ITEMS) - { - int rc; - - enum_size = 39; - if(RegOpenKeyEx(hKey, enumbuf, 0, KEY_QUERY_VALUE, &hVal) != ERROR_SUCCESS) - continue; - rc = get_res_nt(hVal, subkey, obuf); - RegCloseKey(hVal); - if(rc) - return 1; - } - return 0; -} - -const char * -get_windows_nameservers(void) -{ - /* - NameServer info via IPHLPAPI (IP helper API): - GetNetworkParams() should be the trusted source for this. - Available in Win-98/2000 and later. If that fail, fall-back to - registry information. - - NameServer Registry: - - On Windows 9X, the DNS server can be found in: - HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\VxD\MSTCP\NameServer - - On Windows NT/2000/XP/2003: - HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\NameServer - or - HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\DhcpNameServer - or - HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\{AdapterID}\ - NameServer - or - HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\{AdapterID}\ - DhcpNameServer - */ - static char namelist[512]; - HKEY mykey; - HKEY subkey; - DWORD data_type; - DWORD bytes; - DWORD result; - char *line = NULL; - memset(&namelist, 0, sizeof(namelist)); - if(get_iphlpapi_dns_info(namelist, sizeof(namelist)) > 0) - { - return namelist; - } - - if(IS_NT()) - { - if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY, 0, - KEY_READ, &mykey) == ERROR_SUCCESS) - { - RegOpenKeyEx(mykey, "Interfaces", 0, - KEY_QUERY_VALUE | KEY_ENUMERATE_SUB_KEYS, &subkey); - if(get_res_nt(mykey, NAMESERVER, &line)) - { - rb_strlcpy(namelist, line, sizeof(namelist)); - return namelist; - } - else if(get_res_nt(mykey, DHCPNAMESERVER, &line)) - { - rb_strlcpy(namelist, line, sizeof(namelist)); - rb_free(line); - } - /* Try the interfaces */ - else if(get_res_interfaces_nt(subkey, NAMESERVER, &line)) - { - rb_strlcpy(namelist, line, sizeof(namelist)); - rb_free(line); - } - else if(get_res_interfaces_nt(subkey, DHCPNAMESERVER, &line)) - { - rb_strlcpy(namelist, line, sizeof(namelist)); - rb_free(line); - } - RegCloseKey(subkey); - RegCloseKey(mykey); - } - } - else - { - if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, WIN_NS_9X, 0, - KEY_READ, &mykey) == ERROR_SUCCESS) - { - if((result = RegQueryValueEx(mykey, NAMESERVER, NULL, &data_type, - NULL, &bytes)) == ERROR_SUCCESS || - result == ERROR_MORE_DATA) - { - if(bytes) - { - line = (char *)rb_malloc(bytes + 1); - if(RegQueryValueEx(mykey, NAMESERVER, NULL, &data_type, - (unsigned char *)line, &bytes) == - ERROR_SUCCESS) - { - rb_strlcpy(namelist, line, sizeof(namelist)); - } - free(line); - } - } - } - RegCloseKey(mykey); - } - if(strlen(namelist) > 0) - return namelist; - return NULL; -} - - -#endif diff --git a/src/Makefile.in b/src/Makefile.in index aeccce5e..fef8cb43 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -354,6 +354,7 @@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ ac_cv_have_struct_mallinfo = @ac_cv_have_struct_mallinfo@ +ac_cv_have_struct_mallinfo2 = @ac_cv_have_struct_mallinfo2@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff --git a/ssld/Makefile.in b/ssld/Makefile.in index 5c7eb3b1..21cb2e44 100644 --- a/ssld/Makefile.in +++ b/ssld/Makefile.in @@ -294,6 +294,7 @@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ ac_cv_have_struct_mallinfo = @ac_cv_have_struct_mallinfo@ +ac_cv_have_struct_mallinfo2 = @ac_cv_have_struct_mallinfo2@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff --git a/ssld/ssld.c b/ssld/ssld.c index 5725b562..bb2ac479 100644 --- a/ssld/ssld.c +++ b/ssld/ssld.c @@ -1258,7 +1258,6 @@ main(int argc, char **argv) pipefd = atoi(s_pipe); ppid = atoi(s_pid); -#ifndef _WIN32 int x; for(x = 0; x < maxfd; x++) @@ -1279,7 +1278,6 @@ main(int argc, char **argv) if(x > 2) close(x); } -#endif #endif setup_signals(); rb_lib_init(NULL, NULL, NULL, 0, maxfd); @@ -1310,18 +1308,15 @@ main(int argc, char **argv) } -#ifndef _WIN32 static void dummy_handler(int sig) { return; } -#endif static void setup_signals(void) { -#ifndef _WIN32 struct sigaction act; act.sa_flags = 0; @@ -1349,5 +1344,4 @@ setup_signals(void) act.sa_handler = dummy_handler; sigaction(SIGALRM, &act, NULL); -#endif } diff --git a/tools/Makefile.in b/tools/Makefile.in index 7c4950d8..37e6d582 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -14,7 +14,6 @@ @SET_MAKE@ - VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -295,6 +294,7 @@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ ac_cv_have_struct_mallinfo = @ac_cv_have_struct_mallinfo@ +ac_cv_have_struct_mallinfo2 = @ac_cv_have_struct_mallinfo2@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ From 9139635d491f5abda6c31f0b6e6d7e0b22b2cb1f Mon Sep 17 00:00:00 2001 From: Aaron Sethman Date: Tue, 27 Jan 2026 17:27:05 -0500 Subject: [PATCH 06/32] fix rb_zstring_serialize to allocate the correct amount of memory, make rb_zstring_deserialize return -1 if zs-data is set to null --- libratbox/src/rb_tools.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libratbox/src/rb_tools.c b/libratbox/src/rb_tools.c index bf4bc809..f6f661ed 100644 --- a/libratbox/src/rb_tools.c +++ b/libratbox/src/rb_tools.c @@ -142,7 +142,7 @@ size_t rb_zstring_serialized(rb_zstring_t *zs, void **buf, size_t *buflen) uint8_t *p; size_t alloclen = sizeof(uint16_t) + zs->len; - p = rb_malloc(sizeof(alloclen)); + p = rb_malloc(alloclen); memcpy(p, &zs->len, sizeof(uint16_t)); p += sizeof(uint16_t); memcpy(p, zs->data, zs->len); @@ -159,7 +159,7 @@ size_t rb_zstring_deserialize(rb_zstring_t *zs, void *buf) if(zs->len == 0) { zs->data = NULL; - return sizeof(uint16_t); + return -1; } zs->data = rb_malloc(zs->len); memcpy(zs->data, p, zs->len); From b8191eb6b884d8eb772193a5ed8ca473836bbd3e Mon Sep 17 00:00:00 2001 From: Aaron Sethman Date: Tue, 27 Jan 2026 17:28:28 -0500 Subject: [PATCH 07/32] check the return value of rb_zstring_deserialize --- ssld/ssld.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ssld/ssld.c b/ssld/ssld.c index bb2ac479..488e38b7 100644 --- a/ssld/ssld.c +++ b/ssld/ssld.c @@ -908,7 +908,6 @@ zlib_process(mod_ctl_t * ctl, mod_ctl_buf_t * ctlb) } #endif - static char *advance_zstring(uint8_t **p) { rb_zstring_t *zs; @@ -918,6 +917,12 @@ static char *advance_zstring(uint8_t **p) zs = rb_zstring_alloc(); l = rb_zstring_deserialize(zs, *p); + if(l == -1) + { + rb_zstring_free(zs); + return NULL; + } + *p += l; if(rb_zstring_len(zs) == 0) { From baa6078aa15398ae6b16d6eef9bf01f5e5855f93 Mon Sep 17 00:00:00 2001 From: Aaron Sethman Date: Tue, 27 Jan 2026 18:49:42 -0500 Subject: [PATCH 08/32] zstring cleanups --- libratbox/include/rb_tools.h | 8 ++++---- libratbox/src/rb_tools.c | 30 +++++++++++++++++++++--------- ssld/ssld.c | 9 +++++++-- 3 files changed, 32 insertions(+), 15 deletions(-) diff --git a/libratbox/include/rb_tools.h b/libratbox/include/rb_tools.h index 65998a75..90810c89 100644 --- a/libratbox/include/rb_tools.h +++ b/libratbox/include/rb_tools.h @@ -466,18 +466,18 @@ typedef struct _rb_zstring uint8_t *data; } rb_zstring_t; -size_t rb_zstring_serialized(rb_zstring_t *zs, void **buf, size_t *buflen); -size_t rb_zstring_deserialize(rb_zstring_t *zs, void *buf); +ssize_t rb_zstring_serialized(rb_zstring_t *zs, void **buf, size_t *buflen); +ssize_t rb_zstring_deserialize(rb_zstring_t *zs, void *buf); void rb_zstring_free(rb_zstring_t *zs); rb_zstring_t *rb_zstring_alloc(void); rb_zstring_t *rb_zstring_from_c_len(const char *buf, size_t len); rb_zstring_t *rb_zstring_from_c(const char *buf); -size_t rb_zstring_len(rb_zstring_t *zs); +ssize_t rb_zstring_len(rb_zstring_t *zs); void rb_zstring_append_from_zstring(rb_zstring_t *dst_zs, rb_zstring_t *src_zs); void rb_zstring_append_from_c(rb_zstring_t *zs, const char *buf, size_t len); char *rb_zstring_to_c(rb_zstring_t *zs, char *buf, size_t len); char *rb_zstring_to_c_alloc(rb_zstring_t *zs); -size_t rb_zstring_to_ptr(rb_zstring_t *zs, void **ptr); +ssize_t rb_zstring_to_ptr(rb_zstring_t *zs, void **ptr); diff --git a/libratbox/src/rb_tools.c b/libratbox/src/rb_tools.c index f6f661ed..a6cc4399 100644 --- a/libratbox/src/rb_tools.c +++ b/libratbox/src/rb_tools.c @@ -137,10 +137,12 @@ rb_dirname(const char *path) } -size_t rb_zstring_serialized(rb_zstring_t *zs, void **buf, size_t *buflen) +ssize_t rb_zstring_serialized(rb_zstring_t *zs, void **buf, size_t *buflen) { uint8_t *p; - size_t alloclen = sizeof(uint16_t) + zs->len; + ssize_t alloclen; + + alloclen = sizeof(uint16_t) + zs->len; p = rb_malloc(alloclen); memcpy(p, &zs->len, sizeof(uint16_t)); @@ -150,10 +152,13 @@ size_t rb_zstring_serialized(rb_zstring_t *zs, void **buf, size_t *buflen) return alloclen; } -size_t rb_zstring_deserialize(rb_zstring_t *zs, void *buf) +ssize_t rb_zstring_deserialize(rb_zstring_t *zs, void *buf) { uint8_t *p = (uint8_t *)buf; + if(zs == NULL || p == NULL) + return -1; + memcpy(&zs->len, p, sizeof(uint16_t)); p += sizeof(uint16_t); if(zs->len == 0) @@ -183,12 +188,15 @@ rb_zstring_t *rb_zstring_from_c_len(const char *buf, size_t len) { rb_zstring_t *zs; - if(len > UINT16_MAX-1) + if(len > UINT16_MAX) return NULL; - + zs = rb_zstring_alloc(); - zs->alloclen = zs->len = (uint16_t)len; - zs->alloclen = (uint16_t)len; + + if(zs == NULL) + return NULL; + + zs->alloclen = zs->len + (uint16_t)len; if(zs->alloclen < 128) zs->alloclen = 128; zs->data = rb_malloc(zs->alloclen); @@ -201,8 +209,10 @@ rb_zstring_t *rb_zstring_from_c(const char *buf) return rb_zstring_from_c_len(buf, strlen(buf)); } -size_t rb_zstring_len(rb_zstring_t *zs) +ssize_t rb_zstring_len(rb_zstring_t *zs) { + if(zs == NULL) + return -1; return zs->len; } @@ -258,8 +268,10 @@ char *rb_zstring_to_c_alloc(rb_zstring_t *zs) return p; } -size_t rb_zstring_to_ptr(rb_zstring_t *zs, void **ptr) +ssize_t rb_zstring_to_ptr(rb_zstring_t *zs, void **ptr) { + if(zs == NULL || ptr == NULL) + return -1; *ptr = (void *)zs->data; return zs->len; } diff --git a/ssld/ssld.c b/ssld/ssld.c index 488e38b7..68a449a1 100644 --- a/ssld/ssld.c +++ b/ssld/ssld.c @@ -911,17 +911,22 @@ zlib_process(mod_ctl_t * ctl, mod_ctl_buf_t * ctlb) static char *advance_zstring(uint8_t **p) { rb_zstring_t *zs; - size_t l; + ssize_t l; char *r; zs = rb_zstring_alloc(); + + if(zs == NULL) + return NULL; + l = rb_zstring_deserialize(zs, *p); - if(l == -1) + if(l == -1 || l > (INT16_MAX - 1)) { rb_zstring_free(zs); return NULL; } + *p += l; if(rb_zstring_len(zs) == 0) From cb24affbf32df4fbac2ce4a7f4a8df1ffe01ee86 Mon Sep 17 00:00:00 2001 From: Aaron Sethman Date: Tue, 27 Jan 2026 19:06:55 -0500 Subject: [PATCH 09/32] make ssld_alloc signature match the prototype --- ssld/ssld.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ssld/ssld.c b/ssld/ssld.c index 68a449a1..fceaf07a 100644 --- a/ssld/ssld.c +++ b/ssld/ssld.c @@ -163,7 +163,7 @@ uint32_to_buf(void *buf, uint32_t x) #ifdef HAVE_ZLIB static void * -ssld_alloc(void *unused, size_t count, size_t size) +ssld_alloc(void *unused, unsigned int count, unsigned int size) { return rb_malloc(count * size); } From b9888153320f9de9b7ad121ae8d85d139363cca6 Mon Sep 17 00:00:00 2001 From: Aaron Sethman Date: Tue, 27 Jan 2026 19:15:13 -0500 Subject: [PATCH 10/32] make the 1U unsigned in the hf->hashbits stuff --- src/hash.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/hash.c b/src/hash.c index 83faac8f..ca057908 100644 --- a/src/hash.c +++ b/src/hash.c @@ -228,7 +228,7 @@ hash_create(const char *name, hash_cmptype cmptype, unsigned int hashbits, unsig hfunc->name = rb_strdup(name); hfunc->hashbits = hashbits; - hfunc->htable = rb_malloc(sizeof(rb_dlink_list *) * (1 << hashbits)); + hfunc->htable = rb_malloc(sizeof(rb_dlink_list *) * (1U << hashbits)); hfunc->cmptype = cmptype; hfunc->hashlen = maxkeylen; switch(cmptype) @@ -513,7 +513,7 @@ hash_del_hnode(hash_f *hf, hash_node * hnode) void hash_destroyall(hash_f *hf, hash_destroy_cb * destroy_cb) { - for(int i = 0; i < (1 << hf->hashbits); i++) + for(unsigned int i = 0; i < (1U << hf->hashbits); i++) { rb_dlink_list *ltable; rb_dlink_node *ptr, *nptr; @@ -539,7 +539,7 @@ hash_destroyall(hash_f *hf, hash_destroy_cb * destroy_cb) void hash_walkall(hash_f *hf, hash_walk_cb * walk_cb, void *walk_data) { - for(unsigned int i = 0; i < ( 1 << hf->hashbits); i++) + for(unsigned int i = 0; i < ( 1U << hf->hashbits); i++) { rb_dlink_list *ltable; rb_dlink_node *ptr, *next_ptr; @@ -565,7 +565,7 @@ hash_get_tablelist(hash_f *hf) alltables = rb_malloc(sizeof(rb_dlink_list)); - for(int i = 0; i < (1 << hf->hashbits); i++) + for(unsigned int i = 0; i < (1U << hf->hashbits); i++) { rb_dlink_list *table = hf->htable[i]; @@ -660,7 +660,7 @@ hash_stats(struct Client *source_p) RB_DLINK_FOREACH(ptr, list_of_hashes.head) { hash_f *hf = ptr->data; - count_hash(source_p, hf->htable, 1 << hf->hashbits, hf->name); + count_hash(source_p, hf->htable, 1U << hf->hashbits, hf->name); sendto_one_numeric(source_p, RPL_STATSDEBUG, "B :--"); } } @@ -673,7 +673,7 @@ hash_get_memusage(hash_f *hf, size_t * entries, size_t * memusage) hash_node *hnode; size_t mem = 0, cnt = 0; unsigned int max, i; - max = 1 << hf->hashbits; + max = 1U << hf->hashbits; htable = hf->htable; for(i = 0; i < max; i++) From df019b2ffa841b63a4d3b4367108a004669a3d2b Mon Sep 17 00:00:00 2001 From: Aaron Sethman Date: Tue, 27 Jan 2026 19:35:49 -0500 Subject: [PATCH 11/32] reorder struct DNSReply --- resolver/res.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resolver/res.c b/resolver/res.c index 97775cb2..4acfadfc 100644 --- a/resolver/res.c +++ b/resolver/res.c @@ -35,7 +35,7 @@ * 2006 --jilles and nenolod * */ -#include +#include "ratbox_lib.h" #include "setup.h" #include "res.h" #include "reslib.h" From 21ac4d44780ad1df121300e367261fed751e8d20 Mon Sep 17 00:00:00 2001 From: Aaron Sethman Date: Tue, 27 Jan 2026 20:12:30 -0500 Subject: [PATCH 12/32] verify that cacert isn't null --- ssld/ssld.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ssld/ssld.c b/ssld/ssld.c index fceaf07a..41cd49c4 100644 --- a/ssld/ssld.c +++ b/ssld/ssld.c @@ -955,8 +955,12 @@ ssl_new_keys(mod_ctl_t * ctl, mod_ctl_buf_t * ctl_buf) p++; if(argcnt != 7) goto invalid; + cacert = advance_zstring(&p); + if(cacert == NULL) + goto invalid; + cert = advance_zstring(&p); if(cert == NULL) goto invalid; From 67f6fc110f098e2a47ccdeb9196c744d4bb75e2b Mon Sep 17 00:00:00 2001 From: Aaron Sethman Date: Tue, 27 Jan 2026 20:22:38 -0500 Subject: [PATCH 13/32] reorder struct DNSReply slightly...it makes gcc shutup...this bothers me though --- resolver/res.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resolver/res.h b/resolver/res.h index 74431d61..016adf2e 100644 --- a/resolver/res.h +++ b/resolver/res.h @@ -13,8 +13,8 @@ struct DNSReply { - char *h_name; struct rb_sockaddr_storage addr; + char *h_name; }; From 4b444726c17d5fc1ee8978bff7f9c6de5d06ed51 Mon Sep 17 00:00:00 2001 From: Aaron Sethman Date: Tue, 27 Jan 2026 20:27:06 -0500 Subject: [PATCH 14/32] don't fall through when we get bandb_handle_clear --- src/bandbi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bandbi.c b/src/bandbi.c index f8f6fb71..8ac20940 100644 --- a/src/bandbi.c +++ b/src/bandbi.c @@ -420,6 +420,7 @@ bandb_parse(rb_helper * helper) case 'C': bandb_handle_clear(); + break; case 'F': bandb_handle_finish(); break; From 6f2d53369dc1071ebcc5641dda94dae5b4df3886 Mon Sep 17 00:00:00 2001 From: Aaron Sethman Date: Tue, 27 Jan 2026 20:38:45 -0500 Subject: [PATCH 15/32] Remove more MINGW stuff --- Makefile.am | 6 +- Makefile.in | 7 +- configure | 59 +------------- configure.ac | 18 ----- contrib/Makefile.am | 6 +- contrib/Makefile.in | 5 +- libratbox/configure | 92 ---------------------- libratbox/configure.ac | 30 -------- modules/Makefile.am | 14 ---- modules/Makefile.in | 170 ++++++++++++++++------------------------- src/Makefile.am | 9 --- src/Makefile.in | 7 +- 12 files changed, 84 insertions(+), 339 deletions(-) diff --git a/Makefile.am b/Makefile.am index a2df9a79..44f942f5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,15 +16,11 @@ AM_CFLAGS = $(WARNFLAGS) ircd_ratbox_SOURCES = main.c bin_PROGRAMS = ircd-ratbox -if MINGW -EXTRA_FLAGS = -no-undefined -Wl,--enable-runtime-pseudo-reloc -export-symbols-regex '*' -endif - if !STATIC_MODULES SUBDIRS = @LTDL_SUBDIR@ libratbox src modules tools doc help bandb ssld resolver -ircd_ratbox_LDADD = libratbox/src/libratbox.la src/libcore.la $(LIBLTDL) @LIBJEMALLOC@ @LIBTCMALLOC@ +ircd_ratbox_LDADD = src/libcore.la libratbox/src/libratbox.la $(LIBLTDL) @LIBJEMALLOC@ @LIBTCMALLOC@ ircd_ratbox_LDFLAGS = $(EXTRA_FLAGS) -dlopen self else diff --git a/Makefile.in b/Makefile.in index 09c31e3a..759b1fea 100644 --- a/Makefile.in +++ b/Makefile.in @@ -118,9 +118,9 @@ PROGRAMS = $(bin_PROGRAMS) am_ircd_ratbox_OBJECTS = main.$(OBJEXT) ircd_ratbox_OBJECTS = $(am_ircd_ratbox_OBJECTS) am__DEPENDENCIES_1 = -@STATIC_MODULES_FALSE@ircd_ratbox_DEPENDENCIES = \ +@STATIC_MODULES_FALSE@ircd_ratbox_DEPENDENCIES = src/libcore.la \ @STATIC_MODULES_FALSE@ libratbox/src/libratbox.la \ -@STATIC_MODULES_FALSE@ src/libcore.la $(am__DEPENDENCIES_1) +@STATIC_MODULES_FALSE@ $(am__DEPENDENCIES_1) @STATIC_MODULES_TRUE@ircd_ratbox_DEPENDENCIES = \ @STATIC_MODULES_TRUE@ libratbox/src/libratbox.la \ @STATIC_MODULES_TRUE@ modules/libmodules.la src/libcore.la \ @@ -449,10 +449,9 @@ coredir = @moduledir@ servicesdir = @moduledir@/autoload AM_CFLAGS = $(WARNFLAGS) ircd_ratbox_SOURCES = main.c -@MINGW_TRUE@EXTRA_FLAGS = -no-undefined -Wl,--enable-runtime-pseudo-reloc -export-symbols-regex '*' @STATIC_MODULES_FALSE@SUBDIRS = @LTDL_SUBDIR@ libratbox src modules tools doc help bandb ssld resolver @STATIC_MODULES_TRUE@SUBDIRS = @LTDL_SUBDIR@ libratbox modules src tools doc help bandb ssld resolver -@STATIC_MODULES_FALSE@ircd_ratbox_LDADD = libratbox/src/libratbox.la src/libcore.la $(LIBLTDL) @LIBJEMALLOC@ @LIBTCMALLOC@ +@STATIC_MODULES_FALSE@ircd_ratbox_LDADD = src/libcore.la libratbox/src/libratbox.la $(LIBLTDL) @LIBJEMALLOC@ @LIBTCMALLOC@ @STATIC_MODULES_TRUE@ircd_ratbox_LDADD = libratbox/src/libratbox.la modules/libmodules.la src/libcore.la modules/static_modules.o $(LIBLTDL) $(DLOPEN) @LIBJEMALLOC@ @LIBTCMALLOC@ @STATIC_MODULES_FALSE@ircd_ratbox_LDFLAGS = $(EXTRA_FLAGS) -dlopen self all: all-recursive diff --git a/configure b/configure index e96cdc1b..1f112075 100755 --- a/configure +++ b/configure @@ -2,6 +2,9 @@ # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69 for ircd-ratbox devel. # +# +# +# # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # @@ -682,8 +685,6 @@ WITH_JEMALLOC_FALSE WITH_JEMALLOC_TRUE LIBJEMALLOC ALLOCA -MINGW_FALSE -MINGW_TRUE LTDL_SUBDIR LTDLOPEN LT_CONFIG_H @@ -1650,6 +1651,7 @@ Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. + _ACEOF exit fi @@ -13942,54 +13944,6 @@ LIBTOOL="$LIBTOOL --silent" subdirs="$subdirs libratbox" -case "$host_os" in -*cygwin*) - -cat >>confdefs.h <<_ACEOF -#define CYGWIN 1 -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define WINDOWS 1 -_ACEOF - - ;; -*mingw*) - -cat >>confdefs.h <<_ACEOF -#define MINGW 1 -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define WINDOWS 1 -_ACEOF - - ac_fn_c_check_header_mongrel "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default" -if test "x$ac_cv_header_winsock2_h" = xyes; then : - -else - as_fn_error $? "** MinGW and no winsock2.h. I give up." "$LINENO" 5 -fi - - - LIBS="$LIBS -lws2_32 -liphlpapi" - is_mingw="yes" - ;; -*) - ;; -esac - - if test "$is_mingw" = "yes"; then - MINGW_TRUE= - MINGW_FALSE='#' -else - MINGW_TRUE='#' - MINGW_FALSE= -fi - - if test "$LEX" != flex; then LEX="$SHELL $missing_dir/missing flex" LEX_OUTPUT_ROOT=lex.yy @@ -16306,10 +16260,6 @@ LT_CONFIG_H=include/setup.h ltdl_LTLIBOBJS=$_ltdl_ltlibobjs -if test -z "${MINGW_TRUE}" && test -z "${MINGW_FALSE}"; then - as_fn_error $? "conditional \"MINGW\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${WITH_JEMALLOC_TRUE}" && test -z "${WITH_JEMALLOC_FALSE}"; then as_fn_error $? "conditional \"WITH_JEMALLOC\" was never defined. @@ -18743,4 +18693,3 @@ echo "Modules ........................ $tmpresult" echo "Assert debugging ............... $assert" echo "ratbox-services compatibility .. $ratbox_services" echo - diff --git a/configure.ac b/configure.ac index f28096dc..a4b99d3c 100644 --- a/configure.ac +++ b/configure.ac @@ -157,24 +157,6 @@ LIBTOOL="$LIBTOOL --silent" AC_CONFIG_SUBDIRS(libratbox) -case "$host_os" in -*cygwin*) - AC_DEFINE_UNQUOTED(CYGWIN,1,[This is a Cygwin system]) - AC_DEFINE_UNQUOTED(WINDOWS,1,[This is a Windows system]) - ;; -*mingw*) - AC_DEFINE_UNQUOTED(MINGW,1,[This is a MinGW system]) - AC_DEFINE_UNQUOTED(WINDOWS,1,[This is a Windows system]) - AC_CHECK_HEADER(winsock2.h, , [AC_MSG_ERROR([** MinGW and no winsock2.h. I give up.])]) - LIBS="$LIBS -lws2_32 -liphlpapi" - is_mingw="yes" - ;; -*) - ;; -esac - -AM_CONDITIONAL([MINGW], [test "$is_mingw" = "yes"]) - if test "$LEX" != flex; then LEX="$SHELL $missing_dir/missing flex" AC_SUBST(LEX_OUTPUT_ROOT, lex.yy) diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 69792174..9039372b 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -14,9 +14,9 @@ contribdir = @moduledir@/contrib AM_CPPFLAGS = -I../include -I../libratbox/include $(INCLTDL) AM_CFLAGS=$(WARNFLAGS) -if MINGW -EXTRA_FLAGS = -no-undefined -Wl,--enable-runtime-pseudo-reloc -export-symbols-regex '*' -endif +#if MINGW +#EXTRA_FLAGS = -no-undefined -Wl,--enable-runtime-pseudo-reloc -export-symbols-regex '*' +#endif MODULE_FLAGS = $(EXTRA_FLAGS) -avoid-version diff --git a/contrib/Makefile.in b/contrib/Makefile.in index 569c7ca8..47f49539 100644 --- a/contrib/Makefile.in +++ b/contrib/Makefile.in @@ -310,7 +310,10 @@ libmodulesdir = @moduledir@ contribdir = @moduledir@/contrib AM_CPPFLAGS = -I../include -I../libratbox/include $(INCLTDL) AM_CFLAGS = $(WARNFLAGS) -@MINGW_TRUE@EXTRA_FLAGS = -no-undefined -Wl,--enable-runtime-pseudo-reloc -export-symbols-regex '*' + +#if MINGW +#EXTRA_FLAGS = -no-undefined -Wl,--enable-runtime-pseudo-reloc -export-symbols-regex '*' +#endif MODULE_FLAGS = $(EXTRA_FLAGS) -avoid-version SRCS = \ example_module.c \ diff --git a/libratbox/configure b/libratbox/configure index daa3aaa1..c8c7c222 100755 --- a/libratbox/configure +++ b/libratbox/configure @@ -661,8 +661,6 @@ ALLOCA CRYPT_LIB NEED_CRYPT_FALSE NEED_CRYPT_TRUE -MINGW_FALSE -MINGW_TRUE WARNFLAGS LT_SYS_LIBRARY_PATH OTOOL64 @@ -13284,92 +13282,6 @@ done LIBTOOL="$LIBTOOL --silent" -case "$host_os" in -*cygwin*) - -cat >>confdefs.h <<_ACEOF -#define CYGWIN 1 -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define WINDOWS 1 -_ACEOF - - ;; -*mingw*) - -cat >>confdefs.h <<_ACEOF -#define MINGW 1 -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define WINDOWS 1 -_ACEOF - - ac_fn_c_check_header_mongrel "$LINENO" "windows.h" "ac_cv_header_windows_h" "$ac_includes_default" -if test "x$ac_cv_header_windows_h" = xyes; then : - -else - as_fn_error $? "** MinGW and no windows.h. I give up." "$LINENO" 5 -fi - - - ac_fn_c_check_header_mongrel "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default" -if test "x$ac_cv_header_winsock2_h" = xyes; then : - -else - as_fn_error $? "** MinGW and no winsock2.h. I give up." "$LINENO" 5 -fi - - - ac_fn_c_check_header_mongrel "$LINENO" "ws2tcpip.h" "ac_cv_header_ws2tcpip_h" "$ac_includes_default" -if test "x$ac_cv_header_ws2tcpip_h" = xyes; then : - -else - as_fn_error $? "** MinGW and no winsock2.h. I give up." "$LINENO" 5 -fi - - - -cat >>confdefs.h <<_ACEOF -#define HAVE_WS2TCPIP_H 1 -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define HAVE_WINSOCK2_H 1 -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define HAVE_WINSOCK_H 1 -_ACEOF - - LIBS="$LIBS -lws2_32 -liphlpapi" - is_mingw="yes" - ;; -*interix*) - CPPFLAGS="$CFLAGS -D_ALL_SOURCE -D_XOPEN_SOURCE=500" - ;; -*solaris*) - CPPFLAGS="$CFLAGS -D_POSIX_PTHREAD_SEMANTICS -D_XPG4_2" - ;; -*) - ;; -esac - - if test "$is_mingw" = "yes"; then - MINGW_TRUE= - MINGW_FALSE='#' -else - MINGW_TRUE='#' - MINGW_FALSE= -fi - - - # backwards support for IRC_CFLAGS CFLAGS="$IRC_CFLAGS $CFLAGS -Wall" @@ -15866,10 +15778,6 @@ if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${MINGW_TRUE}" && test -z "${MINGW_FALSE}"; then - as_fn_error $? "conditional \"MINGW\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${NEED_CRYPT_TRUE}" && test -z "${NEED_CRYPT_FALSE}"; then as_fn_error $? "conditional \"NEED_CRYPT\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/libratbox/configure.ac b/libratbox/configure.ac index 93d63960..8857d2b3 100644 --- a/libratbox/configure.ac +++ b/libratbox/configure.ac @@ -128,36 +128,6 @@ AC_SUBST(WARNFLAGS) LIBTOOL="$LIBTOOL --silent" -case "$host_os" in -*cygwin*) - AC_DEFINE_UNQUOTED(CYGWIN,1,[This is a Cygwin system]) - AC_DEFINE_UNQUOTED(WINDOWS,1,[This is a Windows system]) - ;; -*mingw*) - AC_DEFINE_UNQUOTED(MINGW,1,[This is a MinGW system]) - AC_DEFINE_UNQUOTED(WINDOWS,1,[This is a Windows system]) - AC_CHECK_HEADER(windows.h, , [AC_MSG_ERROR([** MinGW and no windows.h. I give up.])]) - AC_CHECK_HEADER(winsock2.h, , [AC_MSG_ERROR([** MinGW and no winsock2.h. I give up.])]) - AC_CHECK_HEADER(ws2tcpip.h, , [AC_MSG_ERROR([** MinGW and no winsock2.h. I give up.])]) - AC_DEFINE_UNQUOTED(HAVE_WS2TCPIP_H, 1, [Have WS2TCPIP_H]) - AC_DEFINE_UNQUOTED(HAVE_WINSOCK2_H, 1, [Have WINSOCK_H]) - AC_DEFINE_UNQUOTED(HAVE_WINSOCK_H, 1, [Have WINSOCK_H]) - LIBS="$LIBS -lws2_32 -liphlpapi" - is_mingw="yes" - ;; -*interix*) - CPPFLAGS="$CFLAGS -D_ALL_SOURCE -D_XOPEN_SOURCE=500" - ;; -*solaris*) - CPPFLAGS="$CFLAGS -D_POSIX_PTHREAD_SEMANTICS -D_XPG4_2" - ;; -*) - ;; -esac - -AM_CONDITIONAL([MINGW], [test "$is_mingw" = "yes"]) - - # backwards support for IRC_CFLAGS CFLAGS="$IRC_CFLAGS $CFLAGS -Wall" diff --git a/modules/Makefile.am b/modules/Makefile.am index e8a07836..7c54157d 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -14,24 +14,10 @@ AM_CPPFLAGS = -I../libratbox/include -I../include $(LTDLINCL) @SSL_INCLUDES@ AM_CFLAGS = $(WARNFLAGS) - -if MINGW -EXTRA_FLAGS = -no-undefined -Wl,--enable-runtime-pseudo-reloc -export-symbols-regex '*' -endif - - MODULE_FLAGS = $(EXTRA_FLAGS) -avoid-version if !STATIC_MODULES -if MINGW -MODULE_LIBS = ../libratbox/src/libratbox.la ../src/libcore.la @SSL_LIBS@ -endif # MINGW - - - - - m_accept_la_LDFLAGS = -module $(MODULE_FLAGS) m_admin_la_LDFLAGS = -module $(MODULE_FLAGS) m_adminwall_la_LDFLAGS = -module $(MODULE_FLAGS) diff --git a/modules/Makefile.in b/modules/Makefile.in index 17ce761b..ffacab11 100644 --- a/modules/Makefile.in +++ b/modules/Makefile.in @@ -139,10 +139,7 @@ am__installdirs = "$(DESTDIR)$(coredir)" "$(DESTDIR)$(libmodulesdir)" \ "$(DESTDIR)$(modulesdir)" "$(DESTDIR)$(servicesdir)" LTLIBRARIES = $(core_LTLIBRARIES) $(libmodules_LTLIBRARIES) \ $(modules_LTLIBRARIES) $(services_LTLIBRARIES) -@MINGW_TRUE@@STATIC_MODULES_FALSE@am__DEPENDENCIES_1 = ../libratbox/src/libratbox.la \ -@MINGW_TRUE@@STATIC_MODULES_FALSE@ ../src/libcore.la -@STATIC_MODULES_FALSE@core_m_die_la_DEPENDENCIES = \ -@STATIC_MODULES_FALSE@ $(am__DEPENDENCIES_1) +core_m_die_la_DEPENDENCIES = am__core_m_die_la_SOURCES_DIST = core/m_die.c am__dirstamp = $(am__leading_dot)dirstamp @STATIC_MODULES_FALSE@am_core_m_die_la_OBJECTS = core/m_die.lo @@ -155,8 +152,7 @@ core_m_die_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(core_m_die_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_core_m_die_la_rpath = -rpath $(coredir) -@STATIC_MODULES_FALSE@core_m_error_la_DEPENDENCIES = \ -@STATIC_MODULES_FALSE@ $(am__DEPENDENCIES_1) +core_m_error_la_DEPENDENCIES = am__core_m_error_la_SOURCES_DIST = core/m_error.c @STATIC_MODULES_FALSE@am_core_m_error_la_OBJECTS = core/m_error.lo core_m_error_la_OBJECTS = $(am_core_m_error_la_OBJECTS) @@ -165,8 +161,7 @@ core_m_error_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_CFLAGS) $(CFLAGS) $(core_m_error_la_LDFLAGS) $(LDFLAGS) \ -o $@ @STATIC_MODULES_FALSE@am_core_m_error_la_rpath = -rpath $(coredir) -@STATIC_MODULES_FALSE@core_m_join_la_DEPENDENCIES = \ -@STATIC_MODULES_FALSE@ $(am__DEPENDENCIES_1) +core_m_join_la_DEPENDENCIES = am__core_m_join_la_SOURCES_DIST = core/m_join.c @STATIC_MODULES_FALSE@am_core_m_join_la_OBJECTS = core/m_join.lo core_m_join_la_OBJECTS = $(am_core_m_join_la_OBJECTS) @@ -175,8 +170,7 @@ core_m_join_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_CFLAGS) $(CFLAGS) $(core_m_join_la_LDFLAGS) $(LDFLAGS) -o \ $@ @STATIC_MODULES_FALSE@am_core_m_join_la_rpath = -rpath $(coredir) -@STATIC_MODULES_FALSE@core_m_kick_la_DEPENDENCIES = \ -@STATIC_MODULES_FALSE@ $(am__DEPENDENCIES_1) +core_m_kick_la_DEPENDENCIES = am__core_m_kick_la_SOURCES_DIST = core/m_kick.c @STATIC_MODULES_FALSE@am_core_m_kick_la_OBJECTS = core/m_kick.lo core_m_kick_la_OBJECTS = $(am_core_m_kick_la_OBJECTS) @@ -185,8 +179,7 @@ core_m_kick_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_CFLAGS) $(CFLAGS) $(core_m_kick_la_LDFLAGS) $(LDFLAGS) -o \ $@ @STATIC_MODULES_FALSE@am_core_m_kick_la_rpath = -rpath $(coredir) -@STATIC_MODULES_FALSE@core_m_kill_la_DEPENDENCIES = \ -@STATIC_MODULES_FALSE@ $(am__DEPENDENCIES_1) +core_m_kill_la_DEPENDENCIES = am__core_m_kill_la_SOURCES_DIST = core/m_kill.c @STATIC_MODULES_FALSE@am_core_m_kill_la_OBJECTS = core/m_kill.lo core_m_kill_la_OBJECTS = $(am_core_m_kill_la_OBJECTS) @@ -195,8 +188,7 @@ core_m_kill_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_CFLAGS) $(CFLAGS) $(core_m_kill_la_LDFLAGS) $(LDFLAGS) -o \ $@ @STATIC_MODULES_FALSE@am_core_m_kill_la_rpath = -rpath $(coredir) -@STATIC_MODULES_FALSE@core_m_message_la_DEPENDENCIES = \ -@STATIC_MODULES_FALSE@ $(am__DEPENDENCIES_1) +core_m_message_la_DEPENDENCIES = am__core_m_message_la_SOURCES_DIST = core/m_message.c @STATIC_MODULES_FALSE@am_core_m_message_la_OBJECTS = \ @STATIC_MODULES_FALSE@ core/m_message.lo @@ -206,8 +198,7 @@ core_m_message_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_CFLAGS) $(CFLAGS) $(core_m_message_la_LDFLAGS) $(LDFLAGS) \ -o $@ @STATIC_MODULES_FALSE@am_core_m_message_la_rpath = -rpath $(coredir) -@STATIC_MODULES_FALSE@core_m_mode_la_DEPENDENCIES = \ -@STATIC_MODULES_FALSE@ $(am__DEPENDENCIES_1) +core_m_mode_la_DEPENDENCIES = am__core_m_mode_la_SOURCES_DIST = core/m_mode.c @STATIC_MODULES_FALSE@am_core_m_mode_la_OBJECTS = core/m_mode.lo core_m_mode_la_OBJECTS = $(am_core_m_mode_la_OBJECTS) @@ -216,8 +207,7 @@ core_m_mode_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_CFLAGS) $(CFLAGS) $(core_m_mode_la_LDFLAGS) $(LDFLAGS) -o \ $@ @STATIC_MODULES_FALSE@am_core_m_mode_la_rpath = -rpath $(coredir) -@STATIC_MODULES_FALSE@core_m_nick_la_DEPENDENCIES = \ -@STATIC_MODULES_FALSE@ $(am__DEPENDENCIES_1) +core_m_nick_la_DEPENDENCIES = am__core_m_nick_la_SOURCES_DIST = core/m_nick.c @STATIC_MODULES_FALSE@am_core_m_nick_la_OBJECTS = core/m_nick.lo core_m_nick_la_OBJECTS = $(am_core_m_nick_la_OBJECTS) @@ -226,8 +216,7 @@ core_m_nick_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_CFLAGS) $(CFLAGS) $(core_m_nick_la_LDFLAGS) $(LDFLAGS) -o \ $@ @STATIC_MODULES_FALSE@am_core_m_nick_la_rpath = -rpath $(coredir) -@STATIC_MODULES_FALSE@core_m_part_la_DEPENDENCIES = \ -@STATIC_MODULES_FALSE@ $(am__DEPENDENCIES_1) +core_m_part_la_DEPENDENCIES = am__core_m_part_la_SOURCES_DIST = core/m_part.c @STATIC_MODULES_FALSE@am_core_m_part_la_OBJECTS = core/m_part.lo core_m_part_la_OBJECTS = $(am_core_m_part_la_OBJECTS) @@ -236,8 +225,7 @@ core_m_part_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_CFLAGS) $(CFLAGS) $(core_m_part_la_LDFLAGS) $(LDFLAGS) -o \ $@ @STATIC_MODULES_FALSE@am_core_m_part_la_rpath = -rpath $(coredir) -@STATIC_MODULES_FALSE@core_m_quit_la_DEPENDENCIES = \ -@STATIC_MODULES_FALSE@ $(am__DEPENDENCIES_1) +core_m_quit_la_DEPENDENCIES = am__core_m_quit_la_SOURCES_DIST = core/m_quit.c @STATIC_MODULES_FALSE@am_core_m_quit_la_OBJECTS = core/m_quit.lo core_m_quit_la_OBJECTS = $(am_core_m_quit_la_OBJECTS) @@ -246,8 +234,7 @@ core_m_quit_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_CFLAGS) $(CFLAGS) $(core_m_quit_la_LDFLAGS) $(LDFLAGS) -o \ $@ @STATIC_MODULES_FALSE@am_core_m_quit_la_rpath = -rpath $(coredir) -@STATIC_MODULES_FALSE@core_m_server_la_DEPENDENCIES = \ -@STATIC_MODULES_FALSE@ $(am__DEPENDENCIES_1) +core_m_server_la_DEPENDENCIES = am__core_m_server_la_SOURCES_DIST = core/m_server.c @STATIC_MODULES_FALSE@am_core_m_server_la_OBJECTS = core/m_server.lo core_m_server_la_OBJECTS = $(am_core_m_server_la_OBJECTS) @@ -256,8 +243,7 @@ core_m_server_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_CFLAGS) $(CFLAGS) $(core_m_server_la_LDFLAGS) $(LDFLAGS) \ -o $@ @STATIC_MODULES_FALSE@am_core_m_server_la_rpath = -rpath $(coredir) -@STATIC_MODULES_FALSE@core_m_squit_la_DEPENDENCIES = \ -@STATIC_MODULES_FALSE@ $(am__DEPENDENCIES_1) +core_m_squit_la_DEPENDENCIES = am__core_m_squit_la_SOURCES_DIST = core/m_squit.c @STATIC_MODULES_FALSE@am_core_m_squit_la_OBJECTS = core/m_squit.lo core_m_squit_la_OBJECTS = $(am_core_m_squit_la_OBJECTS) @@ -310,8 +296,7 @@ am__libmodules_la_SOURCES_DIST = m_accept.c m_admin.c m_adminwall.c \ @STATIC_MODULES_TRUE@ $(am__objects_2) $(am__objects_3) libmodules_la_OBJECTS = $(am_libmodules_la_OBJECTS) @STATIC_MODULES_TRUE@am_libmodules_la_rpath = -rpath $(libmodulesdir) -@STATIC_MODULES_FALSE@m_accept_la_DEPENDENCIES = \ -@STATIC_MODULES_FALSE@ $(am__DEPENDENCIES_1) +m_accept_la_DEPENDENCIES = am__m_accept_la_SOURCES_DIST = m_accept.c @STATIC_MODULES_FALSE@am_m_accept_la_OBJECTS = m_accept.lo m_accept_la_OBJECTS = $(am_m_accept_la_OBJECTS) @@ -319,7 +304,7 @@ m_accept_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_accept_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_accept_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_admin_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +m_admin_la_DEPENDENCIES = am__m_admin_la_SOURCES_DIST = m_admin.c @STATIC_MODULES_FALSE@am_m_admin_la_OBJECTS = m_admin.lo m_admin_la_OBJECTS = $(am_m_admin_la_OBJECTS) @@ -327,8 +312,7 @@ m_admin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_admin_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_admin_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_adminwall_la_DEPENDENCIES = \ -@STATIC_MODULES_FALSE@ $(am__DEPENDENCIES_1) +m_adminwall_la_DEPENDENCIES = am__m_adminwall_la_SOURCES_DIST = m_adminwall.c @STATIC_MODULES_FALSE@am_m_adminwall_la_OBJECTS = m_adminwall.lo m_adminwall_la_OBJECTS = $(am_m_adminwall_la_OBJECTS) @@ -337,7 +321,7 @@ m_adminwall_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_CFLAGS) $(CFLAGS) $(m_adminwall_la_LDFLAGS) $(LDFLAGS) -o \ $@ @STATIC_MODULES_FALSE@am_m_adminwall_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_away_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +m_away_la_DEPENDENCIES = am__m_away_la_SOURCES_DIST = m_away.c @STATIC_MODULES_FALSE@am_m_away_la_OBJECTS = m_away.lo m_away_la_OBJECTS = $(am_m_away_la_OBJECTS) @@ -345,7 +329,7 @@ m_away_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_away_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_away_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_cap_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +m_cap_la_DEPENDENCIES = am__m_cap_la_SOURCES_DIST = m_cap.c @STATIC_MODULES_FALSE@am_m_cap_la_OBJECTS = m_cap.lo m_cap_la_OBJECTS = $(am_m_cap_la_OBJECTS) @@ -353,7 +337,7 @@ m_cap_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_cap_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_cap_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_capab_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +m_capab_la_DEPENDENCIES = am__m_capab_la_SOURCES_DIST = m_capab.c @STATIC_MODULES_FALSE@am_m_capab_la_OBJECTS = m_capab.lo m_capab_la_OBJECTS = $(am_m_capab_la_OBJECTS) @@ -361,7 +345,7 @@ m_capab_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_capab_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_capab_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_close_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +m_close_la_DEPENDENCIES = am__m_close_la_SOURCES_DIST = m_close.c @STATIC_MODULES_FALSE@am_m_close_la_OBJECTS = m_close.lo m_close_la_OBJECTS = $(am_m_close_la_OBJECTS) @@ -369,8 +353,7 @@ m_close_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_close_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_close_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_cmessage_la_DEPENDENCIES = \ -@STATIC_MODULES_FALSE@ $(am__DEPENDENCIES_1) +m_cmessage_la_DEPENDENCIES = am__m_cmessage_la_SOURCES_DIST = m_cmessage.c @STATIC_MODULES_FALSE@am_m_cmessage_la_OBJECTS = m_cmessage.lo m_cmessage_la_OBJECTS = $(am_m_cmessage_la_OBJECTS) @@ -378,8 +361,7 @@ m_cmessage_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_cmessage_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_cmessage_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_connect_la_DEPENDENCIES = \ -@STATIC_MODULES_FALSE@ $(am__DEPENDENCIES_1) +m_connect_la_DEPENDENCIES = am__m_connect_la_SOURCES_DIST = m_connect.c @STATIC_MODULES_FALSE@am_m_connect_la_OBJECTS = m_connect.lo m_connect_la_OBJECTS = $(am_m_connect_la_OBJECTS) @@ -387,7 +369,7 @@ m_connect_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_connect_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_connect_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_dline_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +m_dline_la_DEPENDENCIES = am__m_dline_la_SOURCES_DIST = m_dline.c @STATIC_MODULES_FALSE@am_m_dline_la_OBJECTS = m_dline.lo m_dline_la_OBJECTS = $(am_m_dline_la_OBJECTS) @@ -395,7 +377,7 @@ m_dline_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_dline_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_dline_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_encap_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +m_encap_la_DEPENDENCIES = am__m_encap_la_SOURCES_DIST = m_encap.c @STATIC_MODULES_FALSE@am_m_encap_la_OBJECTS = m_encap.lo m_encap_la_OBJECTS = $(am_m_encap_la_OBJECTS) @@ -403,7 +385,7 @@ m_encap_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_encap_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_encap_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_gline_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +m_gline_la_DEPENDENCIES = am__m_gline_la_SOURCES_DIST = m_gline.c @STATIC_MODULES_FALSE@am_m_gline_la_OBJECTS = m_gline.lo m_gline_la_OBJECTS = $(am_m_gline_la_OBJECTS) @@ -411,8 +393,7 @@ m_gline_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_gline_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_gline_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_gungline_la_DEPENDENCIES = \ -@STATIC_MODULES_FALSE@ $(am__DEPENDENCIES_1) +m_gungline_la_DEPENDENCIES = am__m_gungline_la_SOURCES_DIST = m_gungline.c @STATIC_MODULES_FALSE@am_m_gungline_la_OBJECTS = m_gungline.lo m_gungline_la_OBJECTS = $(am_m_gungline_la_OBJECTS) @@ -420,7 +401,7 @@ m_gungline_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_gungline_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_gungline_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_help_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +m_help_la_DEPENDENCIES = am__m_help_la_SOURCES_DIST = m_help.c @STATIC_MODULES_FALSE@am_m_help_la_OBJECTS = m_help.lo m_help_la_OBJECTS = $(am_m_help_la_OBJECTS) @@ -428,7 +409,7 @@ m_help_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_help_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_help_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_info_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +m_info_la_DEPENDENCIES = am__m_info_la_SOURCES_DIST = m_info.c @STATIC_MODULES_FALSE@am_m_info_la_OBJECTS = m_info.lo m_info_la_OBJECTS = $(am_m_info_la_OBJECTS) @@ -436,8 +417,7 @@ m_info_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_info_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_info_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_invite_la_DEPENDENCIES = \ -@STATIC_MODULES_FALSE@ $(am__DEPENDENCIES_1) +m_invite_la_DEPENDENCIES = am__m_invite_la_SOURCES_DIST = m_invite.c @STATIC_MODULES_FALSE@am_m_invite_la_OBJECTS = m_invite.lo m_invite_la_OBJECTS = $(am_m_invite_la_OBJECTS) @@ -445,7 +425,7 @@ m_invite_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_invite_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_invite_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_ison_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +m_ison_la_DEPENDENCIES = am__m_ison_la_SOURCES_DIST = m_ison.c @STATIC_MODULES_FALSE@am_m_ison_la_OBJECTS = m_ison.lo m_ison_la_OBJECTS = $(am_m_ison_la_OBJECTS) @@ -453,7 +433,7 @@ m_ison_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_ison_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_ison_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_kline_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +m_kline_la_DEPENDENCIES = am__m_kline_la_SOURCES_DIST = m_kline.c @STATIC_MODULES_FALSE@am_m_kline_la_OBJECTS = m_kline.lo m_kline_la_OBJECTS = $(am_m_kline_la_OBJECTS) @@ -461,7 +441,7 @@ m_kline_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_kline_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_kline_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_knock_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +m_knock_la_DEPENDENCIES = am__m_knock_la_SOURCES_DIST = m_knock.c @STATIC_MODULES_FALSE@am_m_knock_la_OBJECTS = m_knock.lo m_knock_la_OBJECTS = $(am_m_knock_la_OBJECTS) @@ -469,7 +449,7 @@ m_knock_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_knock_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_knock_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_links_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +m_links_la_DEPENDENCIES = am__m_links_la_SOURCES_DIST = m_links.c @STATIC_MODULES_FALSE@am_m_links_la_OBJECTS = m_links.lo m_links_la_OBJECTS = $(am_m_links_la_OBJECTS) @@ -477,7 +457,7 @@ m_links_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_links_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_links_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_list_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +m_list_la_DEPENDENCIES = am__m_list_la_SOURCES_DIST = m_list.c @STATIC_MODULES_FALSE@am_m_list_la_OBJECTS = m_list.lo m_list_la_OBJECTS = $(am_m_list_la_OBJECTS) @@ -485,8 +465,7 @@ m_list_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_list_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_list_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_locops_la_DEPENDENCIES = \ -@STATIC_MODULES_FALSE@ $(am__DEPENDENCIES_1) +m_locops_la_DEPENDENCIES = am__m_locops_la_SOURCES_DIST = m_locops.c @STATIC_MODULES_FALSE@am_m_locops_la_OBJECTS = m_locops.lo m_locops_la_OBJECTS = $(am_m_locops_la_OBJECTS) @@ -494,8 +473,7 @@ m_locops_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_locops_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_locops_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_lusers_la_DEPENDENCIES = \ -@STATIC_MODULES_FALSE@ $(am__DEPENDENCIES_1) +m_lusers_la_DEPENDENCIES = am__m_lusers_la_SOURCES_DIST = m_lusers.c @STATIC_MODULES_FALSE@am_m_lusers_la_OBJECTS = m_lusers.lo m_lusers_la_OBJECTS = $(am_m_lusers_la_OBJECTS) @@ -503,7 +481,7 @@ m_lusers_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_lusers_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_lusers_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_map_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +m_map_la_DEPENDENCIES = am__m_map_la_SOURCES_DIST = m_map.c @STATIC_MODULES_FALSE@am_m_map_la_OBJECTS = m_map.lo m_map_la_OBJECTS = $(am_m_map_la_OBJECTS) @@ -511,8 +489,7 @@ m_map_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_map_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_map_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_monitor_la_DEPENDENCIES = \ -@STATIC_MODULES_FALSE@ $(am__DEPENDENCIES_1) +m_monitor_la_DEPENDENCIES = am__m_monitor_la_SOURCES_DIST = m_monitor.c @STATIC_MODULES_FALSE@am_m_monitor_la_OBJECTS = m_monitor.lo m_monitor_la_OBJECTS = $(am_m_monitor_la_OBJECTS) @@ -520,7 +497,7 @@ m_monitor_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_monitor_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_monitor_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_motd_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +m_motd_la_DEPENDENCIES = am__m_motd_la_SOURCES_DIST = m_motd.c @STATIC_MODULES_FALSE@am_m_motd_la_OBJECTS = m_motd.lo m_motd_la_OBJECTS = $(am_m_motd_la_OBJECTS) @@ -528,7 +505,7 @@ m_motd_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_motd_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_motd_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_names_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +m_names_la_DEPENDENCIES = am__m_names_la_SOURCES_DIST = m_names.c @STATIC_MODULES_FALSE@am_m_names_la_OBJECTS = m_names.lo m_names_la_OBJECTS = $(am_m_names_la_OBJECTS) @@ -536,7 +513,7 @@ m_names_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_names_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_names_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_oper_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +m_oper_la_DEPENDENCIES = am__m_oper_la_SOURCES_DIST = m_oper.c @STATIC_MODULES_FALSE@am_m_oper_la_OBJECTS = m_oper.lo m_oper_la_OBJECTS = $(am_m_oper_la_OBJECTS) @@ -544,8 +521,7 @@ m_oper_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_oper_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_oper_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_operspy_la_DEPENDENCIES = \ -@STATIC_MODULES_FALSE@ $(am__DEPENDENCIES_1) +m_operspy_la_DEPENDENCIES = am__m_operspy_la_SOURCES_DIST = m_operspy.c @STATIC_MODULES_FALSE@am_m_operspy_la_OBJECTS = m_operspy.lo m_operspy_la_OBJECTS = $(am_m_operspy_la_OBJECTS) @@ -553,7 +529,7 @@ m_operspy_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_operspy_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_operspy_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_pass_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +m_pass_la_DEPENDENCIES = am__m_pass_la_SOURCES_DIST = m_pass.c @STATIC_MODULES_FALSE@am_m_pass_la_OBJECTS = m_pass.lo m_pass_la_OBJECTS = $(am_m_pass_la_OBJECTS) @@ -561,7 +537,7 @@ m_pass_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_pass_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_pass_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_ping_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +m_ping_la_DEPENDENCIES = am__m_ping_la_SOURCES_DIST = m_ping.c @STATIC_MODULES_FALSE@am_m_ping_la_OBJECTS = m_ping.lo m_ping_la_OBJECTS = $(am_m_ping_la_OBJECTS) @@ -569,7 +545,7 @@ m_ping_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_ping_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_ping_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_pong_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +m_pong_la_DEPENDENCIES = am__m_pong_la_SOURCES_DIST = m_pong.c @STATIC_MODULES_FALSE@am_m_pong_la_OBJECTS = m_pong.lo m_pong_la_OBJECTS = $(am_m_pong_la_OBJECTS) @@ -577,7 +553,7 @@ m_pong_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_pong_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_pong_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_post_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +m_post_la_DEPENDENCIES = am__m_post_la_SOURCES_DIST = m_post.c @STATIC_MODULES_FALSE@am_m_post_la_OBJECTS = m_post.lo m_post_la_OBJECTS = $(am_m_post_la_OBJECTS) @@ -585,8 +561,7 @@ m_post_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_post_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_post_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_rehash_la_DEPENDENCIES = \ -@STATIC_MODULES_FALSE@ $(am__DEPENDENCIES_1) +m_rehash_la_DEPENDENCIES = am__m_rehash_la_SOURCES_DIST = m_rehash.c @STATIC_MODULES_FALSE@am_m_rehash_la_OBJECTS = m_rehash.lo m_rehash_la_OBJECTS = $(am_m_rehash_la_OBJECTS) @@ -594,8 +569,7 @@ m_rehash_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_rehash_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_rehash_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_restart_la_DEPENDENCIES = \ -@STATIC_MODULES_FALSE@ $(am__DEPENDENCIES_1) +m_restart_la_DEPENDENCIES = am__m_restart_la_SOURCES_DIST = m_restart.c @STATIC_MODULES_FALSE@am_m_restart_la_OBJECTS = m_restart.lo m_restart_la_OBJECTS = $(am_m_restart_la_OBJECTS) @@ -603,7 +577,7 @@ m_restart_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_restart_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_restart_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_resv_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +m_resv_la_DEPENDENCIES = am__m_resv_la_SOURCES_DIST = m_resv.c @STATIC_MODULES_FALSE@am_m_resv_la_OBJECTS = m_resv.lo m_resv_la_OBJECTS = $(am_m_resv_la_OBJECTS) @@ -611,7 +585,7 @@ m_resv_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_resv_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_resv_la_rpath = -rpath $(modulesdir) -@ENABLE_SERVICES_TRUE@@STATIC_MODULES_FALSE@m_services_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +m_services_la_DEPENDENCIES = am__m_services_la_SOURCES_DIST = m_services.c @ENABLE_SERVICES_TRUE@@STATIC_MODULES_FALSE@am_m_services_la_OBJECTS = \ @ENABLE_SERVICES_TRUE@@STATIC_MODULES_FALSE@ m_services.lo @@ -622,7 +596,7 @@ m_services_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ @ENABLE_SERVICES_TRUE@@STATIC_MODULES_FALSE@am_m_services_la_rpath = \ @ENABLE_SERVICES_TRUE@@STATIC_MODULES_FALSE@ -rpath \ @ENABLE_SERVICES_TRUE@@STATIC_MODULES_FALSE@ $(servicesdir) -@STATIC_MODULES_FALSE@m_set_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +m_set_la_DEPENDENCIES = am__m_set_la_SOURCES_DIST = m_set.c @STATIC_MODULES_FALSE@am_m_set_la_OBJECTS = m_set.lo m_set_la_OBJECTS = $(am_m_set_la_OBJECTS) @@ -630,7 +604,7 @@ m_set_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_set_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_set_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_stats_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +m_stats_la_DEPENDENCIES = am__m_stats_la_SOURCES_DIST = m_stats.c @STATIC_MODULES_FALSE@am_m_stats_la_OBJECTS = m_stats.lo m_stats_la_OBJECTS = $(am_m_stats_la_OBJECTS) @@ -638,8 +612,7 @@ m_stats_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_stats_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_stats_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_svinfo_la_DEPENDENCIES = \ -@STATIC_MODULES_FALSE@ $(am__DEPENDENCIES_1) +m_svinfo_la_DEPENDENCIES = am__m_svinfo_la_SOURCES_DIST = m_svinfo.c @STATIC_MODULES_FALSE@am_m_svinfo_la_OBJECTS = m_svinfo.lo m_svinfo_la_OBJECTS = $(am_m_svinfo_la_OBJECTS) @@ -647,7 +620,7 @@ m_svinfo_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_svinfo_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_svinfo_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_tb_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +m_tb_la_DEPENDENCIES = am__m_tb_la_SOURCES_DIST = m_tb.c @STATIC_MODULES_FALSE@am_m_tb_la_OBJECTS = m_tb.lo m_tb_la_OBJECTS = $(am_m_tb_la_OBJECTS) @@ -655,8 +628,7 @@ m_tb_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_tb_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_tb_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_testline_la_DEPENDENCIES = \ -@STATIC_MODULES_FALSE@ $(am__DEPENDENCIES_1) +m_testline_la_DEPENDENCIES = am__m_testline_la_SOURCES_DIST = m_testline.c @STATIC_MODULES_FALSE@am_m_testline_la_OBJECTS = m_testline.lo m_testline_la_OBJECTS = $(am_m_testline_la_OBJECTS) @@ -664,8 +636,7 @@ m_testline_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_testline_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_testline_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_testmask_la_DEPENDENCIES = \ -@STATIC_MODULES_FALSE@ $(am__DEPENDENCIES_1) +m_testmask_la_DEPENDENCIES = am__m_testmask_la_SOURCES_DIST = m_testmask.c @STATIC_MODULES_FALSE@am_m_testmask_la_OBJECTS = m_testmask.lo m_testmask_la_OBJECTS = $(am_m_testmask_la_OBJECTS) @@ -673,7 +644,7 @@ m_testmask_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_testmask_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_testmask_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_time_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +m_time_la_DEPENDENCIES = am__m_time_la_SOURCES_DIST = m_time.c @STATIC_MODULES_FALSE@am_m_time_la_OBJECTS = m_time.lo m_time_la_OBJECTS = $(am_m_time_la_OBJECTS) @@ -681,7 +652,7 @@ m_time_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_time_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_time_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_topic_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +m_topic_la_DEPENDENCIES = am__m_topic_la_SOURCES_DIST = m_topic.c @STATIC_MODULES_FALSE@am_m_topic_la_OBJECTS = m_topic.lo m_topic_la_OBJECTS = $(am_m_topic_la_OBJECTS) @@ -689,7 +660,7 @@ m_topic_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_topic_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_topic_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_trace_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +m_trace_la_DEPENDENCIES = am__m_trace_la_SOURCES_DIST = m_trace.c @STATIC_MODULES_FALSE@am_m_trace_la_OBJECTS = m_trace.lo m_trace_la_OBJECTS = $(am_m_trace_la_OBJECTS) @@ -697,8 +668,7 @@ m_trace_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_trace_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_trace_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_unreject_la_DEPENDENCIES = \ -@STATIC_MODULES_FALSE@ $(am__DEPENDENCIES_1) +m_unreject_la_DEPENDENCIES = am__m_unreject_la_SOURCES_DIST = m_unreject.c @STATIC_MODULES_FALSE@am_m_unreject_la_OBJECTS = m_unreject.lo m_unreject_la_OBJECTS = $(am_m_unreject_la_OBJECTS) @@ -706,7 +676,7 @@ m_unreject_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_unreject_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_unreject_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_user_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +m_user_la_DEPENDENCIES = am__m_user_la_SOURCES_DIST = m_user.c @STATIC_MODULES_FALSE@am_m_user_la_OBJECTS = m_user.lo m_user_la_OBJECTS = $(am_m_user_la_OBJECTS) @@ -714,8 +684,7 @@ m_user_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_user_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_user_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_userhost_la_DEPENDENCIES = \ -@STATIC_MODULES_FALSE@ $(am__DEPENDENCIES_1) +m_userhost_la_DEPENDENCIES = am__m_userhost_la_SOURCES_DIST = m_userhost.c @STATIC_MODULES_FALSE@am_m_userhost_la_OBJECTS = m_userhost.lo m_userhost_la_OBJECTS = $(am_m_userhost_la_OBJECTS) @@ -723,8 +692,7 @@ m_userhost_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_userhost_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_userhost_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_version_la_DEPENDENCIES = \ -@STATIC_MODULES_FALSE@ $(am__DEPENDENCIES_1) +m_version_la_DEPENDENCIES = am__m_version_la_SOURCES_DIST = m_version.c @STATIC_MODULES_FALSE@am_m_version_la_OBJECTS = m_version.lo m_version_la_OBJECTS = $(am_m_version_la_OBJECTS) @@ -732,8 +700,7 @@ m_version_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_version_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_version_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_wallops_la_DEPENDENCIES = \ -@STATIC_MODULES_FALSE@ $(am__DEPENDENCIES_1) +m_wallops_la_DEPENDENCIES = am__m_wallops_la_SOURCES_DIST = m_wallops.c @STATIC_MODULES_FALSE@am_m_wallops_la_OBJECTS = m_wallops.lo m_wallops_la_OBJECTS = $(am_m_wallops_la_OBJECTS) @@ -741,7 +708,7 @@ m_wallops_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_wallops_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_wallops_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_who_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +m_who_la_DEPENDENCIES = am__m_who_la_SOURCES_DIST = m_who.c @STATIC_MODULES_FALSE@am_m_who_la_OBJECTS = m_who.lo m_who_la_OBJECTS = $(am_m_who_la_OBJECTS) @@ -749,7 +716,7 @@ m_who_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_who_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_who_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_whois_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +m_whois_la_DEPENDENCIES = am__m_whois_la_SOURCES_DIST = m_whois.c @STATIC_MODULES_FALSE@am_m_whois_la_OBJECTS = m_whois.lo m_whois_la_OBJECTS = $(am_m_whois_la_OBJECTS) @@ -757,8 +724,7 @@ m_whois_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_whois_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_whois_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_whowas_la_DEPENDENCIES = \ -@STATIC_MODULES_FALSE@ $(am__DEPENDENCIES_1) +m_whowas_la_DEPENDENCIES = am__m_whowas_la_SOURCES_DIST = m_whowas.c @STATIC_MODULES_FALSE@am_m_whowas_la_OBJECTS = m_whowas.lo m_whowas_la_OBJECTS = $(am_m_whowas_la_OBJECTS) @@ -766,7 +732,7 @@ m_whowas_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(m_whowas_la_LDFLAGS) $(LDFLAGS) -o $@ @STATIC_MODULES_FALSE@am_m_whowas_la_rpath = -rpath $(modulesdir) -@STATIC_MODULES_FALSE@m_xline_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +m_xline_la_DEPENDENCIES = am__m_xline_la_SOURCES_DIST = m_xline.c @STATIC_MODULES_FALSE@am_m_xline_la_OBJECTS = m_xline.lo m_xline_la_OBJECTS = $(am_m_xline_la_OBJECTS) @@ -1096,9 +1062,7 @@ servicesdir = @moduledir@/autoload libmodulesdir = @moduledir@ AM_CPPFLAGS = -I../libratbox/include -I../include $(LTDLINCL) @SSL_INCLUDES@ AM_CFLAGS = $(WARNFLAGS) -@MINGW_TRUE@EXTRA_FLAGS = -no-undefined -Wl,--enable-runtime-pseudo-reloc -export-symbols-regex '*' MODULE_FLAGS = $(EXTRA_FLAGS) -avoid-version -@MINGW_TRUE@@STATIC_MODULES_FALSE@MODULE_LIBS = ../libratbox/src/libratbox.la ../src/libcore.la @SSL_LIBS@ @STATIC_MODULES_FALSE@m_accept_la_LDFLAGS = -module $(MODULE_FLAGS) @STATIC_MODULES_FALSE@m_admin_la_LDFLAGS = -module $(MODULE_FLAGS) @STATIC_MODULES_FALSE@m_adminwall_la_LDFLAGS = -module $(MODULE_FLAGS) diff --git a/src/Makefile.am b/src/Makefile.am index 28fdfc2c..e143df25 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,10 +18,6 @@ version.c: version.c.SH ../CREDITS ../include/version.h ../include/serno.h $(CP) version.c version.c.last touch version.c.SH -if MINGW -EXTRA_FLAGS = -no-undefined -Wl,--enable-runtime-pseudo-reloc -export-symbols-regex '*' -endif - libcore_la_SOURCES = \ bandbi.c \ cache.c \ @@ -65,13 +61,8 @@ libcore_la_SOURCES = \ libcore_LTLIBRARIES = libcore.la libcore_la_LDFLAGS = $(EXTRA_FLAGS) -avoid-version -if MINGW -libcore_la_DEPENDENCIES = $(LIBLTDL) ../libratbox/src/libratbox.la -libcore_la_LIBADD = ../libratbox/src/libratbox.la $(LIBLTDL) @OpenSSL_LIBS@ @LIBJEMALLOC@ @LIBTCMALLOC@ -else libcore_la_DEPENDENCIES = ../libratbox/src/libratbox.la libcore_la_LIBADD = ../libratbox/src/libratbox.la $(LIBLTDL) @OpenSSL_LIBS@ @LIBJEMALLOC@ @LIBTCMALLOC@ -endif install-exec-hook: install-libcoreLTLIBRARIES diff --git a/src/Makefile.in b/src/Makefile.in index fef8cb43..56278824 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -417,7 +417,6 @@ AM_YFLAGS = -d AM_CFLAGS = $(WARNFLAGS) AM_CPPFLAGS = -I../libratbox/include $(LTDLINCL) @OpenSSL_CFLAGS@ @PICFLAGS@ BUILT_SOURCES = version.c -@MINGW_TRUE@EXTRA_FLAGS = -no-undefined -Wl,--enable-runtime-pseudo-reloc -export-symbols-regex '*' libcore_la_SOURCES = \ bandbi.c \ cache.c \ @@ -460,10 +459,8 @@ libcore_la_SOURCES = \ libcore_LTLIBRARIES = libcore.la libcore_la_LDFLAGS = $(EXTRA_FLAGS) -avoid-version -@MINGW_FALSE@libcore_la_DEPENDENCIES = ../libratbox/src/libratbox.la -@MINGW_TRUE@libcore_la_DEPENDENCIES = $(LIBLTDL) ../libratbox/src/libratbox.la -@MINGW_FALSE@libcore_la_LIBADD = ../libratbox/src/libratbox.la $(LIBLTDL) @OpenSSL_LIBS@ @LIBJEMALLOC@ @LIBTCMALLOC@ -@MINGW_TRUE@libcore_la_LIBADD = ../libratbox/src/libratbox.la $(LIBLTDL) @OpenSSL_LIBS@ @LIBJEMALLOC@ @LIBTCMALLOC@ +libcore_la_DEPENDENCIES = ../libratbox/src/libratbox.la +libcore_la_LIBADD = ../libratbox/src/libratbox.la $(LIBLTDL) @OpenSSL_LIBS@ @LIBJEMALLOC@ @LIBTCMALLOC@ all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am From 2feee84a7a4e01601430b15f8fdee70455674e13 Mon Sep 17 00:00:00 2001 From: Aaron Sethman Date: Tue, 27 Jan 2026 20:40:58 -0500 Subject: [PATCH 16/32] Stray fragments leftover from mingw cleanup --- src/sslproc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sslproc.c b/src/sslproc.c index 3ffb5fdc..d59583fb 100644 --- a/src/sslproc.c +++ b/src/sslproc.c @@ -242,7 +242,7 @@ start_ssldaemon(int count, const char *ssl_ca_cert, const char *ssl_cert, const if(access(fullpath, X_OK) == -1) { ilog(L_MAIN, - "Unable to execute ssld%s in %s/libexec/ircd-ratbox or %s", + "Unable to execute ssld%s in %s/libexec/ircd-ratbox", ConfigFileEntry.dpath, LIBEXEC_DIR); return 0; } From a93f70970aec08f2612014712e46149c7589726f Mon Sep 17 00:00:00 2001 From: Aaron Sethman Date: Tue, 27 Jan 2026 20:43:40 -0500 Subject: [PATCH 17/32] more windows removal --- include/setup.h.in | 9 --------- resolver/resolver.c | 4 ---- 2 files changed, 13 deletions(-) diff --git a/include/setup.h.in b/include/setup.h.in index b000751c..9d15dd6d 100644 --- a/include/setup.h.in +++ b/include/setup.h.in @@ -8,9 +8,6 @@ */ #undef CRAY_STACKSEG_END -/* This is a Cygwin system */ -#undef CYGWIN - /* Define to 1 if using `alloca.c'. */ #undef C_ALLOCA @@ -255,9 +252,6 @@ /* Define to the shared library suffix, say, ".dylib". */ #undef LT_SHARED_EXT -/* This is a MinGW system */ -#undef MINGW - /* Prefix where modules are installed. */ #undef MODULE_DIR @@ -351,9 +345,6 @@ /* Version number of package */ #undef VERSION -/* This is a Windows system */ -#undef WINDOWS - /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ #if defined AC_APPLE_UNIVERSAL_BUILD diff --git a/resolver/resolver.c b/resolver/resolver.c index 7fd3c4bf..047a3067 100644 --- a/resolver/resolver.c +++ b/resolver/resolver.c @@ -52,7 +52,6 @@ struct dns_request }; -#ifndef WINDOWS static void dummy_handler(int sig) { @@ -64,13 +63,11 @@ rehash(int sig) { do_rehash = 1; } -#endif static void setup_signals(void) { -#ifndef WINDOWS struct sigaction act; act.sa_flags = 0; @@ -102,7 +99,6 @@ setup_signals(void) act.sa_handler = rehash; sigaddset(&act.sa_mask, SIGHUP); sigaction(SIGHUP, &act, NULL); -#endif } From c31068a95229255b142e09ab71ca700b20b86cdb Mon Sep 17 00:00:00 2001 From: Aaron Sethman Date: Wed, 28 Jan 2026 07:00:55 -0500 Subject: [PATCH 18/32] make includes for mbedtls in <> --- libratbox/src/mbedtls.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libratbox/src/mbedtls.c b/libratbox/src/mbedtls.c index b58e4675..5c5fceb2 100644 --- a/libratbox/src/mbedtls.c +++ b/libratbox/src/mbedtls.c @@ -28,16 +28,16 @@ #include "commio-ssl.h" #ifdef HAVE_MBEDTLS -#include "mbedtls/entropy.h" -#include "mbedtls/ctr_drbg.h" -#include "mbedtls/certs.h" -#include "mbedtls/x509.h" -#include "mbedtls/ssl.h" -#include "mbedtls/net.h" -#include "mbedtls/error.h" -#include "mbedtls/debug.h" -#include "mbedtls/dhm.h" -#include "mbedtls/version.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include typedef struct _ssl_connect { From def8de70646da3fd2d23b2f350e956363d630f33 Mon Sep 17 00:00:00 2001 From: Aaron Sethman Date: Wed, 28 Jan 2026 07:26:52 -0500 Subject: [PATCH 19/32] There isn't any point in checking for positive return values for buf_to_uint32 as it will ALWAYS return value. Even then a zero could be a complete legit connection id, generally treat it as opaque. In the past when the connection ID was based on the file descriptor, this made sense, today, its just an incrementing uint32_t on the ircd side. --- ssld/ssld.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/ssld/ssld.c b/ssld/ssld.c index 41cd49c4..9898b47e 100644 --- a/ssld/ssld.c +++ b/ssld/ssld.c @@ -764,8 +764,7 @@ ssl_process_accept(mod_ctl_t * ctl, mod_ctl_buf_t * ctlb) } id = buf_to_uint32(&ctlb->buf[1]); - if(id > 0) - conn_add_id_hash(conn, id); + conn_add_id_hash(conn, id); SetSSL(conn); rb_ssl_attach_ctx_to_fde(ssl_server_ctx, conn->mod_fd); @@ -795,9 +794,8 @@ ssl_process_connect(mod_ctl_t * ctl, mod_ctl_buf_t * ctlb) } id = buf_to_uint32(&ctlb->buf[1]); - - if(id > 0) - conn_add_id_hash(conn, id); + conn_add_id_hash(conn, id); + SetSSL(conn); rb_ssl_attach_ctx_to_fde(ssl_client_ctx, conn->mod_fd); @@ -821,9 +819,6 @@ process_stats(mod_ctl_t * ctl, mod_ctl_buf_t * ctlb) id = buf_to_uint32(&ctlb->buf[1]); - if(id == 0) - return; - odata = &ctlb->buf[5]; conn = conn_find_by_id(id); @@ -1034,8 +1029,7 @@ send_nossl_support(mod_ctl_t * ctl, mod_ctl_buf_t * ctlb) } id = buf_to_uint32(&ctlb->buf[1]); - if(id > 0) - conn_add_id_hash(conn, id); + conn_add_id_hash(conn, id); close_conn(conn, WAIT_PLAIN, "libratbox reports no SSL/TLS support"); } mod_cmd_write_queue(ctl, nossl_cmd, strlen(nossl_cmd)); @@ -1064,8 +1058,7 @@ send_nozlib_support(mod_ctl_t * ctl, mod_ctl_buf_t * ctlb) } id = buf_to_uint32(&ctlb->buf[1]); - if(id > 0) - conn_add_id_hash(conn, id); + conn_add_id_hash(conn, id); close_conn(conn, WAIT_PLAIN, "libratbox reports no zlib support"); } mod_cmd_write_queue(ctl, nozlib_cmd, strlen(nozlib_cmd)); From e258cb95c4e3082e931d99379aa9b35076390cbc Mon Sep 17 00:00:00 2001 From: Aaron Sethman Date: Wed, 28 Jan 2026 08:23:42 -0500 Subject: [PATCH 20/32] more defensive checks --- ssld/ssld.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ssld/ssld.c b/ssld/ssld.c index 9898b47e..b5f07046 100644 --- a/ssld/ssld.c +++ b/ssld/ssld.c @@ -274,8 +274,9 @@ static conn_t * make_conn(mod_ctl_t * ctl, rb_fde_t *mod_fd, rb_fde_t *plain_fd) { conn_t *conn; - /* we need both, not just one..bail if NULL */ - if(mod_fd == NULL || plain_fd == NULL) + + /* we need all three, not just one..bail if any are NULL */ + if(ctl == NULL || mod_fd == NULL || plain_fd == NULL) return NULL; conn = rb_malloc(sizeof(conn_t)); From 032da1fe1be4e0ac38a809e2b3f36f86280588fd Mon Sep 17 00:00:00 2001 From: Aaron Sethman Date: Wed, 28 Jan 2026 08:51:40 -0500 Subject: [PATCH 21/32] If somebody is really running 32bit solaris and still needs rb_fd_hack back...let me know --- libratbox/src/commio.c | 33 ++------------------------------- 1 file changed, 2 insertions(+), 31 deletions(-) diff --git a/libratbox/src/commio.c b/libratbox/src/commio.c index 09162b15..53afd188 100644 --- a/libratbox/src/commio.c +++ b/libratbox/src/commio.c @@ -118,29 +118,6 @@ free_fds(void) } } -/* 32bit solaris is kinda slow and stdio only supports fds < 256 - * so we got to do this crap below. - * (BTW Fuck you Sun, I hate your guts and I hope you go bankrupt soon) - */ - -#if defined (__SVR4) && defined (__sun) -static void -rb_fd_hack(int *fd) -{ - int newfd; - if(*fd > 256 || *fd < 0) - return; - if((newfd = fcntl(*fd, F_DUPFD, 256)) != -1) - { - close(*fd); - *fd = newfd; - } - return; -} -#else -#define rb_fd_hack(fd) -#endif - /* close_all_connections() can be used *before* the system come up! */ @@ -348,8 +325,6 @@ rb_accept_tryaccept(rb_fde_t *F, void *data) return; } - rb_fd_hack(&new_fd); - new_F = rb_open(new_fd, RB_FD_SOCKET, "Incoming Connection"); if(new_F == NULL) @@ -580,9 +555,6 @@ rb_socketpair(int family, int sock_type, int proto, rb_fde_t **F1, rb_fde_t **F2 #endif return -1; - rb_fd_hack(&nfd[0]); - rb_fd_hack(&nfd[1]); - *F1 = rb_open(nfd[0], RB_FD_SOCKET, note); *F2 = rb_open(nfd[1], RB_FD_SOCKET, note); @@ -631,8 +603,7 @@ rb_pipe(rb_fde_t **F1, rb_fde_t **F2, const char *desc) } if(pipe(fd) == -1) return -1; - rb_fd_hack(&fd[0]); - rb_fd_hack(&fd[1]); + *F1 = rb_open(fd[0], RB_FD_PIPE, desc); *F2 = rb_open(fd[1], RB_FD_PIPE, desc); @@ -681,7 +652,7 @@ rb_socket(int family, int sock_type, int proto, const char *note) * XXX !!! -- adrian */ fd = socket(family, sock_type, proto); - rb_fd_hack(&fd); + if(rb_unlikely(fd < 0)) return NULL; /* errno will be passed through, yay.. */ From f6cddad775325d7cc62260f9828b3ca757d053a7 Mon Sep 17 00:00:00 2001 From: Aaron Sethman Date: Wed, 28 Jan 2026 09:27:30 -0500 Subject: [PATCH 22/32] Remove some more legacy code. Assume O_NONBLOCK always exist(what doesn't have O_NONBLOCK today? Remove socketpair over AF_INET hack, that was for windows support, also gone. If HAVE_SOCKETPAIR fails, you just error out and get no ssld/ziplinks support. --- libratbox/src/commio.c | 234 ++--------------------------------------- 1 file changed, 6 insertions(+), 228 deletions(-) diff --git a/libratbox/src/commio.c b/libratbox/src/commio.c index 53afd188..3d5fecfb 100644 --- a/libratbox/src/commio.c +++ b/libratbox/src/commio.c @@ -214,17 +214,11 @@ rb_set_nb(rb_fde_t *F) if((res = rb_setup_fd(F))) return res; -#ifdef O_NONBLOCK + nonb |= O_NONBLOCK; res = fcntl(fd, F_GETFL, 0); if(-1 == res || fcntl(fd, F_SETFL, res | nonb) == -1) return 0; -#else - nonb = 1; - res = 0; - if(ioctl(fd, FIONBIO, (char *)&nonb) == -1) - return 0; -#endif return 1; } @@ -532,10 +526,10 @@ rb_errstr(int error) return rb_err_str[error]; } - int rb_socketpair(int family, int sock_type, int proto, rb_fde_t **F1, rb_fde_t **F2, const char *note) { +#ifdef HAVE_SOCKETPAIR int nfd[2]; if(number_fd >= rb_maxconnections) { @@ -543,16 +537,7 @@ rb_socketpair(int family, int sock_type, int proto, rb_fde_t **F1, rb_fde_t **F2 return -1; } -#ifdef HAVE_SOCKETPAIR if(socketpair(family, sock_type, proto, nfd)) -#else - if(sock_type == SOCK_DGRAM) - { - return rb_inet_socketpair_udp(F1, F2); - } - - if(rb_inet_socketpair(AF_INET, sock_type, proto, nfd)) -#endif return -1; *F1 = rb_open(nfd[0], RB_FD_SOCKET, note); @@ -589,6 +574,10 @@ rb_socketpair(int family, int sock_type, int proto, rb_fde_t **F1, rb_fde_t **F2 } return 0; +#else + errno = EOPNOTSUPP; + return -1; +#endif } @@ -1444,197 +1433,6 @@ rb_inet_ntop_sock(struct sockaddr *src, char *dst, rb_socklen_t size) } } -#ifndef HAVE_SOCKETPAIR - -/* mostly based on perl's emulation of socketpair udp */ -static int -rb_inet_socketpair_udp(rb_fde_t **newF1, rb_fde_t **newF2) -{ - struct sockaddr_in addr[2]; - rb_socklen_t size = sizeof(struct sockaddr_in); - rb_fde_t *F[2]; - unsigned int fd[2]; - int i, got; - unsigned short port; - - memset(&addr, 0, sizeof(addr)); - - for(i = 0; i < 2; i++) - { - F[i] = rb_socket(AF_INET, SOCK_DGRAM, 0, "udp socketpair"); - if(F[i] == NULL) - goto failed; - addr[i].sin_family = AF_INET; - addr[i].sin_addr.s_addr = htonl(INADDR_LOOPBACK); - addr[i].sin_port = 0; - if(bind(rb_get_fd(F[i]), (struct sockaddr *)&addr[i], sizeof(struct sockaddr_in))) - goto failed; - fd[i] = rb_get_fd(F[i]); - } - - for(i = 0; i < 2; i++) - { - if(getsockname(fd[i], (struct sockaddr *)&addr[i], &size)) - goto failed; - if(size != sizeof(struct sockaddr_in)) - goto failed; - if(connect(fd[!i], (struct sockaddr *)&addr[i], sizeof(struct sockaddr_in)) == -1) - goto failed; - } - - for(i = 0; i < 2; i++) - { - port = addr[i].sin_port; - got = rb_write(F[i], &port, sizeof(port)); - if(got != sizeof(port)) - { - if(got == -1) - goto failed; - goto abort_failed; - } - } - - - struct timeval wait = { 0, 100000 }; - - int max = fd[1] > fd[0] ? fd[1] : fd[0]; - fd_set rset; - FD_ZERO(&rset); - FD_SET(fd[0], &rset); - FD_SET(fd[1], &rset); - got = select(max + 1, &rset, NULL, NULL, &wait); - if(got != 2 || !FD_ISSET(fd[0], &rset) || !FD_ISSET(fd[1], &rset)) - { - if(got == -1) - goto failed; - goto abort_failed; - } - - struct sockaddr_in readfrom; - unsigned short buf[2]; - for(i = 0; i < 2; i++) - { - int flag = 0; -#ifdef MSG_DONTWAIT - flag = MSG_DONTWAIT; -#endif - got = recvfrom(rb_get_fd(F[i]), (char *)&buf, sizeof(buf), flag, - (struct sockaddr *)&readfrom, &size); - if(got == -1) - goto failed; - if(got != sizeof(port) - || size != sizeof(struct sockaddr_in) - || buf[0] != (unsigned short)addr[!i].sin_port - || readfrom.sin_family != addr[!i].sin_family - || readfrom.sin_addr.s_addr != addr[!i].sin_addr.s_addr - || readfrom.sin_port != addr[!i].sin_port) - goto abort_failed; - } - - *newF1 = F[0]; - *newF2 = F[1]; - return 0; - - abort_failed: - errno = ECONNABORTED; - failed: - int o_errno = errno; - if(F[0] != NULL) - rb_close(F[0]); - if(F[1] != NULL) - rb_close(F[1]); - errno = o_errno; - return -1; -} - - -int -rb_inet_socketpair(int family, int type, int protocol, int fd[2]) -{ - int listener = -1; - int connector = -1; - int acceptor = -1; - struct sockaddr_in listen_addr; - struct sockaddr_in connect_addr; - rb_socklen_t size; - - if(protocol || family != AF_INET) - { - errno = EAFNOSUPPORT; - return -1; - } - if(!fd) - { - errno = EINVAL; - return -1; - } - - listener = socket(AF_INET, type, 0); - if(listener == -1) - return -1; - memset(&listen_addr, 0, sizeof(listen_addr)); - listen_addr.sin_family = AF_INET; - listen_addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); - listen_addr.sin_port = 0; /* kernel choses port. */ - if(bind(listener, (struct sockaddr *)&listen_addr, sizeof(listen_addr)) == -1) - goto tidy_up_and_fail; - if(listen(listener, 1) == -1) - goto tidy_up_and_fail; - - connector = socket(AF_INET, type, 0); - if(connector == -1) - goto tidy_up_and_fail; - /* We want to find out the port number to connect to. */ - size = sizeof(connect_addr); - if(getsockname(listener, (struct sockaddr *)&connect_addr, &size) == -1) - goto tidy_up_and_fail; - if(size != sizeof(connect_addr)) - goto abort_tidy_up_and_fail; - if(connect(connector, (struct sockaddr *)&connect_addr, sizeof(connect_addr)) == -1) - goto tidy_up_and_fail; - - size = sizeof(listen_addr); - acceptor = accept(listener, (struct sockaddr *)&listen_addr, &size); - if(acceptor == -1) - goto tidy_up_and_fail; - if(size != sizeof(listen_addr)) - goto abort_tidy_up_and_fail; - close(listener); - /* Now check we are talking to ourself by matching port and host on the - two sockets. */ - if(getsockname(connector, (struct sockaddr *)&connect_addr, &size) == -1) - goto tidy_up_and_fail; - if(size != sizeof(connect_addr) - || listen_addr.sin_family != connect_addr.sin_family - || listen_addr.sin_addr.s_addr != connect_addr.sin_addr.s_addr - || listen_addr.sin_port != connect_addr.sin_port) - { - goto abort_tidy_up_and_fail; - } - fd[0] = connector; - fd[1] = acceptor; - return 0; - - abort_tidy_up_and_fail: - errno = EINVAL; /* I hope this is portable and appropriate. */ - - tidy_up_and_fail: - { - int save_errno = errno; - if(listener != -1) - close(listener); - if(connector != -1) - close(connector); - if(acceptor != -1) - close(acceptor); - errno = save_errno; - return -1; - } -} - -#endif - - static void (*setselect_handler) (rb_fde_t *, unsigned int, PF *, void *); static int (*select_handler) (long); static int (*setup_fd_handler) (rb_fde_t *); @@ -1655,26 +1453,6 @@ rb_unsupported_event(void) { return 0; } -#if 0 -static int -try_libevent(void) -{ - return -1; - if(!rb_init_netio_libevent()) - { - setselect_handler = rb_setselect_libevent; - select_handler = rb_select_libevent; - setup_fd_handler = rb_setup_fd_libevent; - io_sched_event = rb_libevent_sched_event; - io_unsched_event = rb_libevent_unsched_event; - io_supports_event = rb_libevent_supports_event; - io_init_event = rb_libevent_init_event; - rb_strlcpy(iotype, "libevent", sizeof(iotype)); - return 0; - } - return -1; -} -#endif static int try_kqueue(void) From c08738613a6b5ec050c36317d20f8452bee9b030 Mon Sep 17 00:00:00 2001 From: Aaron Sethman Date: Wed, 28 Jan 2026 11:09:15 -0500 Subject: [PATCH 23/32] in rb_zstring_deserialize, return the amount of data consumed --- libratbox/src/rb_tools.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libratbox/src/rb_tools.c b/libratbox/src/rb_tools.c index a6cc4399..969bc9f9 100644 --- a/libratbox/src/rb_tools.c +++ b/libratbox/src/rb_tools.c @@ -164,7 +164,7 @@ ssize_t rb_zstring_deserialize(rb_zstring_t *zs, void *buf) if(zs->len == 0) { zs->data = NULL; - return -1; + return sizeof(uint16_t); // we return the amount we consumed } zs->data = rb_malloc(zs->len); memcpy(zs->data, p, zs->len); From df4d0755867d07f2ec3a9a6485b86e3aa859278a Mon Sep 17 00:00:00 2001 From: Aaron Sethman Date: Wed, 28 Jan 2026 11:09:24 -0500 Subject: [PATCH 24/32] cacert being NULL is a valid option --- ssld/ssld.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ssld/ssld.c b/ssld/ssld.c index b5f07046..c9ed51aa 100644 --- a/ssld/ssld.c +++ b/ssld/ssld.c @@ -953,10 +953,6 @@ ssl_new_keys(mod_ctl_t * ctl, mod_ctl_buf_t * ctl_buf) goto invalid; cacert = advance_zstring(&p); - - if(cacert == NULL) - goto invalid; - cert = advance_zstring(&p); if(cert == NULL) goto invalid; From be3998badb004bf2f7127bb008a5fc5fe4b64f10 Mon Sep 17 00:00:00 2001 From: Aaron Sethman Date: Wed, 28 Jan 2026 11:14:12 -0500 Subject: [PATCH 25/32] whitespace cleanup --- ssld/ssld.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/ssld/ssld.c b/ssld/ssld.c index c9ed51aa..7d826c6d 100644 --- a/ssld/ssld.c +++ b/ssld/ssld.c @@ -837,7 +837,6 @@ process_stats(mod_ctl_t * ctl, mod_ctl_buf_t * ctlb) #ifdef HAVE_ZLIB - static void zlib_process(mod_ctl_t * ctl, mod_ctl_buf_t * ctlb) { @@ -922,7 +921,6 @@ static char *advance_zstring(uint8_t **p) rb_zstring_free(zs); return NULL; } - *p += l; if(rb_zstring_len(zs) == 0) From 61a5482861c0b573256f78fa94ea3877c6863319 Mon Sep 17 00:00:00 2001 From: Aaron Sethman Date: Wed, 28 Jan 2026 11:18:59 -0500 Subject: [PATCH 26/32] move rb_ignore_errno to include/rb_commio.h and make it inline --- libratbox/include/rb_commio.h | 32 +++++++++++++++++++++++++++++++- libratbox/src/commio.c | 34 ---------------------------------- libratbox/src/export-syms.txt | 1 - 3 files changed, 31 insertions(+), 36 deletions(-) diff --git a/libratbox/include/rb_commio.h b/libratbox/include/rb_commio.h index 2102c5ac..f61f2225 100644 --- a/libratbox/include/rb_commio.h +++ b/libratbox/include/rb_commio.h @@ -147,7 +147,37 @@ const char *rb_inet_ntop(int af, void *src, char *dst, rb_socklen_t len); int rb_getmaxconnect(void); -int rb_ignore_errno(int); + + +static inline int +rb_ignore_errno(int error) +{ + switch (error) + { +#ifdef EINPROGRESS + case EINPROGRESS: +#endif +#if defined EWOULDBLOCK + case EWOULDBLOCK: +#endif +#if defined(EAGAIN) && (EWOULDBLOCK != EAGAIN) + case EAGAIN: +#endif +#ifdef EINTR + case EINTR: +#endif +#ifdef ERESTART + case ERESTART: +#endif +#ifdef ENOBUFS + case ENOBUFS: +#endif + return 1; + default: + break; + } + return 0; +} /* Generic wrappers */ void rb_setselect(rb_fde_t *, unsigned int type, PF * handler, void *client_data); diff --git a/libratbox/src/commio.c b/libratbox/src/commio.c index 3d5fecfb..1bc3abbc 100644 --- a/libratbox/src/commio.c +++ b/libratbox/src/commio.c @@ -1684,40 +1684,6 @@ rb_setup_fd(rb_fde_t *F) { return setup_fd_handler(F); } - - - -int -rb_ignore_errno(int error) -{ - switch (error) - { -#ifdef EINPROGRESS - case EINPROGRESS: -#endif -#if defined EWOULDBLOCK - case EWOULDBLOCK: -#endif -#if defined(EAGAIN) && (EWOULDBLOCK != EAGAIN) - case EAGAIN: -#endif -#ifdef EINTR - case EINTR: -#endif -#ifdef ERESTART - case ERESTART: -#endif -#ifdef ENOBUFS - case ENOBUFS: -#endif - return 1; - default: - break; - } - return 0; -} - - #if defined(HAVE_SENDMSG) ssize_t rb_recv_fd_buf(rb_fde_t *F, void *data, size_t datasize, rb_fde_t **xF, unsigned int nfds) diff --git a/libratbox/src/export-syms.txt b/libratbox/src/export-syms.txt index a10428bc..dd161093 100644 --- a/libratbox/src/export-syms.txt +++ b/libratbox/src/export-syms.txt @@ -54,7 +54,6 @@ rb_helper_start rb_helper_write rb_helper_write_flush rb_helper_write_queue -rb_ignore_errno rb_inet_ntop_sock rb_inet_pton_sock rb_init_netio From 96cb16adb7d34608d69c3734428be2b90dc0fedd Mon Sep 17 00:00:00 2001 From: Aaron Sethman Date: Wed, 28 Jan 2026 11:38:59 -0500 Subject: [PATCH 27/32] Pass a value of seconds to TCP_DEFER_ACCEPT rather than using the backlog parameter --- libratbox/src/commio.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libratbox/src/commio.c b/libratbox/src/commio.c index 1bc3abbc..cfcc5e8a 100644 --- a/libratbox/src/commio.c +++ b/libratbox/src/commio.c @@ -722,7 +722,8 @@ rb_listen(rb_fde_t *F, int backlog, bool defer_accept) #ifdef TCP_DEFER_ACCEPT if(defer_accept == true && result == 0) { - setsockopt(F->fd, IPPROTO_TCP, TCP_DEFER_ACCEPT, &backlog, sizeof(int)); + int defer_seconds = 3; + setsockopt(F->fd, IPPROTO_TCP, TCP_DEFER_ACCEPT, &defer_seconds, sizeof(defer_seconds)); } #endif #ifdef SO_ACCEPTFILTER From d97c193bf0c0a111930d1bf80d566eb97c6cf955 Mon Sep 17 00:00:00 2001 From: Aaron Sethman Date: Wed, 28 Jan 2026 11:48:26 -0500 Subject: [PATCH 28/32] Stop trying to send if rb_write() returns a partial write in rb_fake_writev --- libratbox/src/commio.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libratbox/src/commio.c b/libratbox/src/commio.c index cfcc5e8a..25ee069a 100644 --- a/libratbox/src/commio.c +++ b/libratbox/src/commio.c @@ -975,6 +975,9 @@ rb_fake_writev(rb_fde_t *F, const struct rb_iovec *vp, int vpcount) return written; } count += written; + + if(written < vp->iov_len) + break; vp++; } return (count); From 0b50724be4082658d3d82171707703cef533819e Mon Sep 17 00:00:00 2001 From: Aaron Sethman Date: Wed, 28 Jan 2026 14:57:49 -0500 Subject: [PATCH 29/32] rawbuf cleanups --- libratbox/src/rawbuf.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/libratbox/src/rawbuf.c b/libratbox/src/rawbuf.c index 252c0928..25f3859b 100644 --- a/libratbox/src/rawbuf.c +++ b/libratbox/src/rawbuf.c @@ -171,48 +171,41 @@ rb_rawbuf_flush(rb_rawbuf_head_t * rb, rb_fde_t *F) return retval; } +#ifndef IRCD_MIN +#define IRCD_MIN(a, b) ((a) < (b) ? (a) : (b)) +#endif void -rb_rawbuf_append(rb_rawbuf_head_t * rb, void *data, size_t len) +rb_rawbuf_append(rb_rawbuf_head_t * rb, void *in, size_t len) { rb_rawbuf_t *buf = NULL; size_t clen; void *ptr; + uint8_t *data = in; + if(rb->list.tail != NULL) buf = rb->list.tail->data; - if(buf != NULL && buf->len < RAWBUF_SIZE && buf->flushing == false) + if(buf != NULL && buf->len < sizeof(buf->data) && buf->flushing == false) { - buf = (rb_rawbuf_t *) rb->list.tail->data; - clen = RAWBUF_SIZE - buf->len; - ptr = (void *)(buf->data + buf->len); - if(len < clen) - clen = len; - + ptr = (void *)((uintptr_t)buf->data + buf->len); + clen = IRCD_MIN((sizeof(buf->data) - buf->len), len); memcpy(ptr, data, clen); buf->len += clen; rb->len += clen; len -= clen; - if(len == 0) - return; - data = (char *)data + clen; - + data = (data + clen); } while(len > 0) { buf = rb_rawbuf_newbuf(rb); - - if(len >= RAWBUF_SIZE) - clen = RAWBUF_SIZE; - else - clen = len; - + clen = IRCD_MIN(sizeof(buf->data), len); memcpy(buf->data, data, clen); buf->len += clen; - len -= clen; - data = (char *)data + clen; rb->len += clen; + len -= clen; + data = (data + clen); } } From 57c6d3fa66be54e59105b1b4108fbd40de4d0c41 Mon Sep 17 00:00:00 2001 From: Aaron Sethman Date: Wed, 28 Jan 2026 16:03:32 -0500 Subject: [PATCH 30/32] Default most sockets/files to close on exec where possible. --- libratbox/configure | 2 +- libratbox/configure.ac | 2 +- libratbox/include/libratbox_config.h.in | 30 ++++------ libratbox/include/rb_commio.h | 1 + libratbox/src/commio.c | 76 ++++++++++++++++++++++++- libratbox/src/epoll.c | 11 +++- libratbox/src/export-syms.txt | 1 + libratbox/src/helper.c | 3 + libratbox/src/kqueue.c | 5 ++ src/cache.c | 2 +- src/ircd.c | 4 +- src/ircd_lexer.c | 4 +- src/ircd_lexer.l | 4 +- src/newconf.c | 2 +- src/s_log.c | 6 +- src/sslproc.c | 2 + 16 files changed, 120 insertions(+), 35 deletions(-) diff --git a/libratbox/configure b/libratbox/configure index c8c7c222..c4a41b7a 100755 --- a/libratbox/configure +++ b/libratbox/configure @@ -14052,7 +14052,7 @@ fi -for ac_func in snprintf vsnprintf socketpair gettimeofday writev sendmsg gmtime_r strtok_r usleep posix_spawn strdup strndup strlcpy strlcat strnlen fstat signalfd select poll kevent port_create epoll_ctl arc4random getrusage timerfd_create +for ac_func in snprintf vsnprintf socketpair gettimeofday writev sendmsg gmtime_r strtok_r usleep posix_spawn strdup strndup strlcpy strlcat strnlen fstat signalfd select poll kevent kqueue1 port_create epoll_ctl epoll_create1 arc4random getrusage timerfd_create accept4 pipe2 do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" diff --git a/libratbox/configure.ac b/libratbox/configure.ac index 8857d2b3..b8f84571 100644 --- a/libratbox/configure.ac +++ b/libratbox/configure.ac @@ -295,7 +295,7 @@ AC_CHECK_TYPE([sa_family_t], [], dnl check for various functions... -AC_CHECK_FUNCS([snprintf vsnprintf socketpair gettimeofday writev sendmsg gmtime_r strtok_r usleep posix_spawn strdup strndup strlcpy strlcat strnlen fstat signalfd select poll kevent port_create epoll_ctl arc4random getrusage timerfd_create]) +AC_CHECK_FUNCS([snprintf vsnprintf socketpair gettimeofday writev sendmsg gmtime_r strtok_r usleep posix_spawn strdup strndup strlcpy strlcat strnlen fstat signalfd select poll kevent kqueue1 port_create epoll_ctl epoll_create1 arc4random getrusage timerfd_create accept4 pipe2]) AC_SEARCH_LIBS(nanosleep, rt posix4, AC_DEFINE(HAVE_NANOSLEEP, 1, [Define if you have nanosleep])) AC_SEARCH_LIBS(timer_create, rt, AC_DEFINE(HAVE_TIMER_CREATE, 1, [Define if you have timer_create])) diff --git a/libratbox/include/libratbox_config.h.in b/libratbox/include/libratbox_config.h.in index a65e664c..c3c2f4e4 100644 --- a/libratbox/include/libratbox_config.h.in +++ b/libratbox/include/libratbox_config.h.in @@ -5,12 +5,12 @@ */ #undef CRAY_STACKSEG_END -/* This is a Cygwin system */ -#undef CYGWIN - /* Define to 1 if using `alloca.c'. */ #undef C_ALLOCA +/* Define to 1 if you have the `accept4' function. */ +#undef HAVE_ACCEPT4 + /* Define to 1 if you have `alloca', as a function or macro. */ #undef HAVE_ALLOCA @@ -33,6 +33,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H +/* Define to 1 if you have the `epoll_create1' function. */ +#undef HAVE_EPOLL_CREATE1 + /* Define to 1 if you have the `epoll_ctl' function. */ #undef HAVE_EPOLL_CTL @@ -66,6 +69,9 @@ /* Define to 1 if you have the `kevent' function. */ #undef HAVE_KEVENT +/* Define to 1 if you have the `kqueue1' function. */ +#undef HAVE_KQUEUE1 + /* Define if you have jemalloc */ #undef HAVE_LIBJEMALLOC @@ -96,6 +102,9 @@ /* Has OpenSSL */ #undef HAVE_OPENSSL +/* Define to 1 if you have the `pipe2' function. */ +#undef HAVE_PIPE2 + /* Define to 1 if you have the `poll' function. */ #undef HAVE_POLL @@ -231,12 +240,6 @@ /* Define to 1 if you have the `vsnprintf' function. */ #undef HAVE_VSNPRINTF -/* Have WINSOCK_H */ -#undef HAVE_WINSOCK2_H - -/* Have WINSOCK_H */ -#undef HAVE_WINSOCK_H - /* Define to 1 if `fork' works. */ #undef HAVE_WORKING_FORK @@ -246,15 +249,9 @@ /* Define to 1 if you have the `writev' function. */ #undef HAVE_WRITEV -/* Have WS2TCPIP_H */ -#undef HAVE_WS2TCPIP_H - /* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR -/* This is a MinGW system */ -#undef MINGW - /* Define this to disable debugging support. */ #undef NDEBUG @@ -348,9 +345,6 @@ /* Version number of package */ #undef VERSION -/* This is a Windows system */ -#undef WINDOWS - /* Define to 1 if on MINIX. */ #undef _MINIX diff --git a/libratbox/include/rb_commio.h b/libratbox/include/rb_commio.h index f61f2225..870c6bc2 100644 --- a/libratbox/include/rb_commio.h +++ b/libratbox/include/rb_commio.h @@ -111,6 +111,7 @@ void rb_note(rb_fde_t *, const char *); #define RB_SSL_CERTFP_LEN 32 int rb_set_nb(rb_fde_t *); +int rb_set_cloexec(rb_fde_t *, bool); int rb_set_buffers(rb_fde_t *, int); int rb_get_sockerr(rb_fde_t *); diff --git a/libratbox/src/commio.c b/libratbox/src/commio.c index 25ee069a..3837c92e 100644 --- a/libratbox/src/commio.c +++ b/libratbox/src/commio.c @@ -223,6 +223,46 @@ rb_set_nb(rb_fde_t *F) return 1; } +static int rb_fd_set_cloexec(int fd, bool doclose) +{ +#if defined(FD_CLOEXEC) && defined(F_GETFD) && defined(F_SETFD) + int res; + res = fcntl(fd, F_GETFD, 0); + if(res == -1) + return 0; + + if(doclose == true) + res |= FD_CLOEXEC; + else + res &= ~FD_CLOEXEC; + + if(fcntl(fd, F_SETFD, res) == -1) + return 0; + + return 1; +#endif + return 1; +} + + +/* + * + * rb_set_cloexec - Set / Clear close-on-exec + */ +int +rb_set_cloexec(rb_fde_t *F, bool doclose) +{ + int res; + int fd; + if(F == NULL) + return 0; + + fd = F->fd; + + return rb_fd_set_cloexec(fd, doclose); +} + + /* * rb_settimeout() - set the socket timeout * @@ -312,13 +352,20 @@ rb_accept_tryaccept(rb_fde_t *F, void *data) while(1) { +#ifdef HAVE_ACCEPT4 + new_fd = accept4(F->fd, (struct sockaddr *)&st, &addrlen, SOCK_NONBLOCK | SOCK_CLOEXEC); +#else new_fd = accept(F->fd, (struct sockaddr *)&st, &addrlen); +#endif + if(new_fd < 0) { rb_setselect(F, RB_SELECT_ACCEPT, rb_accept_tryaccept, NULL); return; } - +#ifndef HAVE_ACCEPT4 + rb_fd_set_cloexec(new_fd); +#endif new_F = rb_open(new_fd, RB_FD_SOCKET, "Incoming Connection"); if(new_F == NULL) @@ -537,9 +584,20 @@ rb_socketpair(int family, int sock_type, int proto, rb_fde_t **F1, rb_fde_t **F2 return -1; } +#if defined(SOCK_CLOEXEC) + /* this of course means the caller when passing the second FD to something + * must change this back to allowing passing on exec + */ + sock_type |= SOCK_CLOEXEC; +#endif if(socketpair(family, sock_type, proto, nfd)) return -1; +#if !defined(SOCK_CLOEXEC) + rb_fd_set_cloexec(nfd[0], true); + rb_fd_set_cloexec(nfd[1], true); +#endif + *F1 = rb_open(nfd[0], RB_FD_SOCKET, note); *F2 = rb_open(nfd[1], RB_FD_SOCKET, note); @@ -590,9 +648,17 @@ rb_pipe(rb_fde_t **F1, rb_fde_t **F2, const char *desc) errno = ENFILE; return -1; } +#if defined(HAVE_PIPE2) && defined(O_CLOEXEC) + if(pipe2(fd, O_NONBLOCK | O_CLOEXEC) == -1) +#else if(pipe(fd) == -1) +#endif return -1; +#if !defined(HAVE_PIPE2) + rb_fd_set_cloexec(fd[0], true); + rb_fd_set_cloexec(fd[1], true); +#endif *F1 = rb_open(fd[0], RB_FD_PIPE, desc); *F2 = rb_open(fd[1], RB_FD_PIPE, desc); @@ -635,6 +701,10 @@ rb_socket(int family, int sock_type, int proto, const char *note) return NULL; } +#if defined(SOCK_CLOEXEC) + sock_type |= SOCK_CLOEXEC; +#endif + /* * Next, we try to open the socket. We *should* drop the reserved FD * limit if/when we get an error, but we can deal with that later. @@ -645,6 +715,10 @@ rb_socket(int family, int sock_type, int proto, const char *note) if(rb_unlikely(fd < 0)) return NULL; /* errno will be passed through, yay.. */ +#if !defined(SOCK_CLOEXEC) + rb_fd_set_cloexec(fd, true); +#endif + #if defined(RB_IPV6) && defined(IPV6_V6ONLY) /* * Make sure we can take both IPv4 and IPv6 connections diff --git a/libratbox/src/epoll.c b/libratbox/src/epoll.c index 82fb1ec8..87a47a37 100644 --- a/libratbox/src/epoll.c +++ b/libratbox/src/epoll.c @@ -70,7 +70,11 @@ rb_init_netio_epoll(void) can_do_timerfd = 0; ep_info = rb_malloc(sizeof(struct epoll_info)); ep_info->pfd_size = getdtablesize(); +#if defined(HAVE_EPOLL_CREATE1) && defined(EPOLL_CLOEXEC) + ep_info->ep = epoll_create1(EPOLL_CLOEXEC); +#else ep_info->ep = epoll_create(ep_info->pfd_size); +#endif if(ep_info->ep < 0) { return -1; @@ -259,6 +263,7 @@ rb_epoll_supports_event(void) struct sigevent ev; struct stat st; int fd; + int flags = 0; sigset_t set; if(can_do_event == 1) @@ -275,7 +280,7 @@ rb_epoll_supports_event(void) } #ifdef USE_TIMERFD_CREATE - if((fd = timerfd_create(CLOCK_REALTIME, 0)) >= 0) + if((fd = timerfd_create(CLOCK_REALTIME, TFD_CLOEXEC)) >= 0) { close(fd); can_do_event = 1; @@ -293,7 +298,7 @@ rb_epoll_supports_event(void) } timer_delete(timer); sigemptyset(&set); - fd = signalfd(-1, &set, 0); + fd = signalfd(-1, &set, SFD_CLOEXEC); if(fd < 0) { can_do_event = -1; @@ -475,7 +480,7 @@ rb_epoll_sched_event_timerfd(rb_ev_entry *event, time_t when) int fd; rb_fde_t *F; - if((fd = timerfd_create(CLOCK_REALTIME, 0)) < 0) + if((fd = timerfd_create(CLOCK_REALTIME, TFD_CLOEXEC)) < 0) { rb_lib_log("timerfd_create: %s\n", strerror(errno)); return 0; diff --git a/libratbox/src/export-syms.txt b/libratbox/src/export-syms.txt index dd161093..d669f2cb 100644 --- a/libratbox/src/export-syms.txt +++ b/libratbox/src/export-syms.txt @@ -119,6 +119,7 @@ rb_setselect rb_set_time rb_settimeout rb_set_type +rb_set_cloexec rb_setup_fd rb_setup_ssl_server rb_sleep diff --git a/libratbox/src/helper.c b/libratbox/src/helper.c index 7e53c3e2..3a776cc5 100644 --- a/libratbox/src/helper.c +++ b/libratbox/src/helper.c @@ -128,6 +128,9 @@ rb_helper_start(const char *name, const char *fullpath, rb_helper_cb * read_cb, return NULL; } + rb_set_cloexec(in_f[1], false); + rb_set_cloexec(out_f[0], false); + snprintf(fx, sizeof(fx), "%d", rb_get_fd(in_f[1])); snprintf(fy, sizeof(fy), "%d", rb_get_fd(out_f[0])); diff --git a/libratbox/src/kqueue.c b/libratbox/src/kqueue.c index 148d6b15..baf9c7c5 100644 --- a/libratbox/src/kqueue.c +++ b/libratbox/src/kqueue.c @@ -147,7 +147,12 @@ kq_update_events(rb_fde_t *F, short filter, PF * handler) int rb_init_netio_kqueue(void) { +#ifdef HAVE_KQUEUE1 + kq = kqueue1(O_CLOEXEC); +#else kq = kqueue(); +#endif + if(kq < 0) { return errno; diff --git a/src/cache.c b/src/cache.c index 4dace0ba..fd98d1c9 100644 --- a/src/cache.c +++ b/src/cache.c @@ -114,7 +114,7 @@ cache_file(const char *filename, const char *shortname, int flags) if(filename == NULL || shortname == NULL) return NULL; - if((in = fopen(filename, "r")) == NULL) + if((in = fopen(filename, "re")) == NULL) return NULL; /* check and make sure we have something that is a file... */ diff --git a/src/ircd.c b/src/ircd.c index 9b0f2be3..5d506705 100644 --- a/src/ircd.c +++ b/src/ircd.c @@ -376,7 +376,7 @@ write_pidfile(const char *filename) { FILE *fb; char buff[32]; - if((fb = fopen(filename, "w"))) + if((fb = fopen(filename, "we"))) { unsigned int pid = (unsigned int)getpid(); @@ -411,7 +411,7 @@ check_pidfile(const char *filename) pid_t pidfromfile; /* Don't do logging here, since we don't have log() initialised */ - if((fb = fopen(filename, "r"))) + if((fb = fopen(filename, "re"))) { if(fgets(buff, sizeof(buff), fb) != NULL) { diff --git a/src/ircd_lexer.c b/src/ircd_lexer.c index 17dd9042..9f798423 100644 --- a/src/ircd_lexer.c +++ b/src/ircd_lexer.c @@ -1972,7 +1972,7 @@ void cinclude(void) { FILE *tmp_fbfile_in; - tmp_fbfile_in = fopen(c, "r"); + tmp_fbfile_in = fopen(c, "re"); if (tmp_fbfile_in == NULL) { @@ -1980,7 +1980,7 @@ void cinclude(void) char fnamebuf[IRCD_BUFSIZE]; snprintf(fnamebuf, sizeof(fnamebuf), "%s/%s", ETCPATH, c); - tmp_fbfile_in = fopen(fnamebuf, "r"); + tmp_fbfile_in = fopen(fnamebuf, "re"); /* wasnt found there either.. error. */ if(tmp_fbfile_in == NULL) diff --git a/src/ircd_lexer.l b/src/ircd_lexer.l index c726fb20..7967912b 100644 --- a/src/ircd_lexer.l +++ b/src/ircd_lexer.l @@ -197,7 +197,7 @@ void cinclude(void) { FILE *tmp_fbfile_in; - tmp_fbfile_in = fopen(c, "r"); + tmp_fbfile_in = fopen(c, "re"); if (tmp_fbfile_in == NULL) { @@ -205,7 +205,7 @@ void cinclude(void) char fnamebuf[IRCD_BUFSIZE]; snprintf(fnamebuf, sizeof(fnamebuf), "%s/%s", ETCPATH, c); - tmp_fbfile_in = fopen(fnamebuf, "r"); + tmp_fbfile_in = fopen(fnamebuf, "re"); /* wasnt found there either.. error. */ if(tmp_fbfile_in == NULL) diff --git a/src/newconf.c b/src/newconf.c index 01b91e4d..3df529f8 100644 --- a/src/newconf.c +++ b/src/newconf.c @@ -677,7 +677,7 @@ read_config_file(const char *filename) conf_parse_failure = false; delete_all_conf(); rb_strlcpy(conffilebuf, filename, sizeof(conffilebuf)); - if((conf_fbfile_in = fopen(filename, "r")) == NULL) + if((conf_fbfile_in = fopen(filename, "re")) == NULL) { conf_report_error_nl("Unable to open file %s %s", filename, strerror(errno)); return 1; diff --git a/src/s_log.c b/src/s_log.c index f48fc1ce..bbcfd692 100644 --- a/src/s_log.c +++ b/src/s_log.c @@ -122,7 +122,7 @@ init_main_logfile(const char *filename) verify_logfile_access(filename); if(log_main == NULL) { - log_main = fopen(filename, "a"); + log_main = fopen(filename, "ae"); } } @@ -133,7 +133,7 @@ open_logfiles(const char *filename) close_logfiles(); - log_main = fopen(filename, "a"); + log_main = fopen(filename, "ae"); /* log_main is handled above, so just do the rest */ for(i = 1; i < LAST_LOGFILE; i++) @@ -142,7 +142,7 @@ open_logfiles(const char *filename) if(!EmptyString(*log_table[i].name)) { verify_logfile_access(*log_table[i].name); - *log_table[i].logfile = fopen(*log_table[i].name, "a"); + *log_table[i].logfile = fopen(*log_table[i].name, "ae"); } } } diff --git a/src/sslproc.c b/src/sslproc.c index d59583fb..a171d0ba 100644 --- a/src/sslproc.c +++ b/src/sslproc.c @@ -263,6 +263,7 @@ start_ssldaemon(int count, const char *ssl_ca_cert, const char *ssl_cert, const } rb_set_buffers(F1, READBUF_SIZE*32); rb_set_buffers(F2, READBUF_SIZE*32); + rb_set_cloexec(F2, false); snprintf(fdarg, sizeof(fdarg), "%d", rb_get_fd(F2)); rb_setenv("CTL_FD", fdarg, 1); if(rb_pipe(&P1, &P2, "SSL/TLS pipe") == -1) @@ -270,6 +271,7 @@ start_ssldaemon(int count, const char *ssl_ca_cert, const char *ssl_cert, const ilog(L_MAIN, "Unable to create ssld - rb_pipe failed: %s", strerror(errno)); return started; } + rb_set_cloexec(P1, false); snprintf(fdarg, sizeof(fdarg), "%d", rb_get_fd(P1)); rb_setenv("CTL_PIPE", fdarg, 1); snprintf(s_pid, sizeof(s_pid), "%d", (int)getpid()); From d6f079d5bd5872cf010bbdc298f9392146d0f0aa Mon Sep 17 00:00:00 2001 From: Aaron Sethman Date: Wed, 28 Jan 2026 16:24:17 -0500 Subject: [PATCH 31/32] Use MSG_CMSG_CLOEXEC if we have it --- libratbox/src/commio.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libratbox/src/commio.c b/libratbox/src/commio.c index 3837c92e..86a1b082 100644 --- a/libratbox/src/commio.c +++ b/libratbox/src/commio.c @@ -76,11 +76,6 @@ static PF rb_connect_tryconnect; static void mangle_mapped_sockaddr(struct sockaddr *in); #endif -#ifndef HAVE_SOCKETPAIR -static int rb_inet_socketpair(int d, int type, int protocol, int sv[2]); -static int rb_inet_socketpair_udp(rb_fde_t **newF1, rb_fde_t **newF2); -#endif - static inline rb_fde_t * add_fd(int fd) { @@ -1773,6 +1768,7 @@ rb_recv_fd_buf(rb_fde_t *F, void *data, size_t datasize, rb_fde_t **xF, unsigned uint8_t stype = RB_FD_UNKNOWN; const char *desc; int fd; + int flags = 0; ssize_t len; size_t control_len = CMSG_SPACE(sizeof(int) * (size_t)nfds); uint8_t cbuf[control_len]; @@ -1789,7 +1785,11 @@ rb_recv_fd_buf(rb_fde_t *F, void *data, size_t datasize, rb_fde_t **xF, unsigned msg.msg_control = cmsg; msg.msg_controllen = control_len; - if((len = recvmsg(rb_get_fd(F), &msg, 0)) <= 0) +#ifdef MSG_CMSG_CLOEXEC + flags |= MSG_CMSG_CLOEXEC; +#endif + + if((len = recvmsg(rb_get_fd(F), &msg, flags)) <= 0) return -1; if(msg.msg_controllen > 0 && msg.msg_control != NULL From a0c2795b79f3bb6479cbfb4844298b8726727a1f Mon Sep 17 00:00:00 2001 From: Aaron Sethman Date: Wed, 28 Jan 2026 16:55:09 -0500 Subject: [PATCH 32/32] remove unused variable --- libratbox/src/epoll.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libratbox/src/epoll.c b/libratbox/src/epoll.c index 87a47a37..f35a7901 100644 --- a/libratbox/src/epoll.c +++ b/libratbox/src/epoll.c @@ -263,7 +263,6 @@ rb_epoll_supports_event(void) struct sigevent ev; struct stat st; int fd; - int flags = 0; sigset_t set; if(can_do_event == 1)