From 9eef930cdd69ce02320ef95e14193f8e801d4d62 Mon Sep 17 00:00:00 2001 From: Fish <> Date: Tue, 20 Jul 2004 11:55:27 +0000 Subject: [PATCH] new build directory layout --- .gitattributes | 582 ++- Makefile.am | 2 +- Makefile.in | 17 +- aclocal.m4 | 416 +- autotools/ax_path_lib_pcre.m4 | 4 +- configure | 3266 +------------- configure.in | 45 +- include/Makefile.in | 15 +- {src => include}/auth.h | 0 {src => include}/bans.h | 0 {src => include}/bots.h | 0 {src => include}/channels.h | 0 {src => include}/commands.h | 0 {src => include}/conf.h | 0 include/config.h.in | 173 +- {src => include}/configwin32.h | 0 {src => include}/dl.h | 0 {src => include}/dns.h | 0 {src => include}/dotconf.h | 0 {src => include}/events.h | 0 {src => include}/exclude.h | 0 {src => include}/hash.h | 0 {src => include}/ircd.h | 0 {src => include}/ircstring.h | 0 {src => include}/list.h | 0 {src => include}/log.h | 0 {src => include}/modules.h | 0 {src => include}/neostats.h | 0 {src => include}/ns_help.h | 0 {src => include}/numeric.h | 0 {src => include}/servers.h | 0 {src => include}/services.h | 0 {src => include}/signals.h | 0 {src => include}/sock.h | 0 {src => include}/support.h | 0 {src => include}/timer.h | 0 {src => include}/transfer.h | 0 {src => include}/users.h | 0 {src => lib}/adns/.indent.pro | 0 {src => lib}/adns/Makefile.am | 1 - {src => lib}/adns/Makefile.in | 20 +- {src => lib}/adns/adns.h | 0 {src => lib}/adns/check.c | 0 {src => lib}/adns/dlist.h | 0 {src => lib}/adns/event.c | 0 {src => lib}/adns/general.c | 2 +- {src => lib}/adns/internal.h | 26 +- {src => lib}/adns/parse.c | 0 {src => lib}/adns/query.c | 0 {src => lib}/adns/reply.c | 0 {src => lib}/adns/setup.c | 0 {src => lib}/adns/transmit.c | 0 {src => lib}/adns/tvarith.h | 0 {src => lib}/adns/types.c | 0 {src => lib}/curl/COPYING | 0 {src => lib}/curl/Makefile.am | 0 {src => lib}/curl/Makefile.in | 19 +- {src => lib}/curl/README | 0 {src => lib}/curl/RELEASE-NOTES | 0 {src => lib}/curl/acinclude.m4 | 0 {src => lib}/curl/aclocal.m4 | 0 {src => lib}/curl/arpa_telnet.h | 0 {src => lib}/curl/base64.c | 0 {src => lib}/curl/base64.h | 0 {src => lib}/curl/config-win32.h | 0 {src => lib}/curl/connect.c | 0 {src => lib}/curl/connect.h | 0 {src => lib}/curl/content_encoding.c | 0 {src => lib}/curl/content_encoding.h | 0 {src => lib}/curl/cookie.c | 0 {src => lib}/curl/cookie.h | 0 {src => lib}/curl/curl.h | 0 {src => lib}/curl/depcomp | 0 {src => lib}/curl/dict.c | 0 {src => lib}/curl/dict.h | 0 {src => lib}/curl/easy.c | 0 {src => lib}/curl/easy.h | 0 {src => lib}/curl/escape.c | 0 {src => lib}/curl/escape.h | 0 {src => lib}/curl/file.c | 0 {src => lib}/curl/file.h | 0 {src => lib}/curl/formdata.c | 0 {src => lib}/curl/formdata.h | 0 {src => lib}/curl/ftp.c | 0 {src => lib}/curl/ftp.h | 0 {src => lib}/curl/getdate.c | 0 {src => lib}/curl/getdate.h | 0 {src => lib}/curl/getdate.y | 0 {src => lib}/curl/getenv.c | 0 {src => lib}/curl/getinfo.c | 0 {src => lib}/curl/getinfo.h | 0 {src => lib}/curl/hash.c | 0 {src => lib}/curl/hash.h | 0 {src => lib}/curl/hostip.c | 0 {src => lib}/curl/hostip.h | 0 {src => lib}/curl/http.c | 0 {src => lib}/curl/http.h | 0 {src => lib}/curl/http_chunks.c | 0 {src => lib}/curl/http_chunks.h | 0 {src => lib}/curl/http_digest.c | 0 {src => lib}/curl/http_digest.h | 0 {src => lib}/curl/http_negotiate.c | 0 {src => lib}/curl/http_negotiate.h | 0 {src => lib}/curl/http_ntlm.c | 0 {src => lib}/curl/http_ntlm.h | 0 {src => lib}/curl/if2ip.c | 0 {src => lib}/curl/if2ip.h | 0 {src => lib}/curl/inet_ntoa_r.h | 0 {src => lib}/curl/inet_pton.c | 0 {src => lib}/curl/inet_pton.h | 0 {src => lib}/curl/install-sh | 0 {src => lib}/curl/krb4.c | 0 {src => lib}/curl/krb4.h | 0 {src => lib}/curl/ldap.c | 0 {src => lib}/curl/ldap.h | 0 {src => lib}/curl/llist.c | 0 {src => lib}/curl/llist.h | 0 {src => lib}/curl/md5.c | 0 {src => lib}/curl/md5.h | 0 {src => lib}/curl/memdebug.c | 0 {src => lib}/curl/memdebug.h | 0 {src => lib}/curl/missing | 0 {src => lib}/curl/mkinstalldirs | 0 {src => lib}/curl/mprintf.c | 0 {src => lib}/curl/mprintf.h | 0 {src => lib}/curl/multi.c | 0 {src => lib}/curl/multi.h | 0 {src => lib}/curl/mycurl-config.in | 0 {src => lib}/curl/netrc.c | 0 {src => lib}/curl/netrc.h | 0 {src => lib}/curl/progress.c | 0 {src => lib}/curl/progress.h | 0 {src => lib}/curl/security.c | 0 {src => lib}/curl/security.h | 0 {src => lib}/curl/sendf.c | 0 {src => lib}/curl/sendf.h | 0 {src => lib}/curl/setup.h | 0 {src => lib}/curl/share.c | 0 {src => lib}/curl/share.h | 0 {src => lib}/curl/speedcheck.c | 0 {src => lib}/curl/speedcheck.h | 0 {src => lib}/curl/ssluse.c | 0 {src => lib}/curl/ssluse.h | 0 {src => lib}/curl/stamp-h1 | 0 {src => lib}/curl/stdcheaders.h | 0 {src => lib}/curl/strequal.c | 0 {src => lib}/curl/strequal.h | 0 {src => lib}/curl/strtok.c | 0 {src => lib}/curl/strtok.h | 0 {src => lib}/curl/telnet.c | 0 {src => lib}/curl/telnet.h | 0 {src => lib}/curl/timeval.c | 0 {src => lib}/curl/timeval.h | 0 {src => lib}/curl/transfer.c | 0 {src => lib}/curl/transfer.h | 0 {src => lib}/curl/types.h | 0 {src => lib}/curl/url.c | 0 {src => lib}/curl/url.h | 0 {src => lib}/curl/urldata.h | 0 {src => lib}/curl/version.c | 0 {src => lib}/keeper/.indent.pro | 0 {src => lib}/keeper/Makefile.am | 2 +- {src => lib}/keeper/Makefile.in | 21 +- {src => lib}/keeper/keeper.h | 0 {src => lib}/keeper/kp_cache.c | 0 {src => lib}/keeper/kp_dir.c | 0 {src => lib}/keeper/kp_enum.c | 0 {src => lib}/keeper/kp_get.c | 0 {src => lib}/keeper/kp_iface.c | 0 {src => lib}/keeper/kp_recur.c | 0 {src => lib}/keeper/kp_set.c | 0 {src => lib}/keeper/kp_sort.c | 0 {src => lib}/keeper/kp_util.c | 0 {src => lib}/keeper/kp_util.h | 0 {src => lib}/pcre/COPYING | 0 {src => lib}/pcre/Makefile.am | 4 +- {src => lib}/pcre/Makefile.in | 23 +- {src => lib}/pcre/README | 0 {src => lib}/pcre/configwin32.h | 0 {src => lib}/pcre/dftables.c | 0 {src => lib}/pcre/get.c | 0 {src => lib}/pcre/internal.h | 0 {src => lib}/pcre/maketables.c | 0 {src => lib}/pcre/pcre.c | 0 {src => lib}/pcre/pcre.h | 0 {src => lib}/pcre/study.c | 0 {src => lib}/sqlsrv/Makefile | 0 {src => lib}/sqlsrv/README | 0 {src => lib}/sqlsrv/api.c | 0 {src => lib}/sqlsrv/do_sql.c | 0 {src => lib}/sqlsrv/do_sql.h | 0 {src => lib}/sqlsrv/parse.tab.c | 0 {src => lib}/sqlsrv/parse.tab.h | 0 {src => lib}/sqlsrv/parse.y | 0 {src => lib}/sqlsrv/rta.h | 0 {src => lib}/sqlsrv/rtatables.c | 0 {src => lib}/sqlsrv/token.c | 0 {src => lib}/sqlsrv/token.l | 0 {src/modules => modules}/.indent.pro | 0 {src/modules => modules}/Makefile.am | 0 {src/modules => modules}/Makefile.in | 25 +- .../connectserv/.indent.pro | 0 .../connectserv/Makefile.am | 2 +- .../connectserv/Makefile.in | 27 +- {src/modules => modules}/connectserv/cs.c | 2 - {src/modules => modules}/connectserv/cs.h | 0 .../modules => modules}/connectserv/cs_help.c | 0 {src/modules => modules}/extauth/.indent.pro | 0 {src/modules => modules}/extauth/Makefile.am | 2 +- {src/modules => modules}/extauth/Makefile.in | 27 +- {src/modules => modules}/extauth/extauth.c | 0 {src/modules => modules}/hostserv/.indent.pro | 0 {src/modules => modules}/hostserv/Makefile.am | 2 +- {src/modules => modules}/hostserv/Makefile.in | 27 +- {src/modules => modules}/hostserv/README | 0 {src/modules => modules}/hostserv/hostserv.c | 0 {src/modules => modules}/hostserv/hostserv.h | 0 {src/modules => modules}/hostserv/hs_help.c | 0 {src/modules => modules}/ircdauth/Makefile.am | 2 +- {src/modules => modules}/ircdauth/Makefile.in | 27 +- {src/modules => modules}/ircdauth/ircdauth.c | 0 {src/modules => modules}/loveserv/.indent.pro | 0 {src/modules => modules}/loveserv/Makefile.am | 2 +- {src/modules => modules}/loveserv/Makefile.in | 27 +- {src/modules => modules}/loveserv/TODO | 0 {src/modules => modules}/loveserv/loveserv.c | 0 {src/modules => modules}/loveserv/loveserv.h | 0 {src/modules => modules}/loveserv/ls_help.c | 0 {src/modules => modules}/modules.txt | 0 .../moraleserv/.indent.pro | 0 .../moraleserv/Makefile.am | 2 +- .../moraleserv/Makefile.in | 27 +- {src/modules => modules}/moraleserv/ms.c | 0 {src/modules => modules}/moraleserv/ms.h | 0 {src/modules => modules}/moraleserv/ms_help.c | 0 {src/modules => modules}/neoserv/Makefile | 0 {src/modules => modules}/neoserv/neoserv.c | 0 .../neoserv/neoserv_help.c | 0 {src/modules => modules}/operlog/ChangeLog | 0 {src/modules => modules}/operlog/Makefile | 0 {src/modules => modules}/operlog/ol_help.c | 0 {src/modules => modules}/operlog/operlog.c | 0 {src/modules => modules}/statserv/.indent.pro | 0 {src/modules => modules}/statserv/GeoIP.c | 0 {src/modules => modules}/statserv/GeoIP.dat | Bin {src/modules => modules}/statserv/GeoIP.h | 0 .../statserv/GeoIPBitReader.c | 0 .../statserv/GeoIPBitReader.h | 0 {src/modules => modules}/statserv/GeoIPCity.c | 0 {src/modules => modules}/statserv/GeoIPCity.h | 0 {src/modules => modules}/statserv/Makefile.am | 3 +- {src/modules => modules}/statserv/Makefile.in | 28 +- {src/modules => modules}/statserv/database.c | 0 {src/modules => modules}/statserv/global.h | 0 .../statserv/html/index.tpl | 0 {src/modules => modules}/statserv/htmlstats.c | 0 {src/modules => modules}/statserv/md5.c | 0 {src/modules => modules}/statserv/md5.h | 0 {src/modules => modules}/statserv/sqlstats.h | 0 {src/modules => modules}/statserv/ss_help.c | 0 {src/modules => modules}/statserv/stats.c | 0 {src/modules => modules}/statserv/statserv.c | 0 {src/modules => modules}/statserv/statserv.h | 0 {src/modules => modules}/statserv/tld.c | 0 {src/modules => modules}/template/Makefile.am | 2 +- {src/modules => modules}/template/Makefile.in | 27 +- {src/modules => modules}/template/template.c | 0 .../templateauth/Makefile.am | 2 +- .../templateauth/Makefile.in | 27 +- .../templateauth/templateauth.c | 0 src/Makefile.am | 24 +- src/Makefile.in | 39 +- src/libltdl/COPYING.LIB | 515 --- src/libltdl/Makefile.am | 16 - src/libltdl/Makefile.in | 473 -- src/libltdl/README | 9 - src/libltdl/ltdl.c | 3999 ----------------- src/libltdl/ltdl.h | 361 -- src/protocol/Makefile.am | 2 +- src/protocol/Makefile.in | 17 +- {src/tools => tools}/Makefile.in | 0 {src/tools => tools}/README.kptool | 0 {src/tools => tools}/cfgtool/Makefile | 0 .../tools => tools}/cfgtool/README.configtool | 0 {src/tools => tools}/cfgtool/dialog.c | 0 {src/tools => tools}/cfgtool/edit.c | 0 {src/tools => tools}/cfgtool/gkeeper.c | 0 {src/tools => tools}/cfgtool/gkeeper.h | 0 {src/tools => tools}/cfgtool/menu.c | 0 .../cfgtool/pixmaps/book_closed.xpm | 0 .../cfgtool/pixmaps/book_open.xpm | 0 {src/tools => tools}/cfgtool/pixmaps/data.xpm | 0 .../tools => tools}/cfgtool/pixmaps/float.xpm | 0 .../cfgtool/pixmaps/folder_closed.xpm | 0 .../cfgtool/pixmaps/folder_open.xpm | 0 {src/tools => tools}/cfgtool/pixmaps/num.xpm | 0 .../cfgtool/pixmaps/string.xpm | 0 .../cfgtool/pixmaps/warning.xpm | 0 {src/tools => tools}/cfgtool/tree.c | 0 {src/tools => tools}/kp_exp.c | 0 {src/tools => tools}/kp_imp.c | 0 {src/tools => tools}/kptool.c | 0 {src/tools => tools}/kptool.h | 0 {src/tools => tools}/misc.c | 0 {src/tools => tools}/sqlphp/README | 0 {src/tools => tools}/sqlphp/rta_tables.php | 0 {src/tools => tools}/sqlphp/rta_view.php | 0 307 files changed, 578 insertions(+), 9805 deletions(-) rename {src => include}/auth.h (100%) rename {src => include}/bans.h (100%) rename {src => include}/bots.h (100%) rename {src => include}/channels.h (100%) rename {src => include}/commands.h (100%) rename {src => include}/conf.h (100%) rename {src => include}/configwin32.h (100%) rename {src => include}/dl.h (100%) rename {src => include}/dns.h (100%) rename {src => include}/dotconf.h (100%) rename {src => include}/events.h (100%) rename {src => include}/exclude.h (100%) rename {src => include}/hash.h (100%) rename {src => include}/ircd.h (100%) rename {src => include}/ircstring.h (100%) rename {src => include}/list.h (100%) rename {src => include}/log.h (100%) rename {src => include}/modules.h (100%) rename {src => include}/neostats.h (100%) rename {src => include}/ns_help.h (100%) rename {src => include}/numeric.h (100%) rename {src => include}/servers.h (100%) rename {src => include}/services.h (100%) rename {src => include}/signals.h (100%) rename {src => include}/sock.h (100%) rename {src => include}/support.h (100%) rename {src => include}/timer.h (100%) rename {src => include}/transfer.h (100%) rename {src => include}/users.h (100%) rename {src => lib}/adns/.indent.pro (100%) rename {src => lib}/adns/Makefile.am (79%) rename {src => lib}/adns/Makefile.in (96%) rename {src => lib}/adns/adns.h (100%) rename {src => lib}/adns/check.c (100%) rename {src => lib}/adns/dlist.h (100%) rename {src => lib}/adns/event.c (100%) rename {src => lib}/adns/general.c (99%) rename {src => lib}/adns/internal.h (98%) rename {src => lib}/adns/parse.c (100%) rename {src => lib}/adns/query.c (100%) rename {src => lib}/adns/reply.c (100%) rename {src => lib}/adns/setup.c (100%) rename {src => lib}/adns/transmit.c (100%) rename {src => lib}/adns/tvarith.h (100%) rename {src => lib}/adns/types.c (100%) rename {src => lib}/curl/COPYING (100%) rename {src => lib}/curl/Makefile.am (100%) rename {src => lib}/curl/Makefile.in (98%) rename {src => lib}/curl/README (100%) rename {src => lib}/curl/RELEASE-NOTES (100%) rename {src => lib}/curl/acinclude.m4 (100%) rename {src => lib}/curl/aclocal.m4 (100%) rename {src => lib}/curl/arpa_telnet.h (100%) rename {src => lib}/curl/base64.c (100%) rename {src => lib}/curl/base64.h (100%) rename {src => lib}/curl/config-win32.h (100%) rename {src => lib}/curl/connect.c (100%) rename {src => lib}/curl/connect.h (100%) rename {src => lib}/curl/content_encoding.c (100%) rename {src => lib}/curl/content_encoding.h (100%) rename {src => lib}/curl/cookie.c (100%) rename {src => lib}/curl/cookie.h (100%) rename {src => lib}/curl/curl.h (100%) rename {src => lib}/curl/depcomp (100%) rename {src => lib}/curl/dict.c (100%) rename {src => lib}/curl/dict.h (100%) rename {src => lib}/curl/easy.c (100%) rename {src => lib}/curl/easy.h (100%) rename {src => lib}/curl/escape.c (100%) rename {src => lib}/curl/escape.h (100%) rename {src => lib}/curl/file.c (100%) rename {src => lib}/curl/file.h (100%) rename {src => lib}/curl/formdata.c (100%) rename {src => lib}/curl/formdata.h (100%) rename {src => lib}/curl/ftp.c (100%) rename {src => lib}/curl/ftp.h (100%) rename {src => lib}/curl/getdate.c (100%) rename {src => lib}/curl/getdate.h (100%) rename {src => lib}/curl/getdate.y (100%) rename {src => lib}/curl/getenv.c (100%) rename {src => lib}/curl/getinfo.c (100%) rename {src => lib}/curl/getinfo.h (100%) rename {src => lib}/curl/hash.c (100%) rename {src => lib}/curl/hash.h (100%) rename {src => lib}/curl/hostip.c (100%) rename {src => lib}/curl/hostip.h (100%) rename {src => lib}/curl/http.c (100%) rename {src => lib}/curl/http.h (100%) rename {src => lib}/curl/http_chunks.c (100%) rename {src => lib}/curl/http_chunks.h (100%) rename {src => lib}/curl/http_digest.c (100%) rename {src => lib}/curl/http_digest.h (100%) rename {src => lib}/curl/http_negotiate.c (100%) rename {src => lib}/curl/http_negotiate.h (100%) rename {src => lib}/curl/http_ntlm.c (100%) rename {src => lib}/curl/http_ntlm.h (100%) rename {src => lib}/curl/if2ip.c (100%) rename {src => lib}/curl/if2ip.h (100%) rename {src => lib}/curl/inet_ntoa_r.h (100%) rename {src => lib}/curl/inet_pton.c (100%) rename {src => lib}/curl/inet_pton.h (100%) rename {src => lib}/curl/install-sh (100%) rename {src => lib}/curl/krb4.c (100%) rename {src => lib}/curl/krb4.h (100%) rename {src => lib}/curl/ldap.c (100%) rename {src => lib}/curl/ldap.h (100%) rename {src => lib}/curl/llist.c (100%) rename {src => lib}/curl/llist.h (100%) rename {src => lib}/curl/md5.c (100%) rename {src => lib}/curl/md5.h (100%) rename {src => lib}/curl/memdebug.c (100%) rename {src => lib}/curl/memdebug.h (100%) rename {src => lib}/curl/missing (100%) rename {src => lib}/curl/mkinstalldirs (100%) rename {src => lib}/curl/mprintf.c (100%) rename {src => lib}/curl/mprintf.h (100%) rename {src => lib}/curl/multi.c (100%) rename {src => lib}/curl/multi.h (100%) rename {src => lib}/curl/mycurl-config.in (100%) rename {src => lib}/curl/netrc.c (100%) rename {src => lib}/curl/netrc.h (100%) rename {src => lib}/curl/progress.c (100%) rename {src => lib}/curl/progress.h (100%) rename {src => lib}/curl/security.c (100%) rename {src => lib}/curl/security.h (100%) rename {src => lib}/curl/sendf.c (100%) rename {src => lib}/curl/sendf.h (100%) rename {src => lib}/curl/setup.h (100%) rename {src => lib}/curl/share.c (100%) rename {src => lib}/curl/share.h (100%) rename {src => lib}/curl/speedcheck.c (100%) rename {src => lib}/curl/speedcheck.h (100%) rename {src => lib}/curl/ssluse.c (100%) rename {src => lib}/curl/ssluse.h (100%) rename {src => lib}/curl/stamp-h1 (100%) rename {src => lib}/curl/stdcheaders.h (100%) rename {src => lib}/curl/strequal.c (100%) rename {src => lib}/curl/strequal.h (100%) rename {src => lib}/curl/strtok.c (100%) rename {src => lib}/curl/strtok.h (100%) rename {src => lib}/curl/telnet.c (100%) rename {src => lib}/curl/telnet.h (100%) rename {src => lib}/curl/timeval.c (100%) rename {src => lib}/curl/timeval.h (100%) rename {src => lib}/curl/transfer.c (100%) rename {src => lib}/curl/transfer.h (100%) rename {src => lib}/curl/types.h (100%) rename {src => lib}/curl/url.c (100%) rename {src => lib}/curl/url.h (100%) rename {src => lib}/curl/urldata.h (100%) rename {src => lib}/curl/version.c (100%) rename {src => lib}/keeper/.indent.pro (100%) rename {src => lib}/keeper/Makefile.am (76%) rename {src => lib}/keeper/Makefile.in (96%) rename {src => lib}/keeper/keeper.h (100%) rename {src => lib}/keeper/kp_cache.c (100%) rename {src => lib}/keeper/kp_dir.c (100%) rename {src => lib}/keeper/kp_enum.c (100%) rename {src => lib}/keeper/kp_get.c (100%) rename {src => lib}/keeper/kp_iface.c (100%) rename {src => lib}/keeper/kp_recur.c (100%) rename {src => lib}/keeper/kp_set.c (100%) rename {src => lib}/keeper/kp_sort.c (100%) rename {src => lib}/keeper/kp_util.c (100%) rename {src => lib}/keeper/kp_util.h (100%) rename {src => lib}/pcre/COPYING (100%) rename {src => lib}/pcre/Makefile.am (74%) rename {src => lib}/pcre/Makefile.in (96%) rename {src => lib}/pcre/README (100%) rename {src => lib}/pcre/configwin32.h (100%) rename {src => lib}/pcre/dftables.c (100%) rename {src => lib}/pcre/get.c (100%) rename {src => lib}/pcre/internal.h (100%) rename {src => lib}/pcre/maketables.c (100%) rename {src => lib}/pcre/pcre.c (100%) rename {src => lib}/pcre/pcre.h (100%) rename {src => lib}/pcre/study.c (100%) rename {src => lib}/sqlsrv/Makefile (100%) rename {src => lib}/sqlsrv/README (100%) rename {src => lib}/sqlsrv/api.c (100%) rename {src => lib}/sqlsrv/do_sql.c (100%) rename {src => lib}/sqlsrv/do_sql.h (100%) rename {src => lib}/sqlsrv/parse.tab.c (100%) rename {src => lib}/sqlsrv/parse.tab.h (100%) rename {src => lib}/sqlsrv/parse.y (100%) rename {src => lib}/sqlsrv/rta.h (100%) rename {src => lib}/sqlsrv/rtatables.c (100%) rename {src => lib}/sqlsrv/token.c (100%) rename {src => lib}/sqlsrv/token.l (100%) rename {src/modules => modules}/.indent.pro (100%) rename {src/modules => modules}/Makefile.am (100%) rename {src/modules => modules}/Makefile.in (96%) rename {src/modules => modules}/connectserv/.indent.pro (100%) rename {src/modules => modules}/connectserv/Makefile.am (65%) rename {src/modules => modules}/connectserv/Makefile.in (95%) rename {src/modules => modules}/connectserv/cs.c (99%) rename {src/modules => modules}/connectserv/cs.h (100%) rename {src/modules => modules}/connectserv/cs_help.c (100%) rename {src/modules => modules}/extauth/.indent.pro (100%) rename {src/modules => modules}/extauth/Makefile.am (63%) rename {src/modules => modules}/extauth/Makefile.in (95%) rename {src/modules => modules}/extauth/extauth.c (100%) rename {src/modules => modules}/hostserv/.indent.pro (100%) rename {src/modules => modules}/hostserv/Makefile.am (66%) rename {src/modules => modules}/hostserv/Makefile.in (95%) rename {src/modules => modules}/hostserv/README (100%) rename {src/modules => modules}/hostserv/hostserv.c (100%) rename {src/modules => modules}/hostserv/hostserv.h (100%) rename {src/modules => modules}/hostserv/hs_help.c (100%) rename {src/modules => modules}/ircdauth/Makefile.am (63%) rename {src/modules => modules}/ircdauth/Makefile.in (95%) rename {src/modules => modules}/ircdauth/ircdauth.c (100%) rename {src/modules => modules}/loveserv/.indent.pro (100%) rename {src/modules => modules}/loveserv/Makefile.am (66%) rename {src/modules => modules}/loveserv/Makefile.in (95%) rename {src/modules => modules}/loveserv/TODO (100%) rename {src/modules => modules}/loveserv/loveserv.c (100%) rename {src/modules => modules}/loveserv/loveserv.h (100%) rename {src/modules => modules}/loveserv/ls_help.c (100%) rename {src/modules => modules}/modules.txt (100%) rename {src/modules => modules}/moraleserv/.indent.pro (100%) rename {src/modules => modules}/moraleserv/Makefile.am (65%) rename {src/modules => modules}/moraleserv/Makefile.in (95%) rename {src/modules => modules}/moraleserv/ms.c (100%) rename {src/modules => modules}/moraleserv/ms.h (100%) rename {src/modules => modules}/moraleserv/ms_help.c (100%) rename {src/modules => modules}/neoserv/Makefile (100%) rename {src/modules => modules}/neoserv/neoserv.c (100%) rename {src/modules => modules}/neoserv/neoserv_help.c (100%) rename {src/modules => modules}/operlog/ChangeLog (100%) rename {src/modules => modules}/operlog/Makefile (100%) rename {src/modules => modules}/operlog/ol_help.c (100%) rename {src/modules => modules}/operlog/operlog.c (100%) rename {src/modules => modules}/statserv/.indent.pro (100%) rename {src/modules => modules}/statserv/GeoIP.c (100%) rename {src/modules => modules}/statserv/GeoIP.dat (100%) rename {src/modules => modules}/statserv/GeoIP.h (100%) rename {src/modules => modules}/statserv/GeoIPBitReader.c (100%) rename {src/modules => modules}/statserv/GeoIPBitReader.h (100%) rename {src/modules => modules}/statserv/GeoIPCity.c (100%) rename {src/modules => modules}/statserv/GeoIPCity.h (100%) rename {src/modules => modules}/statserv/Makefile.am (76%) rename {src/modules => modules}/statserv/Makefile.in (96%) rename {src/modules => modules}/statserv/database.c (100%) rename {src/modules => modules}/statserv/global.h (100%) rename {src/modules => modules}/statserv/html/index.tpl (100%) rename {src/modules => modules}/statserv/htmlstats.c (100%) rename {src/modules => modules}/statserv/md5.c (100%) rename {src/modules => modules}/statserv/md5.h (100%) rename {src/modules => modules}/statserv/sqlstats.h (100%) rename {src/modules => modules}/statserv/ss_help.c (100%) rename {src/modules => modules}/statserv/stats.c (100%) rename {src/modules => modules}/statserv/statserv.c (100%) rename {src/modules => modules}/statserv/statserv.h (100%) rename {src/modules => modules}/statserv/tld.c (100%) rename {src/modules => modules}/template/Makefile.am (63%) rename {src/modules => modules}/template/Makefile.in (95%) rename {src/modules => modules}/template/template.c (100%) rename {src/modules => modules}/templateauth/Makefile.am (65%) rename {src/modules => modules}/templateauth/Makefile.in (95%) rename {src/modules => modules}/templateauth/templateauth.c (100%) delete mode 100644 src/libltdl/COPYING.LIB delete mode 100644 src/libltdl/Makefile.am delete mode 100644 src/libltdl/Makefile.in delete mode 100644 src/libltdl/README delete mode 100644 src/libltdl/ltdl.c delete mode 100644 src/libltdl/ltdl.h rename {src/tools => tools}/Makefile.in (100%) rename {src/tools => tools}/README.kptool (100%) rename {src/tools => tools}/cfgtool/Makefile (100%) rename {src/tools => tools}/cfgtool/README.configtool (100%) rename {src/tools => tools}/cfgtool/dialog.c (100%) rename {src/tools => tools}/cfgtool/edit.c (100%) rename {src/tools => tools}/cfgtool/gkeeper.c (100%) rename {src/tools => tools}/cfgtool/gkeeper.h (100%) rename {src/tools => tools}/cfgtool/menu.c (100%) rename {src/tools => tools}/cfgtool/pixmaps/book_closed.xpm (100%) rename {src/tools => tools}/cfgtool/pixmaps/book_open.xpm (100%) rename {src/tools => tools}/cfgtool/pixmaps/data.xpm (100%) rename {src/tools => tools}/cfgtool/pixmaps/float.xpm (100%) rename {src/tools => tools}/cfgtool/pixmaps/folder_closed.xpm (100%) rename {src/tools => tools}/cfgtool/pixmaps/folder_open.xpm (100%) rename {src/tools => tools}/cfgtool/pixmaps/num.xpm (100%) rename {src/tools => tools}/cfgtool/pixmaps/string.xpm (100%) rename {src/tools => tools}/cfgtool/pixmaps/warning.xpm (100%) rename {src/tools => tools}/cfgtool/tree.c (100%) rename {src/tools => tools}/kp_exp.c (100%) rename {src/tools => tools}/kp_imp.c (100%) rename {src/tools => tools}/kptool.c (100%) rename {src/tools => tools}/kptool.h (100%) rename {src/tools => tools}/misc.c (100%) rename {src/tools => tools}/sqlphp/README (100%) rename {src/tools => tools}/sqlphp/rta_tables.php (100%) rename {src/tools => tools}/sqlphp/rta_view.php (100%) diff --git a/.gitattributes b/.gitattributes index 09878b46..80f3cc8f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -57,29 +57,274 @@ doc/read-faq -text doc/read-userman -text include/Makefile.am -text include/Makefile.in -text +include/auth.h -text +include/bans.h -text +include/bots.h -text +include/channels.h eol=lf +include/commands.h -text +include/conf.h eol=lf include/config.h.in -text +include/configwin32.h -text +include/dl.h eol=lf +include/dns.h eol=lf +include/dotconf.h eol=lf +include/events.h eol=lf +include/exclude.h -text +include/hash.h eol=lf +include/ircd.h eol=lf +include/ircstring.h eol=lf +include/list.h eol=lf +include/log.h eol=lf +include/modules.h -text +include/neostats.h -text +include/ns_help.h eol=lf +include/numeric.h -text +include/servers.h eol=lf +include/services.h eol=lf +include/signals.h -text +include/sock.h eol=lf +include/support.h eol=lf +include/timer.h eol=lf +include/transfer.h -text +include/users.h eol=lf include/version.sh -text +lib/adns/.indent.pro -text +lib/adns/Makefile.am -text +lib/adns/Makefile.in -text +lib/adns/adns.h -text +lib/adns/check.c -text +lib/adns/dlist.h -text +lib/adns/event.c -text +lib/adns/general.c -text +lib/adns/internal.h -text +lib/adns/parse.c -text +lib/adns/query.c -text +lib/adns/reply.c -text +lib/adns/setup.c -text +lib/adns/transmit.c -text +lib/adns/tvarith.h -text +lib/adns/types.c -text +lib/curl/COPYING -text +lib/curl/Makefile.am -text +lib/curl/Makefile.in -text +lib/curl/README -text +lib/curl/RELEASE-NOTES -text +lib/curl/acinclude.m4 -text +lib/curl/aclocal.m4 -text +lib/curl/arpa_telnet.h -text +lib/curl/base64.c -text +lib/curl/base64.h -text +lib/curl/config-win32.h -text +lib/curl/connect.c -text +lib/curl/connect.h -text +lib/curl/content_encoding.c -text +lib/curl/content_encoding.h -text +lib/curl/cookie.c -text +lib/curl/cookie.h -text +lib/curl/curl.h -text +lib/curl/depcomp -text +lib/curl/dict.c -text +lib/curl/dict.h -text +lib/curl/easy.c -text +lib/curl/easy.h -text +lib/curl/escape.c -text +lib/curl/escape.h -text +lib/curl/file.c -text +lib/curl/file.h -text +lib/curl/formdata.c -text +lib/curl/formdata.h -text +lib/curl/ftp.c -text +lib/curl/ftp.h -text +lib/curl/getdate.c -text +lib/curl/getdate.h -text +lib/curl/getdate.y -text +lib/curl/getenv.c -text +lib/curl/getinfo.c -text +lib/curl/getinfo.h -text +lib/curl/hash.c -text +lib/curl/hash.h -text +lib/curl/hostip.c -text +lib/curl/hostip.h -text +lib/curl/http.c -text +lib/curl/http.h -text +lib/curl/http_chunks.c -text +lib/curl/http_chunks.h -text +lib/curl/http_digest.c -text +lib/curl/http_digest.h -text +lib/curl/http_negotiate.c -text +lib/curl/http_negotiate.h -text +lib/curl/http_ntlm.c -text +lib/curl/http_ntlm.h -text +lib/curl/if2ip.c -text +lib/curl/if2ip.h -text +lib/curl/inet_ntoa_r.h -text +lib/curl/inet_pton.c -text +lib/curl/inet_pton.h -text +lib/curl/install-sh -text +lib/curl/krb4.c -text +lib/curl/krb4.h -text +lib/curl/ldap.c -text +lib/curl/ldap.h -text +lib/curl/llist.c -text +lib/curl/llist.h -text +lib/curl/md5.c -text +lib/curl/md5.h -text +lib/curl/memdebug.c -text +lib/curl/memdebug.h -text +lib/curl/missing -text +lib/curl/mkinstalldirs -text +lib/curl/mprintf.c -text +lib/curl/mprintf.h -text +lib/curl/multi.c -text +lib/curl/multi.h -text +lib/curl/mycurl-config.in -text +lib/curl/netrc.c -text +lib/curl/netrc.h -text +lib/curl/progress.c -text +lib/curl/progress.h -text +lib/curl/security.c -text +lib/curl/security.h -text +lib/curl/sendf.c -text +lib/curl/sendf.h -text +lib/curl/setup.h -text +lib/curl/share.c -text +lib/curl/share.h -text +lib/curl/speedcheck.c -text +lib/curl/speedcheck.h -text +lib/curl/ssluse.c -text +lib/curl/ssluse.h -text +lib/curl/stamp-h1 -text +lib/curl/stdcheaders.h -text +lib/curl/strequal.c -text +lib/curl/strequal.h -text +lib/curl/strtok.c -text +lib/curl/strtok.h -text +lib/curl/telnet.c -text +lib/curl/telnet.h -text +lib/curl/timeval.c -text +lib/curl/timeval.h -text +lib/curl/transfer.c -text +lib/curl/transfer.h -text +lib/curl/types.h -text +lib/curl/url.c -text +lib/curl/url.h -text +lib/curl/urldata.h -text +lib/curl/version.c -text +lib/keeper/.indent.pro -text +lib/keeper/Makefile.am -text +lib/keeper/Makefile.in -text +lib/keeper/keeper.h -text +lib/keeper/kp_cache.c -text +lib/keeper/kp_dir.c -text +lib/keeper/kp_enum.c -text +lib/keeper/kp_get.c -text +lib/keeper/kp_iface.c -text +lib/keeper/kp_recur.c -text +lib/keeper/kp_set.c -text +lib/keeper/kp_sort.c -text +lib/keeper/kp_util.c -text +lib/keeper/kp_util.h -text +lib/pcre/COPYING -text +lib/pcre/Makefile.am -text +lib/pcre/Makefile.in -text +lib/pcre/README -text +lib/pcre/configwin32.h -text +lib/pcre/dftables.c eol=lf +lib/pcre/get.c eol=lf +lib/pcre/internal.h eol=lf +lib/pcre/maketables.c eol=lf +lib/pcre/pcre.c eol=lf +lib/pcre/pcre.h -text +lib/pcre/study.c eol=lf +lib/sqlsrv/Makefile -text +lib/sqlsrv/README -text +lib/sqlsrv/api.c -text +lib/sqlsrv/do_sql.c -text +lib/sqlsrv/do_sql.h -text +lib/sqlsrv/parse.tab.c -text +lib/sqlsrv/parse.tab.h -text +lib/sqlsrv/parse.y -text +lib/sqlsrv/rta.h -text +lib/sqlsrv/rtatables.c -text +lib/sqlsrv/token.c -text +lib/sqlsrv/token.l -text logs/.keepme -text /makeconf -text +modules/.indent.pro -text +modules/Makefile.am -text +modules/Makefile.in -text +modules/connectserv/.indent.pro -text +modules/connectserv/Makefile.am -text +modules/connectserv/Makefile.in -text +modules/connectserv/cs.c -text +modules/connectserv/cs.h -text +modules/connectserv/cs_help.c -text +modules/extauth/.indent.pro -text +modules/extauth/Makefile.am -text +modules/extauth/Makefile.in -text +modules/extauth/extauth.c -text +modules/hostserv/.indent.pro -text +modules/hostserv/Makefile.am -text +modules/hostserv/Makefile.in -text +modules/hostserv/README -text +modules/hostserv/hostserv.c -text +modules/hostserv/hostserv.h -text +modules/hostserv/hs_help.c -text +modules/ircdauth/Makefile.am -text +modules/ircdauth/Makefile.in -text +modules/ircdauth/ircdauth.c -text +modules/loveserv/.indent.pro -text +modules/loveserv/Makefile.am -text +modules/loveserv/Makefile.in -text +modules/loveserv/TODO -text +modules/loveserv/loveserv.c -text +modules/loveserv/loveserv.h -text +modules/loveserv/ls_help.c -text +modules/modules.txt -text +modules/moraleserv/.indent.pro -text +modules/moraleserv/Makefile.am -text +modules/moraleserv/Makefile.in -text +modules/moraleserv/ms.c -text +modules/moraleserv/ms.h -text +modules/moraleserv/ms_help.c -text +modules/neoserv/Makefile -text +modules/neoserv/neoserv.c -text +modules/neoserv/neoserv_help.c -text +modules/operlog/ChangeLog -text +modules/operlog/Makefile -text +modules/operlog/ol_help.c -text +modules/operlog/operlog.c -text +modules/statserv/.indent.pro -text +modules/statserv/GeoIP.c -text +modules/statserv/GeoIP.dat -text +modules/statserv/GeoIP.h -text +modules/statserv/GeoIPBitReader.c -text +modules/statserv/GeoIPBitReader.h -text +modules/statserv/GeoIPCity.c -text +modules/statserv/GeoIPCity.h -text +modules/statserv/Makefile.am -text +modules/statserv/Makefile.in -text +modules/statserv/database.c -text +modules/statserv/global.h -text +modules/statserv/html/index.tpl -text +modules/statserv/htmlstats.c -text +modules/statserv/md5.c -text +modules/statserv/md5.h -text +modules/statserv/sqlstats.h -text +modules/statserv/ss_help.c -text +modules/statserv/stats.c -text +modules/statserv/statserv.c -text +modules/statserv/statserv.h -text +modules/statserv/tld.c -text +modules/template/Makefile.am -text +modules/template/Makefile.in -text +modules/template/template.c -text +modules/templateauth/Makefile.am -text +modules/templateauth/Makefile.in -text +modules/templateauth/templateauth.c -text /neostats.motd -text src/Makefile.am -text src/Makefile.in -text -src/adns/.indent.pro -text -src/adns/Makefile.am -text -src/adns/Makefile.in -text -src/adns/adns.h -text -src/adns/check.c -text -src/adns/dlist.h -text -src/adns/event.c -text -src/adns/general.c -text -src/adns/internal.h -text -src/adns/parse.c -text -src/adns/query.c -text -src/adns/reply.c -text -src/adns/setup.c -text -src/adns/transmit.c -text -src/adns/tvarith.h -text -src/adns/types.c -text src/adnswin32/Makefile.in -text src/adnswin32/adns.h -text src/adnswin32/adns.make -text @@ -101,258 +346,27 @@ src/adnswin32/transmit.c -text src/adnswin32/tvarith.h -text src/adnswin32/types.c -text src/auth.c -text -src/auth.h -text src/bans.c -text -src/bans.h -text src/bots.c -text -src/bots.h -text src/channels.c eol=lf -src/channels.h eol=lf src/commands.c -text -src/commands.h -text src/conf.c eol=lf -src/conf.h eol=lf -src/configwin32.h -text -src/curl/COPYING -text -src/curl/Makefile.am -text -src/curl/Makefile.in -text -src/curl/README -text -src/curl/RELEASE-NOTES -text -src/curl/acinclude.m4 -text -src/curl/aclocal.m4 -text -src/curl/arpa_telnet.h -text -src/curl/base64.c -text -src/curl/base64.h -text -src/curl/config-win32.h -text -src/curl/connect.c -text -src/curl/connect.h -text -src/curl/content_encoding.c -text -src/curl/content_encoding.h -text -src/curl/cookie.c -text -src/curl/cookie.h -text -src/curl/curl.h -text -src/curl/depcomp -text -src/curl/dict.c -text -src/curl/dict.h -text -src/curl/easy.c -text -src/curl/easy.h -text -src/curl/escape.c -text -src/curl/escape.h -text -src/curl/file.c -text -src/curl/file.h -text -src/curl/formdata.c -text -src/curl/formdata.h -text -src/curl/ftp.c -text -src/curl/ftp.h -text -src/curl/getdate.c -text -src/curl/getdate.h -text -src/curl/getdate.y -text -src/curl/getenv.c -text -src/curl/getinfo.c -text -src/curl/getinfo.h -text -src/curl/hash.c -text -src/curl/hash.h -text -src/curl/hostip.c -text -src/curl/hostip.h -text -src/curl/http.c -text -src/curl/http.h -text -src/curl/http_chunks.c -text -src/curl/http_chunks.h -text -src/curl/http_digest.c -text -src/curl/http_digest.h -text -src/curl/http_negotiate.c -text -src/curl/http_negotiate.h -text -src/curl/http_ntlm.c -text -src/curl/http_ntlm.h -text -src/curl/if2ip.c -text -src/curl/if2ip.h -text -src/curl/inet_ntoa_r.h -text -src/curl/inet_pton.c -text -src/curl/inet_pton.h -text -src/curl/install-sh -text -src/curl/krb4.c -text -src/curl/krb4.h -text -src/curl/ldap.c -text -src/curl/ldap.h -text -src/curl/llist.c -text -src/curl/llist.h -text -src/curl/md5.c -text -src/curl/md5.h -text -src/curl/memdebug.c -text -src/curl/memdebug.h -text -src/curl/missing -text -src/curl/mkinstalldirs -text -src/curl/mprintf.c -text -src/curl/mprintf.h -text -src/curl/multi.c -text -src/curl/multi.h -text -src/curl/mycurl-config.in -text -src/curl/netrc.c -text -src/curl/netrc.h -text -src/curl/progress.c -text -src/curl/progress.h -text -src/curl/security.c -text -src/curl/security.h -text -src/curl/sendf.c -text -src/curl/sendf.h -text -src/curl/setup.h -text -src/curl/share.c -text -src/curl/share.h -text -src/curl/speedcheck.c -text -src/curl/speedcheck.h -text -src/curl/ssluse.c -text -src/curl/ssluse.h -text -src/curl/stamp-h1 -text -src/curl/stdcheaders.h -text -src/curl/strequal.c -text -src/curl/strequal.h -text -src/curl/strtok.c -text -src/curl/strtok.h -text -src/curl/telnet.c -text -src/curl/telnet.h -text -src/curl/timeval.c -text -src/curl/timeval.h -text -src/curl/transfer.c -text -src/curl/transfer.h -text -src/curl/types.h -text -src/curl/url.c -text -src/curl/url.h -text -src/curl/urldata.h -text -src/curl/version.c -text src/db.c -text src/dl.c eol=lf -src/dl.h eol=lf src/dns.c eol=lf -src/dns.h eol=lf src/dotconf.c eol=lf -src/dotconf.h eol=lf -src/events.h eol=lf src/exclude.c -text -src/exclude.h -text src/hash.c eol=lf -src/hash.h eol=lf src/ircd.c eol=lf -src/ircd.h eol=lf src/ircstring.c eol=lf -src/ircstring.h eol=lf src/keeper.c eol=lf -src/keeper/.indent.pro -text -src/keeper/Makefile.am -text -src/keeper/Makefile.in -text -src/keeper/keeper.h -text -src/keeper/kp_cache.c -text -src/keeper/kp_dir.c -text -src/keeper/kp_enum.c -text -src/keeper/kp_get.c -text -src/keeper/kp_iface.c -text -src/keeper/kp_recur.c -text -src/keeper/kp_set.c -text -src/keeper/kp_sort.c -text -src/keeper/kp_util.c -text -src/keeper/kp_util.h -text -src/libltdl/COPYING.LIB -text -src/libltdl/Makefile.am -text -src/libltdl/Makefile.in -text -src/libltdl/README -text -src/libltdl/ltdl.c -text -src/libltdl/ltdl.h -text src/list.c eol=lf -src/list.h eol=lf src/log.c eol=lf -src/log.h eol=lf src/main.c eol=lf src/match.c -text src/misc.c eol=lf src/modules.c -text -src/modules.h -text -src/modules/.indent.pro -text -src/modules/Makefile.am -text -src/modules/Makefile.in -text -src/modules/connectserv/.indent.pro -text -src/modules/connectserv/Makefile.am -text -src/modules/connectserv/Makefile.in -text -src/modules/connectserv/cs.c -text -src/modules/connectserv/cs.h -text -src/modules/connectserv/cs_help.c -text -src/modules/extauth/.indent.pro -text -src/modules/extauth/Makefile.am -text -src/modules/extauth/Makefile.in -text -src/modules/extauth/extauth.c -text -src/modules/hostserv/.indent.pro -text -src/modules/hostserv/Makefile.am -text -src/modules/hostserv/Makefile.in -text -src/modules/hostserv/README -text -src/modules/hostserv/hostserv.c -text -src/modules/hostserv/hostserv.h -text -src/modules/hostserv/hs_help.c -text -src/modules/ircdauth/Makefile.am -text -src/modules/ircdauth/Makefile.in -text -src/modules/ircdauth/ircdauth.c -text -src/modules/loveserv/.indent.pro -text -src/modules/loveserv/Makefile.am -text -src/modules/loveserv/Makefile.in -text -src/modules/loveserv/TODO -text -src/modules/loveserv/loveserv.c -text -src/modules/loveserv/loveserv.h -text -src/modules/loveserv/ls_help.c -text -src/modules/modules.txt -text -src/modules/moraleserv/.indent.pro -text -src/modules/moraleserv/Makefile.am -text -src/modules/moraleserv/Makefile.in -text -src/modules/moraleserv/ms.c -text -src/modules/moraleserv/ms.h -text -src/modules/moraleserv/ms_help.c -text -src/modules/neoserv/Makefile -text -src/modules/neoserv/neoserv.c -text -src/modules/neoserv/neoserv_help.c -text -src/modules/operlog/ChangeLog -text -src/modules/operlog/Makefile -text -src/modules/operlog/ol_help.c -text -src/modules/operlog/operlog.c -text -src/modules/statserv/.indent.pro -text -src/modules/statserv/GeoIP.c -text -src/modules/statserv/GeoIP.dat -text -src/modules/statserv/GeoIP.h -text -src/modules/statserv/GeoIPBitReader.c -text -src/modules/statserv/GeoIPBitReader.h -text -src/modules/statserv/GeoIPCity.c -text -src/modules/statserv/GeoIPCity.h -text -src/modules/statserv/Makefile.am -text -src/modules/statserv/Makefile.in -text -src/modules/statserv/database.c -text -src/modules/statserv/global.h -text -src/modules/statserv/html/index.tpl -text -src/modules/statserv/htmlstats.c -text -src/modules/statserv/md5.c -text -src/modules/statserv/md5.h -text -src/modules/statserv/sqlstats.h -text -src/modules/statserv/ss_help.c -text -src/modules/statserv/stats.c -text -src/modules/statserv/statserv.c -text -src/modules/statserv/statserv.h -text -src/modules/statserv/tld.c -text -src/modules/template/Makefile.am -text -src/modules/template/Makefile.in -text -src/modules/template/template.c -text -src/modules/templateauth/Makefile.am -text -src/modules/templateauth/Makefile.in -text -src/modules/templateauth/templateauth.c -text -src/neostats.h -text src/ns_help.c eol=lf -src/ns_help.h eol=lf -src/numeric.h -text -src/pcre/COPYING -text -src/pcre/Makefile.am -text -src/pcre/Makefile.in -text -src/pcre/README -text -src/pcre/configwin32.h -text -src/pcre/dftables.c eol=lf -src/pcre/get.c eol=lf -src/pcre/internal.h eol=lf -src/pcre/maketables.c eol=lf -src/pcre/pcre.c eol=lf -src/pcre/pcre.h -text -src/pcre/study.c eol=lf src/protocol/Makefile.am -text src/protocol/Makefile.in -text src/protocol/bahamut.c eol=lf @@ -383,65 +397,45 @@ src/protocol/unreal32.h eol=lf src/protocol/viagra.c -text src/protocol/viagra.h -text src/servers.c eol=lf -src/servers.h eol=lf src/services.c eol=lf -src/services.h eol=lf src/signals.c -text -src/signals.h -text src/sock.c eol=lf -src/sock.h eol=lf -src/sqlsrv/Makefile -text -src/sqlsrv/README -text -src/sqlsrv/api.c -text -src/sqlsrv/do_sql.c -text -src/sqlsrv/do_sql.h -text -src/sqlsrv/parse.tab.c -text -src/sqlsrv/parse.tab.h -text -src/sqlsrv/parse.y -text -src/sqlsrv/rta.h -text -src/sqlsrv/rtatables.c -text -src/sqlsrv/token.c -text -src/sqlsrv/token.l -text src/support.c eol=lf -src/support.h eol=lf src/timer.c eol=lf -src/timer.h eol=lf -src/tools/Makefile.in -text -src/tools/README.kptool -text -src/tools/cfgtool/Makefile -text -src/tools/cfgtool/README.configtool -text -src/tools/cfgtool/dialog.c -text -src/tools/cfgtool/edit.c -text -src/tools/cfgtool/gkeeper.c -text -src/tools/cfgtool/gkeeper.h -text -src/tools/cfgtool/menu.c -text -src/tools/cfgtool/pixmaps/book_closed.xpm -text -src/tools/cfgtool/pixmaps/book_open.xpm -text -src/tools/cfgtool/pixmaps/data.xpm -text -src/tools/cfgtool/pixmaps/float.xpm -text -src/tools/cfgtool/pixmaps/folder_closed.xpm -text -src/tools/cfgtool/pixmaps/folder_open.xpm -text -src/tools/cfgtool/pixmaps/num.xpm -text -src/tools/cfgtool/pixmaps/string.xpm -text -src/tools/cfgtool/pixmaps/warning.xpm -text -src/tools/cfgtool/tree.c -text -src/tools/kp_exp.c -text -src/tools/kp_imp.c -text -src/tools/kptool.c -text -src/tools/kptool.h -text -src/tools/misc.c -text -src/tools/sqlphp/README -text -src/tools/sqlphp/rta_tables.php -text -src/tools/sqlphp/rta_view.php -text src/transfer.c -text -src/transfer.h -text src/users.c eol=lf -src/users.h eol=lf src/win32/neostats.aps -text src/win32/neostats.bmp -text src/win32/neostats.rc -text src/win32/resource.h -text src/win32/winmain.c -text +tools/Makefile.in -text +tools/README.kptool -text +tools/cfgtool/Makefile -text +tools/cfgtool/README.configtool -text +tools/cfgtool/dialog.c -text +tools/cfgtool/edit.c -text +tools/cfgtool/gkeeper.c -text +tools/cfgtool/gkeeper.h -text +tools/cfgtool/menu.c -text +tools/cfgtool/pixmaps/book_closed.xpm -text +tools/cfgtool/pixmaps/book_open.xpm -text +tools/cfgtool/pixmaps/data.xpm -text +tools/cfgtool/pixmaps/float.xpm -text +tools/cfgtool/pixmaps/folder_closed.xpm -text +tools/cfgtool/pixmaps/folder_open.xpm -text +tools/cfgtool/pixmaps/num.xpm -text +tools/cfgtool/pixmaps/string.xpm -text +tools/cfgtool/pixmaps/warning.xpm -text +tools/cfgtool/tree.c -text +tools/kp_exp.c -text +tools/kp_imp.c -text +tools/kptool.c -text +tools/kptool.h -text +tools/misc.c -text +tools/sqlphp/README -text +tools/sqlphp/rta_tables.php -text +tools/sqlphp/rta_view.php -text win32/README -text win32/adns/adns.vcproj -text win32/curl/curl.vcproj -text diff --git a/Makefile.am b/Makefile.am index 91685b39..3cb786a1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ AUTOMAKE_OPTIONS = foreign -SUBDIRS = include src +SUBDIRS = include lib modules tools src ACLOCAL_AMFLAGS = -I autotools bin_SCRIPTS = makeconf cronchk diff --git a/Makefile.in b/Makefile.in index 5986a2dc..ba73d7fc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -43,7 +43,6 @@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ -AS = @AS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -52,11 +51,11 @@ BUILD_CURL_FALSE = @BUILD_CURL_FALSE@ BUILD_CURL_TRUE = @BUILD_CURL_TRUE@ BUILD_PCRE_FALSE = @BUILD_PCRE_FALSE@ BUILD_PCRE_TRUE = @BUILD_PCRE_TRUE@ +BUILD_SQL_FALSE = @BUILD_SQL_FALSE@ +BUILD_SQL_TRUE = @BUILD_SQL_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@ -CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CURL_CFLAGS = @CURL_CFLAGS@ @@ -68,7 +67,6 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -79,13 +77,10 @@ F77 = @F77@ FFLAGS = @FFLAGS@ INCLTDL = @INCLTDL@ INSTALL_DATA = @INSTALL_DATA@ -INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@ -INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ -LIBADD_DL = @LIBADD_DL@ LIBLTDL = @LIBLTDL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -98,7 +93,6 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MODULES = @MODULES@ -OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -119,12 +113,9 @@ STRIP = @STRIP@ VERSION = @VERSION@ YACC = @YACC@ ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -141,7 +132,6 @@ build_configtool = @build_configtool@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ -buildsqlsrv = @buildsqlsrv@ datadir = $(prefix)/data exec_prefix = @exec_prefix@ host = @host@ @@ -161,11 +151,10 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -sqlsrvbuild = @sqlsrvbuild@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ AUTOMAKE_OPTIONS = foreign -SUBDIRS = include src +SUBDIRS = include lib modules tools src ACLOCAL_AMFLAGS = -I autotools bin_SCRIPTS = makeconf cronchk diff --git a/aclocal.m4 b/aclocal.m4 index 3d08bb1c..ee91c7b9 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -6749,418 +6749,6 @@ SED=$lt_cv_path_SED AC_MSG_RESULT([$SED]) ]) - -# serial 6 AC_LIB_LTDL - -# AC_WITH_LTDL -# ------------ -# Clients of libltdl can use this macro to allow the installer to -# choose between a shipped copy of the ltdl sources or a preinstalled -# version of the library. -AC_DEFUN([AC_WITH_LTDL], -[AC_REQUIRE([AC_LIB_LTDL]) -AC_SUBST([LIBLTDL]) -AC_SUBST([INCLTDL]) - -# Unless the user asks us to check, assume no installed ltdl exists. -use_installed_libltdl=no - -AC_ARG_WITH([included_ltdl], - [ --with-included-ltdl use the GNU ltdl sources included here]) - -if test "x$with_included_ltdl" != xyes; then - # We are not being forced to use the included libltdl sources, so - # decide whether there is a useful installed version we can use. - AC_CHECK_HEADER([ltdl.h], - [AC_CHECK_LIB([ltdl], [lt_dlcaller_register], - [with_included_ltdl=no], - [with_included_ltdl=yes]) - ]) -fi - -if test "x$enable_ltdl_install" != xyes; then - # If the user did not specify an installable libltdl, then default - # to a convenience lib. - AC_LIBLTDL_CONVENIENCE -fi - -if test "x$with_included_ltdl" = xno; then - # If the included ltdl is not to be used. then Use the - # preinstalled libltdl we found. - AC_DEFINE([HAVE_LTDL], 1, - [Define this if a modern libltdl is already installed]) - LIBLTDL=-lltdl -fi - -# Report our decision... -AC_MSG_CHECKING([whether to use included libltdl]) -AC_MSG_RESULT([$with_included_ltdl]) - -AC_CONFIG_SUBDIRS([libltdl]) -])# AC_WITH_LTDL - - -# AC_LIB_LTDL -# ----------- -# Perform all the checks necessary for compilation of the ltdl objects -# -- including compiler checks and header checks. -AC_DEFUN([AC_LIB_LTDL], -[AC_PREREQ(2.50) -AC_REQUIRE([AC_PROG_CC]) -AC_REQUIRE([AC_C_CONST]) -AC_REQUIRE([AC_HEADER_STDC]) -AC_REQUIRE([AC_HEADER_DIRENT]) -AC_REQUIRE([_LT_AC_CHECK_DLFCN]) -AC_REQUIRE([AC_LTDL_ENABLE_INSTALL]) -AC_REQUIRE([AC_LTDL_SHLIBEXT]) -AC_REQUIRE([AC_LTDL_SHLIBPATH]) -AC_REQUIRE([AC_LTDL_SYSSEARCHPATH]) -AC_REQUIRE([AC_LTDL_OBJDIR]) -AC_REQUIRE([AC_LTDL_DLPREOPEN]) -AC_REQUIRE([AC_LTDL_DLLIB]) -AC_REQUIRE([AC_LTDL_SYMBOL_USCORE]) -AC_REQUIRE([AC_LTDL_DLSYM_USCORE]) -AC_REQUIRE([AC_LTDL_SYS_DLOPEN_DEPLIBS]) -AC_REQUIRE([AC_LTDL_FUNC_ARGZ]) - -AC_CHECK_HEADERS([assert.h ctype.h errno.h malloc.h memory.h stdlib.h \ - stdio.h unistd.h]) -AC_CHECK_HEADERS([dl.h sys/dl.h dld.h mach-o/dyld.h]) -AC_CHECK_HEADERS([string.h strings.h], [break]) - -AC_CHECK_FUNCS([strchr index], [break]) -AC_CHECK_FUNCS([strrchr rindex], [break]) -AC_CHECK_FUNCS([memcpy bcopy], [break]) -AC_CHECK_FUNCS([memmove strcmp]) -AC_CHECK_FUNCS([closedir opendir readdir]) -])# AC_LIB_LTDL - - -# AC_LTDL_ENABLE_INSTALL -# ---------------------- -AC_DEFUN([AC_LTDL_ENABLE_INSTALL], -[AC_ARG_ENABLE([ltdl-install], - [AC_HELP_STRING([--enable-ltdl-install], [install libltdl])]) - -AM_CONDITIONAL(INSTALL_LTDL, test x"${enable_ltdl_install-no}" != xno) -AM_CONDITIONAL(CONVENIENCE_LTDL, test x"${enable_ltdl_convenience-no}" != xno) -])])# AC_LTDL_ENABLE_INSTALL - - -# AC_LTDL_SYS_DLOPEN_DEPLIBS -# -------------------------- -AC_DEFUN([AC_LTDL_SYS_DLOPEN_DEPLIBS], -[AC_REQUIRE([AC_CANONICAL_HOST]) -AC_CACHE_CHECK([whether deplibs are loaded by dlopen], - [libltdl_cv_sys_dlopen_deplibs], - [# PORTME does your system automatically load deplibs for dlopen? - # or its logical equivalent (e.g. shl_load for HP-UX < 11) - # For now, we just catch OSes we know something about -- in the - # future, we'll try test this programmatically. - libltdl_cv_sys_dlopen_deplibs=unknown - case "$host_os" in - aix3*|aix4.1.*|aix4.2.*) - # Unknown whether this is true for these versions of AIX, but - # we want this `case' here to explicitly catch those versions. - libltdl_cv_sys_dlopen_deplibs=unknown - ;; - aix[[45]]*) - libltdl_cv_sys_dlopen_deplibs=yes - ;; - darwin*) - # Assuming the user has installed a libdl from somewhere, this is true - # If you are looking for one http://www.opendarwin.org/projects/dlcompat - libltdl_cv_sys_dlopen_deplibs=yes - ;; - gnu*) - libltdl_cv_sys_dlopen_deplibs=yes - ;; - hpux10*|hpux11*) - libltdl_cv_sys_dlopen_deplibs=yes - ;; - irix[[12345]]*|irix6.[[01]]*) - # Catch all versions of IRIX before 6.2, and indicate that we don't - # know how it worked for any of those versions. - libltdl_cv_sys_dlopen_deplibs=unknown - ;; - irix*) - # The case above catches anything before 6.2, and it's known that - # at 6.2 and later dlopen does load deplibs. - libltdl_cv_sys_dlopen_deplibs=yes - ;; - linux*) - libltdl_cv_sys_dlopen_deplibs=yes - ;; - netbsd*) - libltdl_cv_sys_dlopen_deplibs=yes - ;; - openbsd*) - libltdl_cv_sys_dlopen_deplibs=yes - ;; - osf[[1234]]*) - # dlopen did load deplibs (at least at 4.x), but until the 5.x series, - # it did *not* use an RPATH in a shared library to find objects the - # library depends on, so we explictly say `no'. - libltdl_cv_sys_dlopen_deplibs=no - ;; - osf5.0|osf5.0a|osf5.1) - # dlopen *does* load deplibs and with the right loader patch applied - # it even uses RPATH in a shared library to search for shared objects - # that the library depends on, but there's no easy way to know if that - # patch is installed. Since this is the case, all we can really - # say is unknown -- it depends on the patch being installed. If - # it is, this changes to `yes'. Without it, it would be `no'. - libltdl_cv_sys_dlopen_deplibs=unknown - ;; - osf*) - # the two cases above should catch all versions of osf <= 5.1. Read - # the comments above for what we know about them. - # At > 5.1, deplibs are loaded *and* any RPATH in a shared library - # is used to find them so we can finally say `yes'. - libltdl_cv_sys_dlopen_deplibs=yes - ;; - solaris*) - libltdl_cv_sys_dlopen_deplibs=yes - ;; - esac - ]) -if test "$libltdl_cv_sys_dlopen_deplibs" != yes; then - AC_DEFINE([LTDL_DLOPEN_DEPLIBS], [1], - [Define if the OS needs help to load dependent libraries for dlopen().]) -fi -])# AC_LTDL_SYS_DLOPEN_DEPLIBS - - -# AC_LTDL_SHLIBEXT -# ---------------- -AC_DEFUN([AC_LTDL_SHLIBEXT], -[AC_REQUIRE([AC_LIBTOOL_SYS_DYNAMIC_LINKER]) -AC_CACHE_CHECK([which extension is used for loadable modules], - [libltdl_cv_shlibext], -[ -module=yes -eval libltdl_cv_shlibext=$shrext - ]) -if test -n "$libltdl_cv_shlibext"; then - AC_DEFINE_UNQUOTED(LTDL_SHLIB_EXT, "$libltdl_cv_shlibext", - [Define to the extension used for shared libraries, say, ".so".]) -fi -])# AC_LTDL_SHLIBEXT - - -# AC_LTDL_SHLIBPATH -# ----------------- -AC_DEFUN([AC_LTDL_SHLIBPATH], -[AC_REQUIRE([AC_LIBTOOL_SYS_DYNAMIC_LINKER]) -AC_CACHE_CHECK([which variable specifies run-time library path], - [libltdl_cv_shlibpath_var], [libltdl_cv_shlibpath_var="$shlibpath_var"]) -if test -n "$libltdl_cv_shlibpath_var"; then - AC_DEFINE_UNQUOTED(LTDL_SHLIBPATH_VAR, "$libltdl_cv_shlibpath_var", - [Define to the name of the environment variable that determines the dynamic library search path.]) -fi -])# AC_LTDL_SHLIBPATH - - -# AC_LTDL_SYSSEARCHPATH -# --------------------- -AC_DEFUN([AC_LTDL_SYSSEARCHPATH], -[AC_REQUIRE([AC_LIBTOOL_SYS_DYNAMIC_LINKER]) -AC_CACHE_CHECK([for the default library search path], - [libltdl_cv_sys_search_path], - [libltdl_cv_sys_search_path="$sys_lib_dlsearch_path_spec"]) -if test -n "$libltdl_cv_sys_search_path"; then - sys_search_path= - for dir in $libltdl_cv_sys_search_path; do - if test -z "$sys_search_path"; then - sys_search_path="$dir" - else - sys_search_path="$sys_search_path$PATH_SEPARATOR$dir" - fi - done - AC_DEFINE_UNQUOTED(LTDL_SYSSEARCHPATH, "$sys_search_path", - [Define to the system default library search path.]) -fi -])# AC_LTDL_SYSSEARCHPATH - - -# AC_LTDL_OBJDIR -# -------------- -AC_DEFUN([AC_LTDL_OBJDIR], -[AC_CACHE_CHECK([for objdir], - [libltdl_cv_objdir], - [libltdl_cv_objdir="$objdir" - if test -n "$objdir"; then - : - else - rm -f .libs 2>/dev/null - mkdir .libs 2>/dev/null - if test -d .libs; then - libltdl_cv_objdir=.libs - else - # MS-DOS does not allow filenames that begin with a dot. - libltdl_cv_objdir=_libs - fi - rmdir .libs 2>/dev/null - fi - ]) -AC_DEFINE_UNQUOTED(LTDL_OBJDIR, "$libltdl_cv_objdir/", - [Define to the sub-directory in which libtool stores uninstalled libraries.]) -])# AC_LTDL_OBJDIR - - -# AC_LTDL_DLPREOPEN -# ----------------- -AC_DEFUN([AC_LTDL_DLPREOPEN], -[AC_REQUIRE([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE]) -AC_CACHE_CHECK([whether libtool supports -dlopen/-dlpreopen], - [libltdl_cv_preloaded_symbols], - [if test -n "$lt_cv_sys_global_symbol_pipe"; then - libltdl_cv_preloaded_symbols=yes - else - libltdl_cv_preloaded_symbols=no - fi - ]) -if test x"$libltdl_cv_preloaded_symbols" = xyes; then - AC_DEFINE(HAVE_PRELOADED_SYMBOLS, 1, - [Define if libtool can extract symbol lists from object files.]) -fi -])# AC_LTDL_DLPREOPEN - - -# AC_LTDL_DLLIB -# ------------- -AC_DEFUN([AC_LTDL_DLLIB], -[LIBADD_DL= -AC_SUBST(LIBADD_DL) -AC_LANG_PUSH([C]) - -AC_CHECK_FUNC([shl_load], - [AC_DEFINE([HAVE_SHL_LOAD], [1], - [Define if you have the shl_load function.])], - [AC_CHECK_LIB([dld], [shl_load], - [AC_DEFINE([HAVE_SHL_LOAD], [1], - [Define if you have the shl_load function.]) - LIBADD_DL="$LIBADD_DL -ldld"], - [AC_CHECK_LIB([dl], [dlopen], - [AC_DEFINE([HAVE_LIBDL], [1], - [Define if you have the libdl library or equivalent.]) - LIBADD_DL="-ldl" libltdl_cv_lib_dl_dlopen="yes"], - [AC_TRY_LINK([#if HAVE_DLFCN_H -# include -#endif - ], - [dlopen(0, 0);], - [AC_DEFINE([HAVE_LIBDL], [1], - [Define if you have the libdl library or equivalent.]) libltdl_cv_func_dlopen="yes"], - [AC_CHECK_LIB([svld], [dlopen], - [AC_DEFINE([HAVE_LIBDL], [1], - [Define if you have the libdl library or equivalent.]) - LIBADD_DL="-lsvld" libltdl_cv_func_dlopen="yes"], - [AC_CHECK_LIB([dld], [dld_link], - [AC_DEFINE([HAVE_DLD], [1], - [Define if you have the GNU dld library.]) - LIBADD_DL="$LIBADD_DL -ldld"], - [AC_CHECK_FUNC([_dyld_func_lookup], - [AC_DEFINE([HAVE_DYLD], [1], - [Define if you have the _dyld_func_lookup function.])]) - ]) - ]) - ]) - ]) - ]) -]) - -if test x"$libltdl_cv_func_dlopen" = xyes || test x"$libltdl_cv_lib_dl_dlopen" = xyes -then - lt_save_LIBS="$LIBS" - LIBS="$LIBS $LIBADD_DL" - AC_CHECK_FUNCS([dlerror]) - LIBS="$lt_save_LIBS" -fi -AC_LANG_POP -])# AC_LTDL_DLLIB - - -# AC_LTDL_SYMBOL_USCORE -# --------------------- -# does the compiler prefix global symbols with an underscore? -AC_DEFUN([AC_LTDL_SYMBOL_USCORE], -[AC_REQUIRE([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE]) -AC_CACHE_CHECK([for _ prefix in compiled symbols], - [ac_cv_sys_symbol_underscore], - [ac_cv_sys_symbol_underscore=no - cat > conftest.$ac_ext < $ac_nlist) && test -s "$ac_nlist"; then - # See whether the symbols have a leading underscore. - if grep '^. _nm_test_func' "$ac_nlist" >/dev/null; then - ac_cv_sys_symbol_underscore=yes - else - if grep '^. nm_test_func ' "$ac_nlist" >/dev/null; then - : - else - echo "configure: cannot find nm_test_func in $ac_nlist" >&AC_FD_CC - fi - fi - else - echo "configure: cannot run $lt_cv_sys_global_symbol_pipe" >&AC_FD_CC - fi - else - echo "configure: failed program was:" >&AC_FD_CC - cat conftest.c >&AC_FD_CC - fi - rm -rf conftest* - ]) -])# AC_LTDL_SYMBOL_USCORE - - -# AC_LTDL_DLSYM_USCORE -# -------------------- -AC_DEFUN([AC_LTDL_DLSYM_USCORE], -[AC_REQUIRE([AC_LTDL_SYMBOL_USCORE]) -if test x"$ac_cv_sys_symbol_underscore" = xyes; then - if test x"$libltdl_cv_func_dlopen" = xyes || - test x"$libltdl_cv_lib_dl_dlopen" = xyes ; then - AC_CACHE_CHECK([whether we have to add an underscore for dlsym], - [libltdl_cv_need_uscore], - [libltdl_cv_need_uscore=unknown - save_LIBS="$LIBS" - LIBS="$LIBS $LIBADD_DL" - _LT_AC_TRY_DLOPEN_SELF( - [libltdl_cv_need_uscore=no], [libltdl_cv_need_uscore=yes], - [], [libltdl_cv_need_uscore=cross]) - LIBS="$save_LIBS" - ]) - fi -fi - -if test x"$libltdl_cv_need_uscore" = xyes; then - AC_DEFINE(NEED_USCORE, 1, - [Define if dlsym() requires a leading underscore in symbol names.]) -fi -])# AC_LTDL_DLSYM_USCORE - -# AC_LTDL_FUNC_ARGZ -# ----------------- -AC_DEFUN([AC_LTDL_FUNC_ARGZ], -[AC_CHECK_HEADERS([argz.h]) - -AC_CHECK_TYPES([error_t], - [], - [AC_DEFINE([error_t], [int], - [Define to a type to use for `error_t' if it is not otherwise available.])], - [#if HAVE_ARGZ_H -# include -#endif]) - -AC_CHECK_FUNCS([argz_append argz_create_sep argz_insert argz_next argz_stringify]) -])# AC_LTDL_FUNC_ARGZ - AC_DEFUN([TYPE_SOCKLEN_T], [ AC_CHECK_TYPE([socklen_t], ,[ @@ -7462,6 +7050,7 @@ else AC_CHECK_LIB(pcre, pcre_study) if test "$ac_cv_lib_pcre_pcre_study" = "yes" ; then PCRE_LIBS="-lpcre" + PCRE_CFLAGS="-I$(top_srcdir)/lib/pcre" LIBS="$OLDLIBS" AC_MSG_CHECKING([lib pcre]) AC_MSG_RESULT([$PCRE_LIBS]) @@ -7514,11 +7103,10 @@ AC_DEFINE(PCRE_MAJOR_VERSION, $NPCRE_MAJOR_VERSION, "PCRE Version") AC_DEFINE(PCRE_MINOR_VERSION, NPCRE_MINOR_VERSION, "PCRE Version") AC_DEFINE(PCRE_VERSION, NPCRE_VERSION, "Pcre full version") PCRE_LIBS='${top_srcdir}/'src/pcre/libpcre.la -PCRE_CFLAGS='-I${top_srcdir}/'src/pcre +PCRE_CFLAGS='-I${top_srcdir}/'lib/pcre AC_SUBST([PCRE_LIBS]) AC_SUBST([PCRE_CFLAGS]) AM_CONDITIONAL(BUILD_PCRE, true) -AC_MSG_RESULT([ok]) ]) AC_DEFUN([AX_PATH_LIB_CURL], [dnl diff --git a/autotools/ax_path_lib_pcre.m4 b/autotools/ax_path_lib_pcre.m4 index dcdcab44..6bbe8430 100644 --- a/autotools/ax_path_lib_pcre.m4 +++ b/autotools/ax_path_lib_pcre.m4 @@ -27,6 +27,7 @@ else AC_CHECK_LIB(pcre, pcre_study) if test "$ac_cv_lib_pcre_pcre_study" = "yes" ; then PCRE_LIBS="-lpcre" + PCRE_CFLAGS="-I$(top_srcdir)/lib/pcre" LIBS="$OLDLIBS" AC_MSG_CHECKING([lib pcre]) AC_MSG_RESULT([$PCRE_LIBS]) @@ -79,9 +80,8 @@ AC_DEFINE(PCRE_MAJOR_VERSION, $NPCRE_MAJOR_VERSION, "PCRE Version") AC_DEFINE(PCRE_MINOR_VERSION, NPCRE_MINOR_VERSION, "PCRE Version") AC_DEFINE(PCRE_VERSION, NPCRE_VERSION, "Pcre full version") PCRE_LIBS='${top_srcdir}/'src/pcre/libpcre.la -PCRE_CFLAGS='-I${top_srcdir}/'src/pcre +PCRE_CFLAGS='-I${top_srcdir}/'lib/pcre AC_SUBST([PCRE_LIBS]) AC_SUBST([PCRE_CFLAGS]) AM_CONDITIONAL(BUILD_PCRE, true) -AC_MSG_RESULT([ok]) ]) diff --git a/configure b/configure index 8c6bef8a..f0d41dfb 100755 --- a/configure +++ b/configure @@ -464,7 +464,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL YACC SED INSTALL_LTDL_TRUE INSTALL_LTDL_FALSE CONVENIENCE_LTDL_TRUE CONVENIENCE_LTDL_FALSE LIBADD_DL ALLOCA LIBOBJS POW_LIB sqlsrvbuild buildsqlsrv PCRE_LIBS PCRE_CFLAGS BUILD_PCRE_TRUE BUILD_PCRE_FALSE CURL_LIBS CURL_CFLAGS BUILD_CURL_TRUE BUILD_CURL_FALSE build_configtool PROTOCOL INCLTDL LIBLTDL LIBTOOL_DEPS MODULES LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL YACC SED ALLOCA LIBOBJS POW_LIB BUILD_SQL_TRUE BUILD_SQL_FALSE PCRE_LIBS PCRE_CFLAGS BUILD_PCRE_TRUE BUILD_PCRE_FALSE CURL_LIBS CURL_CFLAGS BUILD_CURL_TRUE BUILD_CURL_FALSE build_configtool PROTOCOL INCLTDL LIBLTDL LIBTOOL_DEPS MODULES LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1035,7 +1035,6 @@ Optional Features: --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) - --enable-ltdl-install install libltdl --enable-debug - Enable Debuging --enable-autodebug - Enable AutoTools Debug --enable-raw - Enable Raw command @@ -1985,20 +1984,6 @@ _ACEOF - - case $enable_ltdl_convenience in - no) { { echo "$as_me:$LINENO: error: this package needs a convenience libltdl" >&5 -echo "$as_me: error: this package needs a convenience libltdl" >&2;} - { (exit 1); exit 1; }; } ;; - "") enable_ltdl_convenience=yes - ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; - esac - LIBLTDL='${top_builddir}/''libltdl'/libltdlc.la - LTDLINCL='-I${top_srcdir}/''libltdl' - # For backwards non-gettext consistent compatibility... - INCLTDL="$LTDLINCL" - - # Checks for programs. ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -3722,7 +3707,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3725 "configure"' > conftest.$ac_ext + echo '#line 3710 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -3878,248 +3863,6 @@ echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6 CFLAGS="$SAVE_CFLAGS" fi ;; -*-*-cygwin* | *-*-mingw* | *-*-pw32*) - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_DLLTOOL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$DLLTOOL"; then - ac_cv_prog_DLLTOOL="$DLLTOOL" # 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -DLLTOOL=$ac_cv_prog_DLLTOOL -if test -n "$DLLTOOL"; then - echo "$as_me:$LINENO: result: $DLLTOOL" >&5 -echo "${ECHO_T}$DLLTOOL" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_DLLTOOL"; then - ac_ct_DLLTOOL=$DLLTOOL - # Extract the first word of "dlltool", so it can be a program name with args. -set dummy dlltool; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_DLLTOOL"; then - ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_DLLTOOL="dlltool" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - test -z "$ac_cv_prog_ac_ct_DLLTOOL" && ac_cv_prog_ac_ct_DLLTOOL="false" -fi -fi -ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -if test -n "$ac_ct_DLLTOOL"; then - echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 -echo "${ECHO_T}$ac_ct_DLLTOOL" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - DLLTOOL=$ac_ct_DLLTOOL -else - DLLTOOL="$ac_cv_prog_DLLTOOL" -fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. -set dummy ${ac_tool_prefix}as; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_AS+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$AS"; then - ac_cv_prog_AS="$AS" # 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_AS="${ac_tool_prefix}as" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -AS=$ac_cv_prog_AS -if test -n "$AS"; then - echo "$as_me:$LINENO: result: $AS" >&5 -echo "${ECHO_T}$AS" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_AS"; then - ac_ct_AS=$AS - # Extract the first word of "as", so it can be a program name with args. -set dummy as; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_AS+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_AS"; then - ac_cv_prog_ac_ct_AS="$ac_ct_AS" # 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_AS="as" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - test -z "$ac_cv_prog_ac_ct_AS" && ac_cv_prog_ac_ct_AS="false" -fi -fi -ac_ct_AS=$ac_cv_prog_ac_ct_AS -if test -n "$ac_ct_AS"; then - echo "$as_me:$LINENO: result: $ac_ct_AS" >&5 -echo "${ECHO_T}$ac_ct_AS" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - AS=$ac_ct_AS -else - AS="$ac_cv_prog_AS" -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 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_OBJDUMP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$OBJDUMP"; then - ac_cv_prog_OBJDUMP="$OBJDUMP" # 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -OBJDUMP=$ac_cv_prog_OBJDUMP -if test -n "$OBJDUMP"; then - echo "$as_me:$LINENO: result: $OBJDUMP" >&5 -echo "${ECHO_T}$OBJDUMP" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_OBJDUMP"; then - ac_ct_OBJDUMP=$OBJDUMP - # Extract the first word of "objdump", so it can be a program name with args. -set dummy objdump; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_OBJDUMP"; then - ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_OBJDUMP="objdump" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - test -z "$ac_cv_prog_ac_ct_OBJDUMP" && ac_cv_prog_ac_ct_OBJDUMP="false" -fi -fi -ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP -if test -n "$ac_ct_OBJDUMP"; then - echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 -echo "${ECHO_T}$ac_ct_OBJDUMP" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - OBJDUMP=$ac_ct_OBJDUMP -else - OBJDUMP="$ac_cv_prog_OBJDUMP" -fi - - ;; esac @@ -5529,7 +5272,7 @@ fi # Provide some information about the compiler. -echo "$as_me:5532:" \ +echo "$as_me:5275:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -6422,7 +6165,7 @@ fi esac enable_dlopen=yes -enable_win32_dll=yes +enable_win32_dll=no # Check whether --enable-libtool-lock or --disable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then @@ -6556,11 +6299,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6559: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6302: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6563: \$? = $ac_status" >&5 + echo "$as_me:6306: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6788,11 +6531,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6791: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6534: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6795: \$? = $ac_status" >&5 + echo "$as_me:6538: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6855,11 +6598,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6858: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6601: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6862: \$? = $ac_status" >&5 + echo "$as_me:6605: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8240,7 +7983,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*) - echo '#line 8243 "configure"' > conftest.$ac_ext + echo '#line 7986 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9022,7 +8765,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:11018: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11279: \$? = $ac_status" >&5 + echo "$as_me:11022: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -11339,11 +11082,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11342: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11085: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11346: \$? = $ac_status" >&5 + echo "$as_me:11089: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11910,7 +11653,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*) - echo '#line 11913 "configure"' > conftest.$ac_ext + echo '#line 11656 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -12692,7 +12435,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:13358: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13619: \$? = $ac_status" >&5 + echo "$as_me:13362: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -13679,11 +13422,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13682: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13425: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13686: \$? = $ac_status" >&5 + echo "$as_me:13429: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15044,7 +14787,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*) - echo '#line 15047 "configure"' > conftest.$ac_ext + echo '#line 14790 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -15690,11 +15433,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15693: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15436: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15697: \$? = $ac_status" >&5 + echo "$as_me:15440: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15922,11 +15665,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15925: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15668: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15929: \$? = $ac_status" >&5 + echo "$as_me:15672: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15989,11 +15732,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15992: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15735: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15996: \$? = $ac_status" >&5 + echo "$as_me:15739: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17374,7 +17117,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*) - echo '#line 17377 "configure"' > conftest.$ac_ext + echo '#line 17120 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -18156,7 +17899,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5 -echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 -if test "${ac_cv_c_const+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -/* FIXME: Include the comments suggested by Paul. */ -#ifndef __cplusplus - /* Ultrix mips cc rejects this. */ - typedef int charset[2]; - const charset x; - /* SunOS 4.1.1 cc rejects this. */ - char const *const *ccp; - char **p; - /* NEC SVR4.0.2 mips cc rejects this. */ - struct point {int x, y;}; - static struct point const zero = {0,0}; - /* AIX XL C 1.02.0.0 rejects this. - It does not let you subtract one const X* pointer from another in - an arm of an if-expression whose if-part is not a constant - expression */ - const char *g = "string"; - ccp = &g + (g ? g-g : 0); - /* HPUX 7.0 cc rejects these. */ - ++ccp; - p = (char**) ccp; - ccp = (char const *const *) p; - { /* SCO 3.2v4 cc rejects this. */ - char *t; - char const *s = 0 ? (char *) 0 : (char const *) 0; - - *t++ = 0; - } - { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ - int x[] = {25, 17}; - const int *foo = &x[0]; - ++foo; - } - { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ - typedef const int *iptr; - iptr p = 0; - ++p; - } - { /* AIX XL C 1.02.0.0 rejects this saying - "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; }; - struct s *b; b->j = 5; - } - { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ - const int foo = 10; - } -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_c_const=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_c_const=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 -echo "${ECHO_T}$ac_cv_c_const" >&6 -if test $ac_cv_c_const = no; then - -cat >>confdefs.h <<\_ACEOF -#define const -_ACEOF - -fi - - - - - - -ac_header_dirent=no -for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do - as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5 -echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include <$ac_hdr> - -int -main () -{ -if ((DIR *) 0) -return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -eval "$as_ac_Header=no" -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 -_ACEOF - -ac_header_dirent=$ac_hdr; break -fi - -done -# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. -if test $ac_header_dirent = dirent.h; then - echo "$as_me:$LINENO: checking for library containing opendir" >&5 -echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6 -if test "${ac_cv_search_opendir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_func_search_save_LIBS=$LIBS -ac_cv_search_opendir=no -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char opendir (); -int -main () -{ -opendir (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_search_opendir="none required" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -if test "$ac_cv_search_opendir" = no; then - for ac_lib in dir; do - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char opendir (); -int -main () -{ -opendir (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_search_opendir="-l$ac_lib" -break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - done -fi -LIBS=$ac_func_search_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 -echo "${ECHO_T}$ac_cv_search_opendir" >&6 -if test "$ac_cv_search_opendir" != no; then - test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS" - -fi - -else - echo "$as_me:$LINENO: checking for library containing opendir" >&5 -echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6 -if test "${ac_cv_search_opendir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_func_search_save_LIBS=$LIBS -ac_cv_search_opendir=no -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char opendir (); -int -main () -{ -opendir (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_search_opendir="none required" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -if test "$ac_cv_search_opendir" = no; then - for ac_lib in x; do - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char opendir (); -int -main () -{ -opendir (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_search_opendir="-l$ac_lib" -break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - done -fi -LIBS=$ac_func_search_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 -echo "${ECHO_T}$ac_cv_search_opendir" >&6 -if test "$ac_cv_search_opendir" != no; then - test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS" - -fi - -fi - -# Check whether --enable-ltdl-install or --disable-ltdl-install was given. -if test "${enable_ltdl_install+set}" = set; then - enableval="$enable_ltdl_install" - -fi; - - - -if test x"${enable_ltdl_install-no}" != xno; then - INSTALL_LTDL_TRUE= - INSTALL_LTDL_FALSE='#' -else - INSTALL_LTDL_TRUE='#' - INSTALL_LTDL_FALSE= -fi - - - -if test x"${enable_ltdl_convenience-no}" != xno; then - CONVENIENCE_LTDL_TRUE= - CONVENIENCE_LTDL_FALSE='#' -else - CONVENIENCE_LTDL_TRUE='#' - CONVENIENCE_LTDL_FALSE= -fi - - - -echo "$as_me:$LINENO: checking which extension is used for loadable modules" >&5 -echo $ECHO_N "checking which extension is used for loadable modules... $ECHO_C" >&6 -if test "${libltdl_cv_shlibext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - -module=yes -eval libltdl_cv_shlibext=$shrext - -fi -echo "$as_me:$LINENO: result: $libltdl_cv_shlibext" >&5 -echo "${ECHO_T}$libltdl_cv_shlibext" >&6 -if test -n "$libltdl_cv_shlibext"; then - -cat >>confdefs.h <<_ACEOF -#define LTDL_SHLIB_EXT "$libltdl_cv_shlibext" -_ACEOF - -fi - - -echo "$as_me:$LINENO: checking which variable specifies run-time library path" >&5 -echo $ECHO_N "checking which variable specifies run-time library path... $ECHO_C" >&6 -if test "${libltdl_cv_shlibpath_var+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - libltdl_cv_shlibpath_var="$shlibpath_var" -fi -echo "$as_me:$LINENO: result: $libltdl_cv_shlibpath_var" >&5 -echo "${ECHO_T}$libltdl_cv_shlibpath_var" >&6 -if test -n "$libltdl_cv_shlibpath_var"; then - -cat >>confdefs.h <<_ACEOF -#define LTDL_SHLIBPATH_VAR "$libltdl_cv_shlibpath_var" -_ACEOF - -fi - - -echo "$as_me:$LINENO: checking for the default library search path" >&5 -echo $ECHO_N "checking for the default library search path... $ECHO_C" >&6 -if test "${libltdl_cv_sys_search_path+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - libltdl_cv_sys_search_path="$sys_lib_dlsearch_path_spec" -fi -echo "$as_me:$LINENO: result: $libltdl_cv_sys_search_path" >&5 -echo "${ECHO_T}$libltdl_cv_sys_search_path" >&6 -if test -n "$libltdl_cv_sys_search_path"; then - sys_search_path= - for dir in $libltdl_cv_sys_search_path; do - if test -z "$sys_search_path"; then - sys_search_path="$dir" - else - sys_search_path="$sys_search_path$PATH_SEPARATOR$dir" - fi - done - -cat >>confdefs.h <<_ACEOF -#define LTDL_SYSSEARCHPATH "$sys_search_path" -_ACEOF - -fi - -echo "$as_me:$LINENO: checking for objdir" >&5 -echo $ECHO_N "checking for objdir... $ECHO_C" >&6 -if test "${libltdl_cv_objdir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - libltdl_cv_objdir="$objdir" - if test -n "$objdir"; then - : - else - rm -f .libs 2>/dev/null - mkdir .libs 2>/dev/null - if test -d .libs; then - libltdl_cv_objdir=.libs - else - # MS-DOS does not allow filenames that begin with a dot. - libltdl_cv_objdir=_libs - fi - rmdir .libs 2>/dev/null - fi - -fi -echo "$as_me:$LINENO: result: $libltdl_cv_objdir" >&5 -echo "${ECHO_T}$libltdl_cv_objdir" >&6 - -cat >>confdefs.h <<_ACEOF -#define LTDL_OBJDIR "$libltdl_cv_objdir/" -_ACEOF - - - -echo "$as_me:$LINENO: checking whether libtool supports -dlopen/-dlpreopen" >&5 -echo $ECHO_N "checking whether libtool supports -dlopen/-dlpreopen... $ECHO_C" >&6 -if test "${libltdl_cv_preloaded_symbols+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$lt_cv_sys_global_symbol_pipe"; then - libltdl_cv_preloaded_symbols=yes - else - libltdl_cv_preloaded_symbols=no - fi - -fi -echo "$as_me:$LINENO: result: $libltdl_cv_preloaded_symbols" >&5 -echo "${ECHO_T}$libltdl_cv_preloaded_symbols" >&6 -if test x"$libltdl_cv_preloaded_symbols" = xyes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_PRELOADED_SYMBOLS 1 -_ACEOF - -fi - -LIBADD_DL= - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -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 - - -echo "$as_me:$LINENO: checking for shl_load" >&5 -echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 -if test "${ac_cv_func_shl_load+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define shl_load to an innocuous variant, in case declares shl_load. - For example, HP-UX 11i declares gettimeofday. */ -#define shl_load innocuous_shl_load - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shl_load (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef shl_load - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char shl_load (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_shl_load) || defined (__stub___shl_load) -choke me -#else -char (*f) () = shl_load; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != shl_load; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_shl_load=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_shl_load=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -echo "${ECHO_T}$ac_cv_func_shl_load" >&6 -if test $ac_cv_func_shl_load = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_SHL_LOAD 1 -_ACEOF - -else - echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 -echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 -if test "${ac_cv_lib_dld_shl_load+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char shl_load (); -int -main () -{ -shl_load (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dld_shl_load=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_dld_shl_load=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 -if test $ac_cv_lib_dld_shl_load = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_SHL_LOAD 1 -_ACEOF - - LIBADD_DL="$LIBADD_DL -ldld" -else - echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 -if test "${ac_cv_lib_dl_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dlopen (); -int -main () -{ -dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dl_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_dl_dlopen=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 -if test $ac_cv_lib_dl_dlopen = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBDL 1 -_ACEOF - - LIBADD_DL="-ldl" libltdl_cv_lib_dl_dlopen="yes" -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#if HAVE_DLFCN_H -# include -#endif - -int -main () -{ -dlopen(0, 0); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBDL 1 -_ACEOF - libltdl_cv_func_dlopen="yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 -echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 -if test "${ac_cv_lib_svld_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsvld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dlopen (); -int -main () -{ -dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_svld_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_svld_dlopen=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 -if test $ac_cv_lib_svld_dlopen = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBDL 1 -_ACEOF - - LIBADD_DL="-lsvld" libltdl_cv_func_dlopen="yes" -else - echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 -echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 -if test "${ac_cv_lib_dld_dld_link+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dld_link (); -int -main () -{ -dld_link (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dld_dld_link=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_dld_dld_link=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 -if test $ac_cv_lib_dld_dld_link = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_DLD 1 -_ACEOF - - LIBADD_DL="$LIBADD_DL -ldld" -else - echo "$as_me:$LINENO: checking for _dyld_func_lookup" >&5 -echo $ECHO_N "checking for _dyld_func_lookup... $ECHO_C" >&6 -if test "${ac_cv_func__dyld_func_lookup+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define _dyld_func_lookup to an innocuous variant, in case declares _dyld_func_lookup. - For example, HP-UX 11i declares gettimeofday. */ -#define _dyld_func_lookup innocuous__dyld_func_lookup - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char _dyld_func_lookup (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef _dyld_func_lookup - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char _dyld_func_lookup (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub__dyld_func_lookup) || defined (__stub____dyld_func_lookup) -choke me -#else -char (*f) () = _dyld_func_lookup; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != _dyld_func_lookup; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func__dyld_func_lookup=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func__dyld_func_lookup=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func__dyld_func_lookup" >&5 -echo "${ECHO_T}$ac_cv_func__dyld_func_lookup" >&6 -if test $ac_cv_func__dyld_func_lookup = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_DYLD 1 -_ACEOF - -fi - - -fi - - -fi - - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -fi - - -fi - - -fi - - -if test x"$libltdl_cv_func_dlopen" = xyes || test x"$libltdl_cv_lib_dl_dlopen" = xyes -then - lt_save_LIBS="$LIBS" - LIBS="$LIBS $LIBADD_DL" - -for ac_func in dlerror -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != $ac_func; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -eval "$as_ac_var=no" -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - - LIBS="$lt_save_LIBS" -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -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 - - - -echo "$as_me:$LINENO: checking for _ prefix in compiled symbols" >&5 -echo $ECHO_N "checking for _ prefix in compiled symbols... $ECHO_C" >&6 -if test "${ac_cv_sys_symbol_underscore+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_sys_symbol_underscore=no - cat > conftest.$ac_ext <&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # Now try to grab the symbols. - ac_nlist=conftest.nm - if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $ac_nlist\"") >&5 - (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s "$ac_nlist"; then - # See whether the symbols have a leading underscore. - if grep '^. _nm_test_func' "$ac_nlist" >/dev/null; then - ac_cv_sys_symbol_underscore=yes - else - if grep '^. nm_test_func ' "$ac_nlist" >/dev/null; then - : - else - echo "configure: cannot find nm_test_func in $ac_nlist" >&5 - fi - fi - else - echo "configure: cannot run $lt_cv_sys_global_symbol_pipe" >&5 - fi - else - echo "configure: failed program was:" >&5 - cat conftest.c >&5 - fi - rm -rf conftest* - -fi -echo "$as_me:$LINENO: result: $ac_cv_sys_symbol_underscore" >&5 -echo "${ECHO_T}$ac_cv_sys_symbol_underscore" >&6 - - -if test x"$ac_cv_sys_symbol_underscore" = xyes; then - if test x"$libltdl_cv_func_dlopen" = xyes || - test x"$libltdl_cv_lib_dl_dlopen" = xyes ; then - echo "$as_me:$LINENO: checking whether we have to add an underscore for dlsym" >&5 -echo $ECHO_N "checking whether we have to add an underscore for dlsym... $ECHO_C" >&6 -if test "${libltdl_cv_need_uscore+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - libltdl_cv_need_uscore=unknown - save_LIBS="$LIBS" - LIBS="$LIBS $LIBADD_DL" - if test "$cross_compiling" = yes; then : - libltdl_cv_need_uscore=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext < -#endif - -#include - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -#ifdef __cplusplus -extern "C" void exit (int); -#endif - -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } - - exit (status); -} -EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) libltdl_cv_need_uscore=no ;; - x$lt_dlneed_uscore) libltdl_cv_need_uscore=yes ;; - x$lt_unknown|x*) ;; - esac - else : - # compilation failed - - fi -fi -rm -fr conftest* - - LIBS="$save_LIBS" - -fi -echo "$as_me:$LINENO: result: $libltdl_cv_need_uscore" >&5 -echo "${ECHO_T}$libltdl_cv_need_uscore" >&6 - fi -fi - -if test x"$libltdl_cv_need_uscore" = xyes; then - -cat >>confdefs.h <<\_ACEOF -#define NEED_USCORE 1 -_ACEOF - -fi - - -echo "$as_me:$LINENO: checking whether deplibs are loaded by dlopen" >&5 -echo $ECHO_N "checking whether deplibs are loaded by dlopen... $ECHO_C" >&6 -if test "${libltdl_cv_sys_dlopen_deplibs+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # PORTME does your system automatically load deplibs for dlopen? - # or its logical equivalent (e.g. shl_load for HP-UX < 11) - # For now, we just catch OSes we know something about -- in the - # future, we'll try test this programmatically. - libltdl_cv_sys_dlopen_deplibs=unknown - case "$host_os" in - aix3*|aix4.1.*|aix4.2.*) - # Unknown whether this is true for these versions of AIX, but - # we want this `case' here to explicitly catch those versions. - libltdl_cv_sys_dlopen_deplibs=unknown - ;; - aix[45]*) - libltdl_cv_sys_dlopen_deplibs=yes - ;; - darwin*) - # Assuming the user has installed a libdl from somewhere, this is true - # If you are looking for one http://www.opendarwin.org/projects/dlcompat - libltdl_cv_sys_dlopen_deplibs=yes - ;; - gnu*) - libltdl_cv_sys_dlopen_deplibs=yes - ;; - hpux10*|hpux11*) - libltdl_cv_sys_dlopen_deplibs=yes - ;; - irix[12345]*|irix6.[01]*) - # Catch all versions of IRIX before 6.2, and indicate that we don't - # know how it worked for any of those versions. - libltdl_cv_sys_dlopen_deplibs=unknown - ;; - irix*) - # The case above catches anything before 6.2, and it's known that - # at 6.2 and later dlopen does load deplibs. - libltdl_cv_sys_dlopen_deplibs=yes - ;; - linux*) - libltdl_cv_sys_dlopen_deplibs=yes - ;; - netbsd*) - libltdl_cv_sys_dlopen_deplibs=yes - ;; - openbsd*) - libltdl_cv_sys_dlopen_deplibs=yes - ;; - osf[1234]*) - # dlopen did load deplibs (at least at 4.x), but until the 5.x series, - # it did *not* use an RPATH in a shared library to find objects the - # library depends on, so we explictly say `no'. - libltdl_cv_sys_dlopen_deplibs=no - ;; - osf5.0|osf5.0a|osf5.1) - # dlopen *does* load deplibs and with the right loader patch applied - # it even uses RPATH in a shared library to search for shared objects - # that the library depends on, but there's no easy way to know if that - # patch is installed. Since this is the case, all we can really - # say is unknown -- it depends on the patch being installed. If - # it is, this changes to `yes'. Without it, it would be `no'. - libltdl_cv_sys_dlopen_deplibs=unknown - ;; - osf*) - # the two cases above should catch all versions of osf <= 5.1. Read - # the comments above for what we know about them. - # At > 5.1, deplibs are loaded *and* any RPATH in a shared library - # is used to find them so we can finally say `yes'. - libltdl_cv_sys_dlopen_deplibs=yes - ;; - solaris*) - libltdl_cv_sys_dlopen_deplibs=yes - ;; - esac - -fi -echo "$as_me:$LINENO: result: $libltdl_cv_sys_dlopen_deplibs" >&5 -echo "${ECHO_T}$libltdl_cv_sys_dlopen_deplibs" >&6 -if test "$libltdl_cv_sys_dlopen_deplibs" != yes; then - -cat >>confdefs.h <<\_ACEOF -#define LTDL_DLOPEN_DEPLIBS 1 -_ACEOF - -fi - - -for ac_header in argz.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - -echo "$as_me:$LINENO: checking for error_t" >&5 -echo $ECHO_N "checking for error_t... $ECHO_C" >&6 -if test "${ac_cv_type_error_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#if HAVE_ARGZ_H -# include -#endif - -int -main () -{ -if ((error_t *) 0) - return 0; -if (sizeof (error_t)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type_error_t=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_type_error_t=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_type_error_t" >&5 -echo "${ECHO_T}$ac_cv_type_error_t" >&6 -if test $ac_cv_type_error_t = yes; then - -cat >>confdefs.h <<_ACEOF -#define HAVE_ERROR_T 1 -_ACEOF - - -else - -cat >>confdefs.h <<\_ACEOF -#define error_t int -_ACEOF - -fi - - - - - - - -for ac_func in argz_append argz_create_sep argz_insert argz_next argz_stringify -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != $ac_func; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -eval "$as_ac_var=no" -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - - - - - - - - - - - - - - - - - - - - - - - - - - - - -for ac_header in assert.h ctype.h errno.h malloc.h memory.h stdlib.h \ - stdio.h unistd.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - - - - -for ac_header in dl.h sys/dl.h dld.h mach-o/dyld.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - - -for ac_header in string.h strings.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - break -fi - -done - - - - -for ac_func in strchr index -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != $ac_func; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -eval "$as_ac_var=no" -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - break -fi -done - - - -for ac_func in strrchr rindex -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != $ac_func; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -eval "$as_ac_var=no" -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - break -fi -done - - - -for ac_func in memcpy bcopy -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != $ac_func; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -eval "$as_ac_var=no" -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - break -fi -done - - - -for ac_func in memmove strcmp -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != $ac_func; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -eval "$as_ac_var=no" -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - - - - -for ac_func in closedir opendir readdir -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != $ac_func; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -eval "$as_ac_var=no" -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - - # Checks for header files. echo "$as_me:$LINENO: checking for ANSI C header files" >&5 @@ -27789,12 +24696,28 @@ _ACEOF echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 - sqlsrvbuild=sqlsrv/librtadb.a - buildsqlsrv=sqlsrvlib + +if true; then + BUILD_SQL_TRUE= + BUILD_SQL_FALSE='#' +else + BUILD_SQL_TRUE='#' + BUILD_SQL_FALSE= +fi ;; *) + + +if false; then + BUILD_SQL_TRUE= + BUILD_SQL_FALSE='#' +else + BUILD_SQL_TRUE='#' + BUILD_SQL_FALSE= +fi + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 ;; @@ -27803,6 +24726,16 @@ else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 + +if false; then + BUILD_SQL_TRUE= + BUILD_SQL_FALSE='#' +else + BUILD_SQL_TRUE='#' + BUILD_SQL_FALSE= +fi + + fi; echo "$as_me:$LINENO: checking The Modules that will be automatically compiled" >&5 @@ -27893,7 +24826,7 @@ cat >>confdefs.h <<\_ACEOF _ACEOF PCRE_LIBS='${top_srcdir}/'src/pcre/libpcre.la -PCRE_CFLAGS='-I${top_srcdir}/'src/pcre +PCRE_CFLAGS='-I${top_srcdir}/'lib/pcre @@ -27906,8 +24839,6 @@ else BUILD_PCRE_FALSE= fi -echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6 else echo "$as_me:$LINENO: result: (testing)" >&5 @@ -27989,6 +24920,7 @@ fi if test "$ac_cv_lib_pcre_pcre_study" = "yes" ; then PCRE_LIBS="-lpcre" + PCRE_CFLAGS="-I$(top_srcdir)/lib/pcre" LIBS="$OLDLIBS" echo "$as_me:$LINENO: checking lib pcre" >&5 echo $ECHO_N "checking lib pcre... $ECHO_C" >&6 @@ -28154,7 +25086,7 @@ cat >>confdefs.h <<\_ACEOF _ACEOF PCRE_LIBS='${top_srcdir}/'src/pcre/libpcre.la -PCRE_CFLAGS='-I${top_srcdir}/'src/pcre +PCRE_CFLAGS='-I${top_srcdir}/'lib/pcre @@ -28167,8 +25099,6 @@ else BUILD_PCRE_FALSE= fi -echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6 fi fi @@ -33190,7 +30120,7 @@ _ACEOF - ac_config_files="$ac_config_files Makefile include/Makefile src/Makefile src/protocol/Makefile src/curl/Makefile src/keeper/Makefile src/adns/Makefile src/pcre/Makefile src/libltdl/Makefile src/modules/Makefile src/modules/connectserv/Makefile src/modules/extauth/Makefile src/modules/hostserv/Makefile src/modules/ircdauth/Makefile src/modules/loveserv/Makefile src/modules/moraleserv/Makefile src/modules/statserv/Makefile src/modules/template/Makefile src/modules/templateauth/Makefile cronchk" + ac_config_files="$ac_config_files Makefile include/Makefile src/Makefile src/protocol/Makefile lib/Makefile lib/curl/Makefile lib/keeper/Makefile lib/adns/Makefile lib/pcre/Makefile modules/Makefile modules/connectserv/Makefile modules/extauth/Makefile modules/hostserv/Makefile modules/ircdauth/Makefile modules/loveserv/Makefile modules/moraleserv/Makefile modules/statserv/Makefile modules/template/Makefile modules/templateauth/Makefile cronchk" cat >confcache <<\_ACEOF @@ -33366,17 +30296,24 @@ echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -if test -z "${INSTALL_LTDL_TRUE}" && test -z "${INSTALL_LTDL_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"INSTALL_LTDL\" was never defined. +if test -z "${BUILD_SQL_TRUE}" && test -z "${BUILD_SQL_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"BUILD_SQL\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"INSTALL_LTDL\" was never defined. +echo "$as_me: error: conditional \"BUILD_SQL\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -if test -z "${CONVENIENCE_LTDL_TRUE}" && test -z "${CONVENIENCE_LTDL_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"CONVENIENCE_LTDL\" was never defined. +if test -z "${BUILD_SQL_TRUE}" && test -z "${BUILD_SQL_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"BUILD_SQL\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"CONVENIENCE_LTDL\" was never defined. +echo "$as_me: error: conditional \"BUILD_SQL\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${BUILD_SQL_TRUE}" && test -z "${BUILD_SQL_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"BUILD_SQL\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"BUILD_SQL\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi @@ -33887,21 +30824,21 @@ do "include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "src/protocol/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/protocol/Makefile" ;; - "src/curl/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/curl/Makefile" ;; - "src/keeper/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/keeper/Makefile" ;; - "src/adns/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/adns/Makefile" ;; - "src/pcre/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/pcre/Makefile" ;; - "src/libltdl/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/libltdl/Makefile" ;; - "src/modules/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/modules/Makefile" ;; - "src/modules/connectserv/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/modules/connectserv/Makefile" ;; - "src/modules/extauth/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/modules/extauth/Makefile" ;; - "src/modules/hostserv/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/modules/hostserv/Makefile" ;; - "src/modules/ircdauth/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/modules/ircdauth/Makefile" ;; - "src/modules/loveserv/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/modules/loveserv/Makefile" ;; - "src/modules/moraleserv/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/modules/moraleserv/Makefile" ;; - "src/modules/statserv/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/modules/statserv/Makefile" ;; - "src/modules/template/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/modules/template/Makefile" ;; - "src/modules/templateauth/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/modules/templateauth/Makefile" ;; + "lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; + "lib/curl/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/curl/Makefile" ;; + "lib/keeper/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/keeper/Makefile" ;; + "lib/adns/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/adns/Makefile" ;; + "lib/pcre/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/pcre/Makefile" ;; + "modules/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/Makefile" ;; + "modules/connectserv/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/connectserv/Makefile" ;; + "modules/extauth/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/extauth/Makefile" ;; + "modules/hostserv/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/hostserv/Makefile" ;; + "modules/ircdauth/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/ircdauth/Makefile" ;; + "modules/loveserv/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/loveserv/Makefile" ;; + "modules/moraleserv/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/moraleserv/Makefile" ;; + "modules/statserv/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/statserv/Makefile" ;; + "modules/template/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/template/Makefile" ;; + "modules/templateauth/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/templateauth/Makefile" ;; "cronchk" ) CONFIG_FILES="$CONFIG_FILES cronchk" ;; "$ac_config_libobj_dir/fnmatch.h" ) CONFIG_LINKS="$CONFIG_LINKS $ac_config_libobj_dir/fnmatch.h:$ac_config_libobj_dir/fnmatch_.h" ;; "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; @@ -34045,12 +30982,6 @@ s,@AR@,$AR,;t t s,@ac_ct_AR@,$ac_ct_AR,;t t s,@RANLIB@,$RANLIB,;t t s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t -s,@DLLTOOL@,$DLLTOOL,;t t -s,@ac_ct_DLLTOOL@,$ac_ct_DLLTOOL,;t t -s,@AS@,$AS,;t t -s,@ac_ct_AS@,$ac_ct_AS,;t t -s,@OBJDUMP@,$OBJDUMP,;t t -s,@ac_ct_OBJDUMP@,$ac_ct_OBJDUMP,;t t s,@CPP@,$CPP,;t t s,@CXX@,$CXX,;t t s,@CXXFLAGS@,$CXXFLAGS,;t t @@ -34065,16 +30996,11 @@ s,@ac_ct_F77@,$ac_ct_F77,;t t s,@LIBTOOL@,$LIBTOOL,;t t s,@YACC@,$YACC,;t t s,@SED@,$SED,;t t -s,@INSTALL_LTDL_TRUE@,$INSTALL_LTDL_TRUE,;t t -s,@INSTALL_LTDL_FALSE@,$INSTALL_LTDL_FALSE,;t t -s,@CONVENIENCE_LTDL_TRUE@,$CONVENIENCE_LTDL_TRUE,;t t -s,@CONVENIENCE_LTDL_FALSE@,$CONVENIENCE_LTDL_FALSE,;t t -s,@LIBADD_DL@,$LIBADD_DL,;t t s,@ALLOCA@,$ALLOCA,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@POW_LIB@,$POW_LIB,;t t -s,@sqlsrvbuild@,$sqlsrvbuild,;t t -s,@buildsqlsrv@,$buildsqlsrv,;t t +s,@BUILD_SQL_TRUE@,$BUILD_SQL_TRUE,;t t +s,@BUILD_SQL_FALSE@,$BUILD_SQL_FALSE,;t t s,@PCRE_LIBS@,$PCRE_LIBS,;t t s,@PCRE_CFLAGS@,$PCRE_CFLAGS,;t t s,@BUILD_PCRE_TRUE@,$BUILD_PCRE_TRUE,;t t diff --git a/configure.in b/configure.in index cb4a923e..a8c10235 100644 --- a/configure.in +++ b/configure.in @@ -25,8 +25,8 @@ AC_DEFINE_UNQUOTED(REV, $x_rev, "Revision Version Number") AC_DEFINE_UNQUOTED(VERSION, $x_version, "Full Version") AC_LIBTOOL_DLOPEN dnl AC_DISABLE_SHARED -AC_LIBTOOL_WIN32_DLL -AC_LIBLTDL_CONVENIENCE +dnl AC_LIBTOOL_WIN32_DLL +dnl AC_LIBLTDL_CONVENIENCE # Checks for programs. AC_PROG_CC @@ -35,7 +35,7 @@ AC_PROG_YACC AC_PATH_PROG( SED, sed, , $PATH:/usr/bin:/usr/local/bin) # Checks for libraries. -AC_LIB_LTDL +dnl AC_LIB_LTDL # Checks for header files. AC_HEADER_STDC @@ -262,16 +262,15 @@ AC_ARG_ENABLE(sqlsrv, [ --enable-sqlsrv - Enable Sql Server Emulation], yes) AC_DEFINE(SQLSRV, 1, 'Use Sql Server Emulation') AC_MSG_RESULT(yes) - sqlsrvbuild=sqlsrv/librtadb.a - AC_SUBST(sqlsrvbuild) - buildsqlsrv=sqlsrvlib - AC_SUBST(buildsqlsrv) + AM_CONDITIONAL(BUILD_SQL, true) ;; *) + AM_CONDITIONAL(BUILD_SQL, false) AC_MSG_RESULT(no) ;; esac], AC_MSG_RESULT(no) +AM_CONDITIONAL(BUILD_SQL, false) ) AC_MSG_CHECKING(The Modules that will be automatically compiled) @@ -306,19 +305,25 @@ AC_SUBST(LIBLTDL) AC_SUBST(LIBTOOL_DEPS) AC_SUBST(MODULES) -AC_CONFIG_FILES([Makefile include/Makefile src/Makefile - src/protocol/Makefile src/curl/Makefile - src/keeper/Makefile src/adns/Makefile - src/pcre/Makefile src/libltdl/Makefile - src/modules/Makefile src/modules/connectserv/Makefile - src/modules/extauth/Makefile - src/modules/hostserv/Makefile - src/modules/ircdauth/Makefile - src/modules/loveserv/Makefile - src/modules/moraleserv/Makefile - src/modules/statserv/Makefile - src/modules/template/Makefile - src/modules/templateauth/Makefile +AC_CONFIG_FILES([Makefile + include/Makefile + src/Makefile + src/protocol/Makefile + lib/Makefile + lib/curl/Makefile + lib/keeper/Makefile + lib/adns/Makefile + lib/pcre/Makefile + modules/Makefile + modules/connectserv/Makefile + modules/extauth/Makefile + modules/hostserv/Makefile + modules/ircdauth/Makefile + modules/loveserv/Makefile + modules/moraleserv/Makefile + modules/statserv/Makefile + modules/template/Makefile + modules/templateauth/Makefile cronchk]) AC_CACHE_SAVE diff --git a/include/Makefile.in b/include/Makefile.in index d42d20c7..e23f4c04 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -42,7 +42,6 @@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ -AS = @AS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -51,11 +50,11 @@ BUILD_CURL_FALSE = @BUILD_CURL_FALSE@ BUILD_CURL_TRUE = @BUILD_CURL_TRUE@ BUILD_PCRE_FALSE = @BUILD_PCRE_FALSE@ BUILD_PCRE_TRUE = @BUILD_PCRE_TRUE@ +BUILD_SQL_FALSE = @BUILD_SQL_FALSE@ +BUILD_SQL_TRUE = @BUILD_SQL_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@ -CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CURL_CFLAGS = @CURL_CFLAGS@ @@ -67,7 +66,6 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -78,13 +76,10 @@ F77 = @F77@ FFLAGS = @FFLAGS@ INCLTDL = @INCLTDL@ INSTALL_DATA = @INSTALL_DATA@ -INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@ -INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ -LIBADD_DL = @LIBADD_DL@ LIBLTDL = @LIBLTDL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -97,7 +92,6 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MODULES = @MODULES@ -OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -118,12 +112,9 @@ STRIP = @STRIP@ VERSION = @VERSION@ YACC = @YACC@ ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -140,7 +131,6 @@ build_configtool = @build_configtool@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ -buildsqlsrv = @buildsqlsrv@ datadir = @datadir@ exec_prefix = @exec_prefix@ host = @host@ @@ -160,7 +150,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -sqlsrvbuild = @sqlsrvbuild@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ noinst_SCRIPTS = version.sh diff --git a/src/auth.h b/include/auth.h similarity index 100% rename from src/auth.h rename to include/auth.h diff --git a/src/bans.h b/include/bans.h similarity index 100% rename from src/bans.h rename to include/bans.h diff --git a/src/bots.h b/include/bots.h similarity index 100% rename from src/bots.h rename to include/bots.h diff --git a/src/channels.h b/include/channels.h similarity index 100% rename from src/channels.h rename to include/channels.h diff --git a/src/commands.h b/include/commands.h similarity index 100% rename from src/commands.h rename to include/commands.h diff --git a/src/conf.h b/include/conf.h similarity index 100% rename from src/conf.h rename to include/conf.h diff --git a/include/config.h.in b/include/config.h.in index 3e500c62..b8f7ec23 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1,8 +1,5 @@ /* include/config.h.in. Generated from configure.in by autoheader. */ -/* 'Enable Bahamut Support' */ -#undef BAHAMUT - /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP systems. This function is required for `alloca.c' support on those systems. */ @@ -25,30 +22,9 @@ */ #undef HAVE_ALLOCA_H -/* Define to 1 if you have the `argz_append' function. */ -#undef HAVE_ARGZ_APPEND - -/* Define to 1 if you have the `argz_create_sep' function. */ -#undef HAVE_ARGZ_CREATE_SEP - -/* Define to 1 if you have the header file. */ -#undef HAVE_ARGZ_H - -/* Define to 1 if you have the `argz_insert' function. */ -#undef HAVE_ARGZ_INSERT - -/* Define to 1 if you have the `argz_next' function. */ -#undef HAVE_ARGZ_NEXT - -/* Define to 1 if you have the `argz_stringify' function. */ -#undef HAVE_ARGZ_STRINGIFY - /* Define to 1 if you have the header file. */ #undef HAVE_ARPA_INET_H -/* Define to 1 if you have the header file. */ -#undef HAVE_ASSERT_H - /* 'backtrace function available' */ #undef HAVE_BACKTRACE @@ -58,15 +34,9 @@ /* Define to 1 if you have the `btowc' function. */ #undef HAVE_BTOWC -/* Define to 1 if you have the `closedir' function. */ -#undef HAVE_CLOSEDIR - /* Define to 1 if you have the `closesocket' function. */ #undef HAVE_CLOSESOCKET -/* Define to 1 if you have the header file. */ -#undef HAVE_CTYPE_H - /* Define to 1 if you have the header file. */ #undef HAVE_DB_H @@ -74,43 +44,18 @@ */ #undef HAVE_DECL_GETENV -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -#undef HAVE_DIRENT_H - /* disabled non-blocking sockets */ #undef HAVE_DISABLED_NONBLOCKING -/* Define if you have the GNU dld library. */ -#undef HAVE_DLD - -/* Define to 1 if you have the header file. */ -#undef HAVE_DLD_H - -/* Define to 1 if you have the `dlerror' function. */ -#undef HAVE_DLERROR - /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H /* Define to 1 if you have the `dlopen' function. */ #undef HAVE_DLOPEN -/* Define to 1 if you have the header file. */ -#undef HAVE_DL_H - /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ #undef HAVE_DOPRNT -/* Define if you have the _dyld_func_lookup function. */ -#undef HAVE_DYLD - -/* Define to 1 if you have the header file. */ -#undef HAVE_ERRNO_H - -/* Define to 1 if the system has the type `error_t'. */ -#undef HAVE_ERROR_T - /* Define to 1 if you have the header file. */ #undef HAVE_FCNTL_H @@ -147,9 +92,6 @@ /* HAVE_GNUC25_PRINTFFORMAT */ #undef HAVE_GNUC25_PRINTFFORMAT -/* Define to 1 if you have the `index' function. */ -#undef HAVE_INDEX - /* Define to 1 if you have the `inet_addr' function. */ #undef HAVE_INET_ADDR @@ -171,12 +113,12 @@ /* Define to 1 if you have the header file. */ #undef HAVE_IO_H -/* Define if you have the libdl library or equivalent. */ -#undef HAVE_LIBDL - /* Define to 1 if you have the `nsl' library (-lnsl). */ #undef HAVE_LIBNSL +/* Define to 1 if you have the `pcre' library (-lpcre). */ +#undef HAVE_LIBPCRE + /* Define to 1 if you have the `resolve' library (-lresolve). */ #undef HAVE_LIBRESOLVE @@ -189,9 +131,6 @@ /* if your compiler supports 'long long' */ #undef HAVE_LONGLONG -/* Define to 1 if you have the header file. */ -#undef HAVE_MACH_O_DYLD_H - /* Define to 1 if you have the header file. */ #undef HAVE_MALLOC_H @@ -201,9 +140,6 @@ /* Define to 1 if declares mbstate_t. */ #undef HAVE_MBSTATE_T -/* Define to 1 if you have the `memcpy' function. */ -#undef HAVE_MEMCPY - /* Define to 1 if you have the `memmove' function. */ #undef HAVE_MEMMOVE @@ -213,9 +149,6 @@ /* Define to 1 if you have the `mempcpy' function. */ #undef HAVE_MEMPCPY -/* Define to 1 if you have the header file, and it defines `DIR'. */ -#undef HAVE_NDIR_H - /* Define to 1 if you have the header file. */ #undef HAVE_NETDB_H @@ -225,9 +158,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_NET_IF_H -/* Define to 1 if you have the `opendir' function. */ -#undef HAVE_OPENDIR - /* use O_NONBLOCK for non-blocking sockets */ #undef HAVE_O_NONBLOCK @@ -237,18 +167,9 @@ /* Define to 1 if you have the `poll' function. */ #undef HAVE_POLL -/* Define if libtool can extract symbol lists from object files. */ -#undef HAVE_PRELOADED_SYMBOLS - /* Define to 1 if you have the header file. */ #undef HAVE_PWD_H -/* Define to 1 if you have the `readdir' function. */ -#undef HAVE_READDIR - -/* Define to 1 if you have the `rindex' function. */ -#undef HAVE_RINDEX - /* Define to 1 if you have the `select' function. */ #undef HAVE_SELECT @@ -258,9 +179,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SGTTY_H -/* Define if you have the shl_load function. */ -#undef HAVE_SHL_LOAD - /* Define to 1 if you have the `sigaction' function. */ #undef HAVE_SIGACTION @@ -286,21 +204,12 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H -/* Define to 1 if you have the header file. */ -#undef HAVE_STDIO_H - /* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H /* Define to 1 if you have the `strcasecmp' function. */ #undef HAVE_STRCASECMP -/* Define to 1 if you have the `strchr' function. */ -#undef HAVE_STRCHR - -/* Define to 1 if you have the `strcmp' function. */ -#undef HAVE_STRCMP - /* Define to 1 if you have the `strcmpi' function. */ #undef HAVE_STRCMPI @@ -334,26 +243,12 @@ /* Define to 1 if you have the `strnlen' function. */ #undef HAVE_STRNLEN -/* Define to 1 if you have the `strrchr' function. */ -#undef HAVE_STRRCHR - /* Define to 1 if you have the `strstr' function. */ #undef HAVE_STRSTR /* Define to 1 if you have the `strtok_r' function. */ #undef HAVE_STRTOK_R -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -#undef HAVE_SYS_DIR_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_DL_H - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -#undef HAVE_SYS_NDIR_H - /* Define to 1 if you have the header file. */ #undef HAVE_SYS_PARAM_H @@ -438,39 +333,13 @@ /* Define this symbol if your OS supports changing the contents of argv */ #undef HAVE_WRITABLE_ARGV -/* 'Enable hybrid7 IRCD support' */ -#undef HYBRID7 - -/* 'Enable IRCu Support' */ -#undef IRCUP10 - /* "PCRE Lnk size" */ #undef LINK_SIZE -/* 'Enable Liquid IRCd Support' */ -#undef LIQUID - /* Define to 1 if `lstat' dereferences a symlink specified with a trailing slash. */ #undef LSTAT_FOLLOWS_SLASHED_SYMLINK -/* Define if the OS needs help to load dependent libraries for dlopen(). */ -#undef LTDL_DLOPEN_DEPLIBS - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#undef LTDL_OBJDIR - -/* Define to the name of the environment variable that determines the dynamic - library search path. */ -#undef LTDL_SHLIBPATH_VAR - -/* Define to the extension used for shared libraries, say, ".so". */ -#undef LTDL_SHLIB_EXT - -/* Define to the system default library search path. */ -#undef LTDL_SYSSEARCHPATH - /* "Major Version Number" */ #undef MAJOR @@ -480,27 +349,15 @@ /* "Minor Version Number" */ #undef MINOR -/* 'Enable Mystic Support' */ -#undef MYSTIC - /* "Our Platfrom requires Underscores" */ #undef NEED_UNDERSCORE_PREFIX -/* Define if dlsym() requires a leading underscore in symbol names. */ -#undef NEED_USCORE - -/* 'Enable NeoIRCd IRCD support' */ -#undef NEOIRCD - /* "Installation Prefix" */ #undef NEO_PREFIX /* "Operating System Host" */ #undef NS_HOST -/* "IRCd Protocol we are compiled with" */ -#undef NS_PROTOCOL - /* Name of package */ #undef PACKAGE @@ -531,9 +388,6 @@ /* "Malloc Threshold" */ #undef POSIX_MALLOC_THRESHOLD -/* 'Enable Quantum Support' */ -#undef QUANTUM - /* Define as the return type of signal handlers (`int' or `void'). */ #undef RETSIGTYPE @@ -572,30 +426,12 @@ /* Define to 1 if your declares `struct tm'. */ #undef TM_IN_SYS_TIME -/* 'Enable client only Support' */ -#undef CLIENT - -/* 'Enable Ultimate 2.x.x Support' */ -#undef ULTIMATE2 - -/* "Enable Ultimate 3.x.x Support' */ -#undef ULTIMATE3 - -/* 'Enable Unreal 3.1.x Support' */ -#undef UNREAL31 - -/* 'Enable Unreal 3.2.x Support' */ -#undef UNREAL32 - /* 'Use Raw command' */ #undef USE_RAW /* "Full Version" */ #undef VERSION -/* 'Enable Viagra IRCd Support' */ -#undef VIAGRA - /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS @@ -605,9 +441,6 @@ /* Define to empty if `const' does not conform to ANSI C. */ #undef const -/* Define to a type to use for `error_t' if it is not otherwise available. */ -#undef error_t - /* Define to rpl_fnmatch if the replacement function should be used. */ #undef fnmatch diff --git a/src/configwin32.h b/include/configwin32.h similarity index 100% rename from src/configwin32.h rename to include/configwin32.h diff --git a/src/dl.h b/include/dl.h similarity index 100% rename from src/dl.h rename to include/dl.h diff --git a/src/dns.h b/include/dns.h similarity index 100% rename from src/dns.h rename to include/dns.h diff --git a/src/dotconf.h b/include/dotconf.h similarity index 100% rename from src/dotconf.h rename to include/dotconf.h diff --git a/src/events.h b/include/events.h similarity index 100% rename from src/events.h rename to include/events.h diff --git a/src/exclude.h b/include/exclude.h similarity index 100% rename from src/exclude.h rename to include/exclude.h diff --git a/src/hash.h b/include/hash.h similarity index 100% rename from src/hash.h rename to include/hash.h diff --git a/src/ircd.h b/include/ircd.h similarity index 100% rename from src/ircd.h rename to include/ircd.h diff --git a/src/ircstring.h b/include/ircstring.h similarity index 100% rename from src/ircstring.h rename to include/ircstring.h diff --git a/src/list.h b/include/list.h similarity index 100% rename from src/list.h rename to include/list.h diff --git a/src/log.h b/include/log.h similarity index 100% rename from src/log.h rename to include/log.h diff --git a/src/modules.h b/include/modules.h similarity index 100% rename from src/modules.h rename to include/modules.h diff --git a/src/neostats.h b/include/neostats.h similarity index 100% rename from src/neostats.h rename to include/neostats.h diff --git a/src/ns_help.h b/include/ns_help.h similarity index 100% rename from src/ns_help.h rename to include/ns_help.h diff --git a/src/numeric.h b/include/numeric.h similarity index 100% rename from src/numeric.h rename to include/numeric.h diff --git a/src/servers.h b/include/servers.h similarity index 100% rename from src/servers.h rename to include/servers.h diff --git a/src/services.h b/include/services.h similarity index 100% rename from src/services.h rename to include/services.h diff --git a/src/signals.h b/include/signals.h similarity index 100% rename from src/signals.h rename to include/signals.h diff --git a/src/sock.h b/include/sock.h similarity index 100% rename from src/sock.h rename to include/sock.h diff --git a/src/support.h b/include/support.h similarity index 100% rename from src/support.h rename to include/support.h diff --git a/src/timer.h b/include/timer.h similarity index 100% rename from src/timer.h rename to include/timer.h diff --git a/src/transfer.h b/include/transfer.h similarity index 100% rename from src/transfer.h rename to include/transfer.h diff --git a/src/users.h b/include/users.h similarity index 100% rename from src/users.h rename to include/users.h diff --git a/src/adns/.indent.pro b/lib/adns/.indent.pro similarity index 100% rename from src/adns/.indent.pro rename to lib/adns/.indent.pro diff --git a/src/adns/Makefile.am b/lib/adns/Makefile.am similarity index 79% rename from src/adns/Makefile.am rename to lib/adns/Makefile.am index b25685b0..3f1fa6cf 100644 --- a/src/adns/Makefile.am +++ b/lib/adns/Makefile.am @@ -2,5 +2,4 @@ lib_LTLIBRARIES = libadns.la libadns_la_SOURCES = adns.h check.c dlist.h event.c general.c internal.h \ parse.c query.c reply.c setup.c transmit.c tvarith.h \ types.c -AM_CFLAGS = -I../../include -I.. -I../pcre -I../curl include $(top_srcdir)/autotools/rules.mk \ No newline at end of file diff --git a/src/adns/Makefile.in b/lib/adns/Makefile.in similarity index 96% rename from src/adns/Makefile.in rename to lib/adns/Makefile.in index 99f8473b..fe97bc15 100644 --- a/src/adns/Makefile.in +++ b/lib/adns/Makefile.in @@ -43,7 +43,6 @@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ -AS = @AS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -52,11 +51,11 @@ BUILD_CURL_FALSE = @BUILD_CURL_FALSE@ BUILD_CURL_TRUE = @BUILD_CURL_TRUE@ BUILD_PCRE_FALSE = @BUILD_PCRE_FALSE@ BUILD_PCRE_TRUE = @BUILD_PCRE_TRUE@ +BUILD_SQL_FALSE = @BUILD_SQL_FALSE@ +BUILD_SQL_TRUE = @BUILD_SQL_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@ -CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CURL_CFLAGS = @CURL_CFLAGS@ @@ -68,7 +67,6 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -79,13 +77,10 @@ F77 = @F77@ FFLAGS = @FFLAGS@ INCLTDL = @INCLTDL@ INSTALL_DATA = @INSTALL_DATA@ -INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@ -INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ -LIBADD_DL = @LIBADD_DL@ LIBLTDL = @LIBLTDL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -98,7 +93,6 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MODULES = @MODULES@ -OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -119,12 +113,9 @@ STRIP = @STRIP@ VERSION = @VERSION@ YACC = @YACC@ ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -141,7 +132,6 @@ build_configtool = @build_configtool@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ -buildsqlsrv = @buildsqlsrv@ datadir = $(prefix)/data exec_prefix = @exec_prefix@ host = @host@ @@ -161,7 +151,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -sqlsrvbuild = @sqlsrvbuild@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ lib_LTLIBRARIES = libadns.la @@ -169,11 +158,10 @@ libadns_la_SOURCES = adns.h check.c dlist.h event.c general.c internal.h \ parse.c query.c reply.c setup.c transmit.c tvarith.h \ types.c -AM_CFLAGS = -I../../include -I.. -I../pcre -I../curl LINK = @echo "Linking $@"; $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -subdir = src/adns +subdir = lib/adns ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/config.h @@ -210,7 +198,7 @@ all: all-am .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/autotools/rules.mk $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/adns/Makefile + $(AUTOMAKE) --gnu lib/adns/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) libLTLIBRARIES_INSTALL = $(INSTALL) diff --git a/src/adns/adns.h b/lib/adns/adns.h similarity index 100% rename from src/adns/adns.h rename to lib/adns/adns.h diff --git a/src/adns/check.c b/lib/adns/check.c similarity index 100% rename from src/adns/check.c rename to lib/adns/check.c diff --git a/src/adns/dlist.h b/lib/adns/dlist.h similarity index 100% rename from src/adns/dlist.h rename to lib/adns/dlist.h diff --git a/src/adns/event.c b/lib/adns/event.c similarity index 100% rename from src/adns/event.c rename to lib/adns/event.c diff --git a/src/adns/general.c b/lib/adns/general.c similarity index 99% rename from src/adns/general.c rename to lib/adns/general.c index 8c3ab810..68c269d8 100644 --- a/src/adns/general.c +++ b/lib/adns/general.c @@ -129,7 +129,7 @@ int adns__vbuf_ensure(vbuf * vb, int want) if (vb->avail >= want) return 1; - nb = srealloc(vb->buf, want); + nb = realloc(vb->buf, want); if (!nb) return 0; vb->buf = nb; diff --git a/src/adns/internal.h b/lib/adns/internal.h similarity index 98% rename from src/adns/internal.h rename to lib/adns/internal.h index 7a22ccbb..3aa59b73 100644 --- a/src/adns/internal.h +++ b/lib/adns/internal.h @@ -34,15 +34,37 @@ #ifndef ADNS_INTERNAL_H_INCLUDED #define ADNS_INTERNAL_H_INCLUDED -#include "neostats.h" +#include "config.h" + typedef unsigned char byte; +#include +#include +#ifdef HAVE_SYS_TYPES_H +#include +#endif +#include +#include +#include + #include #include #include -#include #include #include +#include +#ifdef HAVE_TIME_H +#include +#endif +#ifdef HAVE_SYS_SOCKET_H +#include +#endif +#ifdef HAVE_NETINET_IN_H +#include +#endif +#ifdef HAVE_NETDB_H +#include +#endif #include "adns.h" #include "dlist.h" diff --git a/src/adns/parse.c b/lib/adns/parse.c similarity index 100% rename from src/adns/parse.c rename to lib/adns/parse.c diff --git a/src/adns/query.c b/lib/adns/query.c similarity index 100% rename from src/adns/query.c rename to lib/adns/query.c diff --git a/src/adns/reply.c b/lib/adns/reply.c similarity index 100% rename from src/adns/reply.c rename to lib/adns/reply.c diff --git a/src/adns/setup.c b/lib/adns/setup.c similarity index 100% rename from src/adns/setup.c rename to lib/adns/setup.c diff --git a/src/adns/transmit.c b/lib/adns/transmit.c similarity index 100% rename from src/adns/transmit.c rename to lib/adns/transmit.c diff --git a/src/adns/tvarith.h b/lib/adns/tvarith.h similarity index 100% rename from src/adns/tvarith.h rename to lib/adns/tvarith.h diff --git a/src/adns/types.c b/lib/adns/types.c similarity index 100% rename from src/adns/types.c rename to lib/adns/types.c diff --git a/src/curl/COPYING b/lib/curl/COPYING similarity index 100% rename from src/curl/COPYING rename to lib/curl/COPYING diff --git a/src/curl/Makefile.am b/lib/curl/Makefile.am similarity index 100% rename from src/curl/Makefile.am rename to lib/curl/Makefile.am diff --git a/src/curl/Makefile.in b/lib/curl/Makefile.in similarity index 98% rename from src/curl/Makefile.in rename to lib/curl/Makefile.in index 1596ee1d..97dbeaea 100644 --- a/src/curl/Makefile.in +++ b/lib/curl/Makefile.in @@ -47,7 +47,6 @@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ -AS = @AS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -56,11 +55,11 @@ BUILD_CURL_FALSE = @BUILD_CURL_FALSE@ BUILD_CURL_TRUE = @BUILD_CURL_TRUE@ BUILD_PCRE_FALSE = @BUILD_PCRE_FALSE@ BUILD_PCRE_TRUE = @BUILD_PCRE_TRUE@ +BUILD_SQL_FALSE = @BUILD_SQL_FALSE@ +BUILD_SQL_TRUE = @BUILD_SQL_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@ -CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CURL_CFLAGS = @CURL_CFLAGS@ @@ -72,7 +71,6 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -83,13 +81,10 @@ F77 = @F77@ FFLAGS = @FFLAGS@ INCLTDL = @INCLTDL@ INSTALL_DATA = @INSTALL_DATA@ -INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@ -INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ -LIBADD_DL = @LIBADD_DL@ LIBLTDL = @LIBLTDL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -102,7 +97,6 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MODULES = @MODULES@ -OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -124,12 +118,9 @@ STRIP = @STRIP@ VERSION = -version-info 2:2:0 YACC = @YACC@ ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -146,7 +137,6 @@ build_configtool = @build_configtool@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ -buildsqlsrv = @buildsqlsrv@ datadir = $(prefix)/data exec_prefix = @exec_prefix@ host = @host@ @@ -166,7 +156,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -sqlsrvbuild = @sqlsrvbuild@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ @@ -243,7 +232,7 @@ BUILT_SOURCES = $(srcdir)/getdate.c $(srcdir)/ca-bundle.h LINK = @echo "Linking $@"; $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -subdir = src/curl +subdir = lib/curl ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/config.h @@ -308,7 +297,7 @@ all: $(BUILT_SOURCES) .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/autotools/rules.mk $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/curl/Makefile + $(AUTOMAKE) --foreign lib/curl/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) libLTLIBRARIES_INSTALL = $(INSTALL) diff --git a/src/curl/README b/lib/curl/README similarity index 100% rename from src/curl/README rename to lib/curl/README diff --git a/src/curl/RELEASE-NOTES b/lib/curl/RELEASE-NOTES similarity index 100% rename from src/curl/RELEASE-NOTES rename to lib/curl/RELEASE-NOTES diff --git a/src/curl/acinclude.m4 b/lib/curl/acinclude.m4 similarity index 100% rename from src/curl/acinclude.m4 rename to lib/curl/acinclude.m4 diff --git a/src/curl/aclocal.m4 b/lib/curl/aclocal.m4 similarity index 100% rename from src/curl/aclocal.m4 rename to lib/curl/aclocal.m4 diff --git a/src/curl/arpa_telnet.h b/lib/curl/arpa_telnet.h similarity index 100% rename from src/curl/arpa_telnet.h rename to lib/curl/arpa_telnet.h diff --git a/src/curl/base64.c b/lib/curl/base64.c similarity index 100% rename from src/curl/base64.c rename to lib/curl/base64.c diff --git a/src/curl/base64.h b/lib/curl/base64.h similarity index 100% rename from src/curl/base64.h rename to lib/curl/base64.h diff --git a/src/curl/config-win32.h b/lib/curl/config-win32.h similarity index 100% rename from src/curl/config-win32.h rename to lib/curl/config-win32.h diff --git a/src/curl/connect.c b/lib/curl/connect.c similarity index 100% rename from src/curl/connect.c rename to lib/curl/connect.c diff --git a/src/curl/connect.h b/lib/curl/connect.h similarity index 100% rename from src/curl/connect.h rename to lib/curl/connect.h diff --git a/src/curl/content_encoding.c b/lib/curl/content_encoding.c similarity index 100% rename from src/curl/content_encoding.c rename to lib/curl/content_encoding.c diff --git a/src/curl/content_encoding.h b/lib/curl/content_encoding.h similarity index 100% rename from src/curl/content_encoding.h rename to lib/curl/content_encoding.h diff --git a/src/curl/cookie.c b/lib/curl/cookie.c similarity index 100% rename from src/curl/cookie.c rename to lib/curl/cookie.c diff --git a/src/curl/cookie.h b/lib/curl/cookie.h similarity index 100% rename from src/curl/cookie.h rename to lib/curl/cookie.h diff --git a/src/curl/curl.h b/lib/curl/curl.h similarity index 100% rename from src/curl/curl.h rename to lib/curl/curl.h diff --git a/src/curl/depcomp b/lib/curl/depcomp similarity index 100% rename from src/curl/depcomp rename to lib/curl/depcomp diff --git a/src/curl/dict.c b/lib/curl/dict.c similarity index 100% rename from src/curl/dict.c rename to lib/curl/dict.c diff --git a/src/curl/dict.h b/lib/curl/dict.h similarity index 100% rename from src/curl/dict.h rename to lib/curl/dict.h diff --git a/src/curl/easy.c b/lib/curl/easy.c similarity index 100% rename from src/curl/easy.c rename to lib/curl/easy.c diff --git a/src/curl/easy.h b/lib/curl/easy.h similarity index 100% rename from src/curl/easy.h rename to lib/curl/easy.h diff --git a/src/curl/escape.c b/lib/curl/escape.c similarity index 100% rename from src/curl/escape.c rename to lib/curl/escape.c diff --git a/src/curl/escape.h b/lib/curl/escape.h similarity index 100% rename from src/curl/escape.h rename to lib/curl/escape.h diff --git a/src/curl/file.c b/lib/curl/file.c similarity index 100% rename from src/curl/file.c rename to lib/curl/file.c diff --git a/src/curl/file.h b/lib/curl/file.h similarity index 100% rename from src/curl/file.h rename to lib/curl/file.h diff --git a/src/curl/formdata.c b/lib/curl/formdata.c similarity index 100% rename from src/curl/formdata.c rename to lib/curl/formdata.c diff --git a/src/curl/formdata.h b/lib/curl/formdata.h similarity index 100% rename from src/curl/formdata.h rename to lib/curl/formdata.h diff --git a/src/curl/ftp.c b/lib/curl/ftp.c similarity index 100% rename from src/curl/ftp.c rename to lib/curl/ftp.c diff --git a/src/curl/ftp.h b/lib/curl/ftp.h similarity index 100% rename from src/curl/ftp.h rename to lib/curl/ftp.h diff --git a/src/curl/getdate.c b/lib/curl/getdate.c similarity index 100% rename from src/curl/getdate.c rename to lib/curl/getdate.c diff --git a/src/curl/getdate.h b/lib/curl/getdate.h similarity index 100% rename from src/curl/getdate.h rename to lib/curl/getdate.h diff --git a/src/curl/getdate.y b/lib/curl/getdate.y similarity index 100% rename from src/curl/getdate.y rename to lib/curl/getdate.y diff --git a/src/curl/getenv.c b/lib/curl/getenv.c similarity index 100% rename from src/curl/getenv.c rename to lib/curl/getenv.c diff --git a/src/curl/getinfo.c b/lib/curl/getinfo.c similarity index 100% rename from src/curl/getinfo.c rename to lib/curl/getinfo.c diff --git a/src/curl/getinfo.h b/lib/curl/getinfo.h similarity index 100% rename from src/curl/getinfo.h rename to lib/curl/getinfo.h diff --git a/src/curl/hash.c b/lib/curl/hash.c similarity index 100% rename from src/curl/hash.c rename to lib/curl/hash.c diff --git a/src/curl/hash.h b/lib/curl/hash.h similarity index 100% rename from src/curl/hash.h rename to lib/curl/hash.h diff --git a/src/curl/hostip.c b/lib/curl/hostip.c similarity index 100% rename from src/curl/hostip.c rename to lib/curl/hostip.c diff --git a/src/curl/hostip.h b/lib/curl/hostip.h similarity index 100% rename from src/curl/hostip.h rename to lib/curl/hostip.h diff --git a/src/curl/http.c b/lib/curl/http.c similarity index 100% rename from src/curl/http.c rename to lib/curl/http.c diff --git a/src/curl/http.h b/lib/curl/http.h similarity index 100% rename from src/curl/http.h rename to lib/curl/http.h diff --git a/src/curl/http_chunks.c b/lib/curl/http_chunks.c similarity index 100% rename from src/curl/http_chunks.c rename to lib/curl/http_chunks.c diff --git a/src/curl/http_chunks.h b/lib/curl/http_chunks.h similarity index 100% rename from src/curl/http_chunks.h rename to lib/curl/http_chunks.h diff --git a/src/curl/http_digest.c b/lib/curl/http_digest.c similarity index 100% rename from src/curl/http_digest.c rename to lib/curl/http_digest.c diff --git a/src/curl/http_digest.h b/lib/curl/http_digest.h similarity index 100% rename from src/curl/http_digest.h rename to lib/curl/http_digest.h diff --git a/src/curl/http_negotiate.c b/lib/curl/http_negotiate.c similarity index 100% rename from src/curl/http_negotiate.c rename to lib/curl/http_negotiate.c diff --git a/src/curl/http_negotiate.h b/lib/curl/http_negotiate.h similarity index 100% rename from src/curl/http_negotiate.h rename to lib/curl/http_negotiate.h diff --git a/src/curl/http_ntlm.c b/lib/curl/http_ntlm.c similarity index 100% rename from src/curl/http_ntlm.c rename to lib/curl/http_ntlm.c diff --git a/src/curl/http_ntlm.h b/lib/curl/http_ntlm.h similarity index 100% rename from src/curl/http_ntlm.h rename to lib/curl/http_ntlm.h diff --git a/src/curl/if2ip.c b/lib/curl/if2ip.c similarity index 100% rename from src/curl/if2ip.c rename to lib/curl/if2ip.c diff --git a/src/curl/if2ip.h b/lib/curl/if2ip.h similarity index 100% rename from src/curl/if2ip.h rename to lib/curl/if2ip.h diff --git a/src/curl/inet_ntoa_r.h b/lib/curl/inet_ntoa_r.h similarity index 100% rename from src/curl/inet_ntoa_r.h rename to lib/curl/inet_ntoa_r.h diff --git a/src/curl/inet_pton.c b/lib/curl/inet_pton.c similarity index 100% rename from src/curl/inet_pton.c rename to lib/curl/inet_pton.c diff --git a/src/curl/inet_pton.h b/lib/curl/inet_pton.h similarity index 100% rename from src/curl/inet_pton.h rename to lib/curl/inet_pton.h diff --git a/src/curl/install-sh b/lib/curl/install-sh similarity index 100% rename from src/curl/install-sh rename to lib/curl/install-sh diff --git a/src/curl/krb4.c b/lib/curl/krb4.c similarity index 100% rename from src/curl/krb4.c rename to lib/curl/krb4.c diff --git a/src/curl/krb4.h b/lib/curl/krb4.h similarity index 100% rename from src/curl/krb4.h rename to lib/curl/krb4.h diff --git a/src/curl/ldap.c b/lib/curl/ldap.c similarity index 100% rename from src/curl/ldap.c rename to lib/curl/ldap.c diff --git a/src/curl/ldap.h b/lib/curl/ldap.h similarity index 100% rename from src/curl/ldap.h rename to lib/curl/ldap.h diff --git a/src/curl/llist.c b/lib/curl/llist.c similarity index 100% rename from src/curl/llist.c rename to lib/curl/llist.c diff --git a/src/curl/llist.h b/lib/curl/llist.h similarity index 100% rename from src/curl/llist.h rename to lib/curl/llist.h diff --git a/src/curl/md5.c b/lib/curl/md5.c similarity index 100% rename from src/curl/md5.c rename to lib/curl/md5.c diff --git a/src/curl/md5.h b/lib/curl/md5.h similarity index 100% rename from src/curl/md5.h rename to lib/curl/md5.h diff --git a/src/curl/memdebug.c b/lib/curl/memdebug.c similarity index 100% rename from src/curl/memdebug.c rename to lib/curl/memdebug.c diff --git a/src/curl/memdebug.h b/lib/curl/memdebug.h similarity index 100% rename from src/curl/memdebug.h rename to lib/curl/memdebug.h diff --git a/src/curl/missing b/lib/curl/missing similarity index 100% rename from src/curl/missing rename to lib/curl/missing diff --git a/src/curl/mkinstalldirs b/lib/curl/mkinstalldirs similarity index 100% rename from src/curl/mkinstalldirs rename to lib/curl/mkinstalldirs diff --git a/src/curl/mprintf.c b/lib/curl/mprintf.c similarity index 100% rename from src/curl/mprintf.c rename to lib/curl/mprintf.c diff --git a/src/curl/mprintf.h b/lib/curl/mprintf.h similarity index 100% rename from src/curl/mprintf.h rename to lib/curl/mprintf.h diff --git a/src/curl/multi.c b/lib/curl/multi.c similarity index 100% rename from src/curl/multi.c rename to lib/curl/multi.c diff --git a/src/curl/multi.h b/lib/curl/multi.h similarity index 100% rename from src/curl/multi.h rename to lib/curl/multi.h diff --git a/src/curl/mycurl-config.in b/lib/curl/mycurl-config.in similarity index 100% rename from src/curl/mycurl-config.in rename to lib/curl/mycurl-config.in diff --git a/src/curl/netrc.c b/lib/curl/netrc.c similarity index 100% rename from src/curl/netrc.c rename to lib/curl/netrc.c diff --git a/src/curl/netrc.h b/lib/curl/netrc.h similarity index 100% rename from src/curl/netrc.h rename to lib/curl/netrc.h diff --git a/src/curl/progress.c b/lib/curl/progress.c similarity index 100% rename from src/curl/progress.c rename to lib/curl/progress.c diff --git a/src/curl/progress.h b/lib/curl/progress.h similarity index 100% rename from src/curl/progress.h rename to lib/curl/progress.h diff --git a/src/curl/security.c b/lib/curl/security.c similarity index 100% rename from src/curl/security.c rename to lib/curl/security.c diff --git a/src/curl/security.h b/lib/curl/security.h similarity index 100% rename from src/curl/security.h rename to lib/curl/security.h diff --git a/src/curl/sendf.c b/lib/curl/sendf.c similarity index 100% rename from src/curl/sendf.c rename to lib/curl/sendf.c diff --git a/src/curl/sendf.h b/lib/curl/sendf.h similarity index 100% rename from src/curl/sendf.h rename to lib/curl/sendf.h diff --git a/src/curl/setup.h b/lib/curl/setup.h similarity index 100% rename from src/curl/setup.h rename to lib/curl/setup.h diff --git a/src/curl/share.c b/lib/curl/share.c similarity index 100% rename from src/curl/share.c rename to lib/curl/share.c diff --git a/src/curl/share.h b/lib/curl/share.h similarity index 100% rename from src/curl/share.h rename to lib/curl/share.h diff --git a/src/curl/speedcheck.c b/lib/curl/speedcheck.c similarity index 100% rename from src/curl/speedcheck.c rename to lib/curl/speedcheck.c diff --git a/src/curl/speedcheck.h b/lib/curl/speedcheck.h similarity index 100% rename from src/curl/speedcheck.h rename to lib/curl/speedcheck.h diff --git a/src/curl/ssluse.c b/lib/curl/ssluse.c similarity index 100% rename from src/curl/ssluse.c rename to lib/curl/ssluse.c diff --git a/src/curl/ssluse.h b/lib/curl/ssluse.h similarity index 100% rename from src/curl/ssluse.h rename to lib/curl/ssluse.h diff --git a/src/curl/stamp-h1 b/lib/curl/stamp-h1 similarity index 100% rename from src/curl/stamp-h1 rename to lib/curl/stamp-h1 diff --git a/src/curl/stdcheaders.h b/lib/curl/stdcheaders.h similarity index 100% rename from src/curl/stdcheaders.h rename to lib/curl/stdcheaders.h diff --git a/src/curl/strequal.c b/lib/curl/strequal.c similarity index 100% rename from src/curl/strequal.c rename to lib/curl/strequal.c diff --git a/src/curl/strequal.h b/lib/curl/strequal.h similarity index 100% rename from src/curl/strequal.h rename to lib/curl/strequal.h diff --git a/src/curl/strtok.c b/lib/curl/strtok.c similarity index 100% rename from src/curl/strtok.c rename to lib/curl/strtok.c diff --git a/src/curl/strtok.h b/lib/curl/strtok.h similarity index 100% rename from src/curl/strtok.h rename to lib/curl/strtok.h diff --git a/src/curl/telnet.c b/lib/curl/telnet.c similarity index 100% rename from src/curl/telnet.c rename to lib/curl/telnet.c diff --git a/src/curl/telnet.h b/lib/curl/telnet.h similarity index 100% rename from src/curl/telnet.h rename to lib/curl/telnet.h diff --git a/src/curl/timeval.c b/lib/curl/timeval.c similarity index 100% rename from src/curl/timeval.c rename to lib/curl/timeval.c diff --git a/src/curl/timeval.h b/lib/curl/timeval.h similarity index 100% rename from src/curl/timeval.h rename to lib/curl/timeval.h diff --git a/src/curl/transfer.c b/lib/curl/transfer.c similarity index 100% rename from src/curl/transfer.c rename to lib/curl/transfer.c diff --git a/src/curl/transfer.h b/lib/curl/transfer.h similarity index 100% rename from src/curl/transfer.h rename to lib/curl/transfer.h diff --git a/src/curl/types.h b/lib/curl/types.h similarity index 100% rename from src/curl/types.h rename to lib/curl/types.h diff --git a/src/curl/url.c b/lib/curl/url.c similarity index 100% rename from src/curl/url.c rename to lib/curl/url.c diff --git a/src/curl/url.h b/lib/curl/url.h similarity index 100% rename from src/curl/url.h rename to lib/curl/url.h diff --git a/src/curl/urldata.h b/lib/curl/urldata.h similarity index 100% rename from src/curl/urldata.h rename to lib/curl/urldata.h diff --git a/src/curl/version.c b/lib/curl/version.c similarity index 100% rename from src/curl/version.c rename to lib/curl/version.c diff --git a/src/keeper/.indent.pro b/lib/keeper/.indent.pro similarity index 100% rename from src/keeper/.indent.pro rename to lib/keeper/.indent.pro diff --git a/src/keeper/Makefile.am b/lib/keeper/Makefile.am similarity index 76% rename from src/keeper/Makefile.am rename to lib/keeper/Makefile.am index ade4ede0..d6461e1d 100644 --- a/src/keeper/Makefile.am +++ b/lib/keeper/Makefile.am @@ -2,5 +2,5 @@ noinst_LIBRARIES = libkeeper.a libkeeper_a_SOURCES = keeper.h kp_cache.c kp_dir.c kp_enum.c kp_get.c \ kp_iface.c kp_recur.c kp_set.c kp_sort.c kp_util.c \ kp_util.h -AM_CFLAGS = -I../pcre -I../adns -I../curl -I../../include -I.. +AM_CFLAGS = -I../pcre -I../adns -I../curl include $(top_srcdir)/autotools/rules.mk \ No newline at end of file diff --git a/src/keeper/Makefile.in b/lib/keeper/Makefile.in similarity index 96% rename from src/keeper/Makefile.in rename to lib/keeper/Makefile.in index 47ed5ebb..599864d4 100644 --- a/src/keeper/Makefile.in +++ b/lib/keeper/Makefile.in @@ -43,7 +43,6 @@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ -AS = @AS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -52,11 +51,11 @@ BUILD_CURL_FALSE = @BUILD_CURL_FALSE@ BUILD_CURL_TRUE = @BUILD_CURL_TRUE@ BUILD_PCRE_FALSE = @BUILD_PCRE_FALSE@ BUILD_PCRE_TRUE = @BUILD_PCRE_TRUE@ +BUILD_SQL_FALSE = @BUILD_SQL_FALSE@ +BUILD_SQL_TRUE = @BUILD_SQL_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@ -CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CURL_CFLAGS = @CURL_CFLAGS@ @@ -68,7 +67,6 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -79,13 +77,10 @@ F77 = @F77@ FFLAGS = @FFLAGS@ INCLTDL = @INCLTDL@ INSTALL_DATA = @INSTALL_DATA@ -INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@ -INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ -LIBADD_DL = @LIBADD_DL@ LIBLTDL = @LIBLTDL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -98,7 +93,6 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MODULES = @MODULES@ -OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -119,12 +113,9 @@ STRIP = @STRIP@ VERSION = @VERSION@ YACC = @YACC@ ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -141,7 +132,6 @@ build_configtool = @build_configtool@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ -buildsqlsrv = @buildsqlsrv@ datadir = $(prefix)/data exec_prefix = @exec_prefix@ host = @host@ @@ -161,7 +151,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -sqlsrvbuild = @sqlsrvbuild@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ noinst_LIBRARIES = libkeeper.a @@ -169,11 +158,11 @@ libkeeper_a_SOURCES = keeper.h kp_cache.c kp_dir.c kp_enum.c kp_get.c \ kp_iface.c kp_recur.c kp_set.c kp_sort.c kp_util.c \ kp_util.h -AM_CFLAGS = -I../pcre -I../adns -I../curl -I../../include -I.. +AM_CFLAGS = -I../pcre -I../adns -I../curl LINK = @echo "Linking $@"; $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -subdir = src/keeper +subdir = lib/keeper ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/config.h @@ -212,7 +201,7 @@ all: all-am .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/autotools/rules.mk $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/keeper/Makefile + $(AUTOMAKE) --gnu lib/keeper/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) diff --git a/src/keeper/keeper.h b/lib/keeper/keeper.h similarity index 100% rename from src/keeper/keeper.h rename to lib/keeper/keeper.h diff --git a/src/keeper/kp_cache.c b/lib/keeper/kp_cache.c similarity index 100% rename from src/keeper/kp_cache.c rename to lib/keeper/kp_cache.c diff --git a/src/keeper/kp_dir.c b/lib/keeper/kp_dir.c similarity index 100% rename from src/keeper/kp_dir.c rename to lib/keeper/kp_dir.c diff --git a/src/keeper/kp_enum.c b/lib/keeper/kp_enum.c similarity index 100% rename from src/keeper/kp_enum.c rename to lib/keeper/kp_enum.c diff --git a/src/keeper/kp_get.c b/lib/keeper/kp_get.c similarity index 100% rename from src/keeper/kp_get.c rename to lib/keeper/kp_get.c diff --git a/src/keeper/kp_iface.c b/lib/keeper/kp_iface.c similarity index 100% rename from src/keeper/kp_iface.c rename to lib/keeper/kp_iface.c diff --git a/src/keeper/kp_recur.c b/lib/keeper/kp_recur.c similarity index 100% rename from src/keeper/kp_recur.c rename to lib/keeper/kp_recur.c diff --git a/src/keeper/kp_set.c b/lib/keeper/kp_set.c similarity index 100% rename from src/keeper/kp_set.c rename to lib/keeper/kp_set.c diff --git a/src/keeper/kp_sort.c b/lib/keeper/kp_sort.c similarity index 100% rename from src/keeper/kp_sort.c rename to lib/keeper/kp_sort.c diff --git a/src/keeper/kp_util.c b/lib/keeper/kp_util.c similarity index 100% rename from src/keeper/kp_util.c rename to lib/keeper/kp_util.c diff --git a/src/keeper/kp_util.h b/lib/keeper/kp_util.h similarity index 100% rename from src/keeper/kp_util.h rename to lib/keeper/kp_util.h diff --git a/src/pcre/COPYING b/lib/pcre/COPYING similarity index 100% rename from src/pcre/COPYING rename to lib/pcre/COPYING diff --git a/src/pcre/Makefile.am b/lib/pcre/Makefile.am similarity index 74% rename from src/pcre/Makefile.am rename to lib/pcre/Makefile.am index ca546f0c..ca66a0f6 100644 --- a/src/pcre/Makefile.am +++ b/lib/pcre/Makefile.am @@ -5,9 +5,9 @@ dftables_SOURCES = dftables.c internal.h pcre.h dftables_DEPENDENCES = maketables.c -AM_CFLAGS = -I../../include -I.. -I../pcre -I../curl +AM_CFLAGS = @PCRE_CFLAGS@ chartables.c: dftables - $(top_builddir)/src/pcre/dftables > $@ + $(top_builddir)/lib/pcre/dftables > $@ include $(top_srcdir)/autotools/rules.mk diff --git a/src/pcre/Makefile.in b/lib/pcre/Makefile.in similarity index 96% rename from src/pcre/Makefile.in rename to lib/pcre/Makefile.in index e0233f70..3f2774b7 100644 --- a/src/pcre/Makefile.in +++ b/lib/pcre/Makefile.in @@ -43,7 +43,6 @@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ -AS = @AS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -52,11 +51,11 @@ BUILD_CURL_FALSE = @BUILD_CURL_FALSE@ BUILD_CURL_TRUE = @BUILD_CURL_TRUE@ BUILD_PCRE_FALSE = @BUILD_PCRE_FALSE@ BUILD_PCRE_TRUE = @BUILD_PCRE_TRUE@ +BUILD_SQL_FALSE = @BUILD_SQL_FALSE@ +BUILD_SQL_TRUE = @BUILD_SQL_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@ -CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CURL_CFLAGS = @CURL_CFLAGS@ @@ -68,7 +67,6 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -79,13 +77,10 @@ F77 = @F77@ FFLAGS = @FFLAGS@ INCLTDL = @INCLTDL@ INSTALL_DATA = @INSTALL_DATA@ -INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@ -INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ -LIBADD_DL = @LIBADD_DL@ LIBLTDL = @LIBLTDL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -98,7 +93,6 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MODULES = @MODULES@ -OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -119,12 +113,9 @@ STRIP = @STRIP@ VERSION = @VERSION@ YACC = @YACC@ ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -141,7 +132,6 @@ build_configtool = @build_configtool@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ -buildsqlsrv = @buildsqlsrv@ datadir = $(prefix)/data exec_prefix = @exec_prefix@ host = @host@ @@ -161,7 +151,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -sqlsrvbuild = @sqlsrvbuild@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ lib_LTLIBRARIES = libpcre.la @@ -170,11 +159,11 @@ libpcre_la_SOURCES = chartables.c get.c pcre.c study.c internal.h pcre.h dftables_SOURCES = dftables.c internal.h pcre.h dftables_DEPENDENCES = maketables.c -AM_CFLAGS = -I../../include -I.. -I../pcre -I../curl +AM_CFLAGS = @PCRE_CFLAGS@ LINK = @echo "Linking $@"; $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -subdir = src/pcre +subdir = lib/pcre ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/config.h @@ -216,7 +205,7 @@ all: all-am .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/autotools/rules.mk $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/pcre/Makefile + $(AUTOMAKE) --gnu lib/pcre/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) libLTLIBRARIES_INSTALL = $(INSTALL) @@ -462,7 +451,7 @@ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES chartables.c: dftables - $(top_builddir)/src/pcre/dftables > $@ + $(top_builddir)/lib/pcre/dftables > $@ .c.o: @echo "Building $@" diff --git a/src/pcre/README b/lib/pcre/README similarity index 100% rename from src/pcre/README rename to lib/pcre/README diff --git a/src/pcre/configwin32.h b/lib/pcre/configwin32.h similarity index 100% rename from src/pcre/configwin32.h rename to lib/pcre/configwin32.h diff --git a/src/pcre/dftables.c b/lib/pcre/dftables.c similarity index 100% rename from src/pcre/dftables.c rename to lib/pcre/dftables.c diff --git a/src/pcre/get.c b/lib/pcre/get.c similarity index 100% rename from src/pcre/get.c rename to lib/pcre/get.c diff --git a/src/pcre/internal.h b/lib/pcre/internal.h similarity index 100% rename from src/pcre/internal.h rename to lib/pcre/internal.h diff --git a/src/pcre/maketables.c b/lib/pcre/maketables.c similarity index 100% rename from src/pcre/maketables.c rename to lib/pcre/maketables.c diff --git a/src/pcre/pcre.c b/lib/pcre/pcre.c similarity index 100% rename from src/pcre/pcre.c rename to lib/pcre/pcre.c diff --git a/src/pcre/pcre.h b/lib/pcre/pcre.h similarity index 100% rename from src/pcre/pcre.h rename to lib/pcre/pcre.h diff --git a/src/pcre/study.c b/lib/pcre/study.c similarity index 100% rename from src/pcre/study.c rename to lib/pcre/study.c diff --git a/src/sqlsrv/Makefile b/lib/sqlsrv/Makefile similarity index 100% rename from src/sqlsrv/Makefile rename to lib/sqlsrv/Makefile diff --git a/src/sqlsrv/README b/lib/sqlsrv/README similarity index 100% rename from src/sqlsrv/README rename to lib/sqlsrv/README diff --git a/src/sqlsrv/api.c b/lib/sqlsrv/api.c similarity index 100% rename from src/sqlsrv/api.c rename to lib/sqlsrv/api.c diff --git a/src/sqlsrv/do_sql.c b/lib/sqlsrv/do_sql.c similarity index 100% rename from src/sqlsrv/do_sql.c rename to lib/sqlsrv/do_sql.c diff --git a/src/sqlsrv/do_sql.h b/lib/sqlsrv/do_sql.h similarity index 100% rename from src/sqlsrv/do_sql.h rename to lib/sqlsrv/do_sql.h diff --git a/src/sqlsrv/parse.tab.c b/lib/sqlsrv/parse.tab.c similarity index 100% rename from src/sqlsrv/parse.tab.c rename to lib/sqlsrv/parse.tab.c diff --git a/src/sqlsrv/parse.tab.h b/lib/sqlsrv/parse.tab.h similarity index 100% rename from src/sqlsrv/parse.tab.h rename to lib/sqlsrv/parse.tab.h diff --git a/src/sqlsrv/parse.y b/lib/sqlsrv/parse.y similarity index 100% rename from src/sqlsrv/parse.y rename to lib/sqlsrv/parse.y diff --git a/src/sqlsrv/rta.h b/lib/sqlsrv/rta.h similarity index 100% rename from src/sqlsrv/rta.h rename to lib/sqlsrv/rta.h diff --git a/src/sqlsrv/rtatables.c b/lib/sqlsrv/rtatables.c similarity index 100% rename from src/sqlsrv/rtatables.c rename to lib/sqlsrv/rtatables.c diff --git a/src/sqlsrv/token.c b/lib/sqlsrv/token.c similarity index 100% rename from src/sqlsrv/token.c rename to lib/sqlsrv/token.c diff --git a/src/sqlsrv/token.l b/lib/sqlsrv/token.l similarity index 100% rename from src/sqlsrv/token.l rename to lib/sqlsrv/token.l diff --git a/src/modules/.indent.pro b/modules/.indent.pro similarity index 100% rename from src/modules/.indent.pro rename to modules/.indent.pro diff --git a/src/modules/Makefile.am b/modules/Makefile.am similarity index 100% rename from src/modules/Makefile.am rename to modules/Makefile.am diff --git a/src/modules/Makefile.in b/modules/Makefile.in similarity index 96% rename from src/modules/Makefile.in rename to modules/Makefile.in index a67d5c6b..fd7ddec7 100644 --- a/src/modules/Makefile.in +++ b/modules/Makefile.in @@ -19,7 +19,7 @@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. +top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ @@ -43,7 +43,6 @@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ -AS = @AS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -52,11 +51,11 @@ BUILD_CURL_FALSE = @BUILD_CURL_FALSE@ BUILD_CURL_TRUE = @BUILD_CURL_TRUE@ BUILD_PCRE_FALSE = @BUILD_PCRE_FALSE@ BUILD_PCRE_TRUE = @BUILD_PCRE_TRUE@ +BUILD_SQL_FALSE = @BUILD_SQL_FALSE@ +BUILD_SQL_TRUE = @BUILD_SQL_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@ -CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CURL_CFLAGS = @CURL_CFLAGS@ @@ -68,7 +67,6 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -79,13 +77,10 @@ F77 = @F77@ FFLAGS = @FFLAGS@ INCLTDL = @INCLTDL@ INSTALL_DATA = @INSTALL_DATA@ -INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@ -INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ -LIBADD_DL = @LIBADD_DL@ LIBLTDL = @LIBLTDL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -98,7 +93,6 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MODULES = @MODULES@ -OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -119,12 +113,9 @@ STRIP = @STRIP@ VERSION = @VERSION@ YACC = @YACC@ ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -141,7 +132,6 @@ build_configtool = @build_configtool@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ -buildsqlsrv = @buildsqlsrv@ datadir = $(prefix)/data exec_prefix = @exec_prefix@ host = @host@ @@ -161,14 +151,13 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -sqlsrvbuild = @sqlsrvbuild@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ SUBDIRS = @MODULES@ LINK = @echo "Linking $@"; $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -subdir = src/modules +subdir = modules ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/config.h @@ -189,7 +178,7 @@ all: all-recursive .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/autotools/rules.mk $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/modules/Makefile + $(AUTOMAKE) --gnu modules/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) @@ -328,11 +317,11 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -top_distdir = ../.. +top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - $(mkinstalldirs) $(distdir)/../../autotools + $(mkinstalldirs) $(distdir)/../autotools @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ diff --git a/src/modules/connectserv/.indent.pro b/modules/connectserv/.indent.pro similarity index 100% rename from src/modules/connectserv/.indent.pro rename to modules/connectserv/.indent.pro diff --git a/src/modules/connectserv/Makefile.am b/modules/connectserv/Makefile.am similarity index 65% rename from src/modules/connectserv/Makefile.am rename to modules/connectserv/Makefile.am index e6630acd..de39cf42 100644 --- a/src/modules/connectserv/Makefile.am +++ b/modules/connectserv/Makefile.am @@ -1,5 +1,5 @@ pkglib_LTLIBRARIES = connectserv.la connectserv_la_SOURCES = cs.c cs.h cs_help.c connectserv_la_LDFLAGS = -module -avoid-version -no-undefined -AM_CFLAGS = -I../.. -I../../pcre -I../../curl -I../../adns +AM_CFLAGS = @PCRE_CFLAGS@ @CURL_CFLAGS@ -I$(top_srcdir)/lib/keeper/ -I$(top_srcdir)/lib/adns/ include $(top_srcdir)/autotools/rules.mk diff --git a/src/modules/connectserv/Makefile.in b/modules/connectserv/Makefile.in similarity index 95% rename from src/modules/connectserv/Makefile.in rename to modules/connectserv/Makefile.in index b47c2504..b408465d 100644 --- a/src/modules/connectserv/Makefile.in +++ b/modules/connectserv/Makefile.in @@ -19,7 +19,7 @@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../.. +top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ @@ -43,7 +43,6 @@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ -AS = @AS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -52,11 +51,11 @@ BUILD_CURL_FALSE = @BUILD_CURL_FALSE@ BUILD_CURL_TRUE = @BUILD_CURL_TRUE@ BUILD_PCRE_FALSE = @BUILD_PCRE_FALSE@ BUILD_PCRE_TRUE = @BUILD_PCRE_TRUE@ +BUILD_SQL_FALSE = @BUILD_SQL_FALSE@ +BUILD_SQL_TRUE = @BUILD_SQL_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@ -CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CURL_CFLAGS = @CURL_CFLAGS@ @@ -68,7 +67,6 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -79,13 +77,10 @@ F77 = @F77@ FFLAGS = @FFLAGS@ INCLTDL = @INCLTDL@ INSTALL_DATA = @INSTALL_DATA@ -INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@ -INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ -LIBADD_DL = @LIBADD_DL@ LIBLTDL = @LIBLTDL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -98,7 +93,6 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MODULES = @MODULES@ -OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -119,12 +113,9 @@ STRIP = @STRIP@ VERSION = @VERSION@ YACC = @YACC@ ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -141,7 +132,6 @@ build_configtool = @build_configtool@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ -buildsqlsrv = @buildsqlsrv@ datadir = $(prefix)/data exec_prefix = @exec_prefix@ host = @host@ @@ -161,17 +151,16 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -sqlsrvbuild = @sqlsrvbuild@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ pkglib_LTLIBRARIES = connectserv.la connectserv_la_SOURCES = cs.c cs.h cs_help.c connectserv_la_LDFLAGS = -module -avoid-version -no-undefined -AM_CFLAGS = -I../.. -I../../pcre -I../../curl -I../../adns +AM_CFLAGS = @PCRE_CFLAGS@ @CURL_CFLAGS@ -I$(top_srcdir)/lib/keeper/ -I$(top_srcdir)/lib/adns/ LINK = @echo "Linking $@"; $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -subdir = src/modules/connectserv +subdir = modules/connectserv ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/config.h @@ -202,7 +191,7 @@ all: all-am .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/autotools/rules.mk $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/modules/connectserv/Makefile + $(AUTOMAKE) --gnu modules/connectserv/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) pkglibLTLIBRARIES_INSTALL = $(INSTALL) @@ -300,11 +289,11 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -top_distdir = ../../.. +top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - $(mkinstalldirs) $(distdir)/../../../autotools + $(mkinstalldirs) $(distdir)/../../autotools @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ diff --git a/src/modules/connectserv/cs.c b/modules/connectserv/cs.c similarity index 99% rename from src/modules/connectserv/cs.c rename to modules/connectserv/cs.c index 0c43da18..a79e107e 100644 --- a/src/modules/connectserv/cs.c +++ b/modules/connectserv/cs.c @@ -300,8 +300,6 @@ static int cs_event_umode(CmdParams* cmdparams) irc_chanalert(cs_bot, msg_bot, cmdparams->source->name, add?"now":"no longer", add?'+':'-', *modes); } - default: - break; } modes++; } diff --git a/src/modules/connectserv/cs.h b/modules/connectserv/cs.h similarity index 100% rename from src/modules/connectserv/cs.h rename to modules/connectserv/cs.h diff --git a/src/modules/connectserv/cs_help.c b/modules/connectserv/cs_help.c similarity index 100% rename from src/modules/connectserv/cs_help.c rename to modules/connectserv/cs_help.c diff --git a/src/modules/extauth/.indent.pro b/modules/extauth/.indent.pro similarity index 100% rename from src/modules/extauth/.indent.pro rename to modules/extauth/.indent.pro diff --git a/src/modules/extauth/Makefile.am b/modules/extauth/Makefile.am similarity index 63% rename from src/modules/extauth/Makefile.am rename to modules/extauth/Makefile.am index 550f9c30..502de583 100644 --- a/src/modules/extauth/Makefile.am +++ b/modules/extauth/Makefile.am @@ -1,5 +1,5 @@ pkglib_LTLIBRARIES = extauth.la extauth_la_SOURCES = extauth.c extauth_la_LDFLAGS = -module -avoid-version -no-undefined -AM_CFLAGS = -I../.. -I../../pcre -I../../curl -I../../adns +AM_CFLAGS = @PCRE_CFLAGS@ @CURL_CFLAGS@ -I$(top_srcdir)/lib/keeper/ -I$(top_srcdir)/lib/adns/ include $(top_srcdir)/autotools/rules.mk \ No newline at end of file diff --git a/src/modules/extauth/Makefile.in b/modules/extauth/Makefile.in similarity index 95% rename from src/modules/extauth/Makefile.in rename to modules/extauth/Makefile.in index f0ae1ad0..3f56e1eb 100644 --- a/src/modules/extauth/Makefile.in +++ b/modules/extauth/Makefile.in @@ -19,7 +19,7 @@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../.. +top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ @@ -43,7 +43,6 @@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ -AS = @AS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -52,11 +51,11 @@ BUILD_CURL_FALSE = @BUILD_CURL_FALSE@ BUILD_CURL_TRUE = @BUILD_CURL_TRUE@ BUILD_PCRE_FALSE = @BUILD_PCRE_FALSE@ BUILD_PCRE_TRUE = @BUILD_PCRE_TRUE@ +BUILD_SQL_FALSE = @BUILD_SQL_FALSE@ +BUILD_SQL_TRUE = @BUILD_SQL_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@ -CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CURL_CFLAGS = @CURL_CFLAGS@ @@ -68,7 +67,6 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -79,13 +77,10 @@ F77 = @F77@ FFLAGS = @FFLAGS@ INCLTDL = @INCLTDL@ INSTALL_DATA = @INSTALL_DATA@ -INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@ -INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ -LIBADD_DL = @LIBADD_DL@ LIBLTDL = @LIBLTDL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -98,7 +93,6 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MODULES = @MODULES@ -OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -119,12 +113,9 @@ STRIP = @STRIP@ VERSION = @VERSION@ YACC = @YACC@ ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -141,7 +132,6 @@ build_configtool = @build_configtool@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ -buildsqlsrv = @buildsqlsrv@ datadir = $(prefix)/data exec_prefix = @exec_prefix@ host = @host@ @@ -161,17 +151,16 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -sqlsrvbuild = @sqlsrvbuild@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ pkglib_LTLIBRARIES = extauth.la extauth_la_SOURCES = extauth.c extauth_la_LDFLAGS = -module -avoid-version -no-undefined -AM_CFLAGS = -I../.. -I../../pcre -I../../curl -I../../adns +AM_CFLAGS = @PCRE_CFLAGS@ @CURL_CFLAGS@ -I$(top_srcdir)/lib/keeper/ -I$(top_srcdir)/lib/adns/ LINK = @echo "Linking $@"; $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -subdir = src/modules/extauth +subdir = modules/extauth ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/config.h @@ -202,7 +191,7 @@ all: all-am .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/autotools/rules.mk $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/modules/extauth/Makefile + $(AUTOMAKE) --gnu modules/extauth/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) pkglibLTLIBRARIES_INSTALL = $(INSTALL) @@ -299,11 +288,11 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -top_distdir = ../../.. +top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - $(mkinstalldirs) $(distdir)/../../../autotools + $(mkinstalldirs) $(distdir)/../../autotools @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ diff --git a/src/modules/extauth/extauth.c b/modules/extauth/extauth.c similarity index 100% rename from src/modules/extauth/extauth.c rename to modules/extauth/extauth.c diff --git a/src/modules/hostserv/.indent.pro b/modules/hostserv/.indent.pro similarity index 100% rename from src/modules/hostserv/.indent.pro rename to modules/hostserv/.indent.pro diff --git a/src/modules/hostserv/Makefile.am b/modules/hostserv/Makefile.am similarity index 66% rename from src/modules/hostserv/Makefile.am rename to modules/hostserv/Makefile.am index cfd780c5..06c09d7d 100644 --- a/src/modules/hostserv/Makefile.am +++ b/modules/hostserv/Makefile.am @@ -1,5 +1,5 @@ pkglib_LTLIBRARIES = hostserv.la hostserv_la_SOURCES = hostserv.c hostserv.h hs_help.c hostserv_la_LDFLAGS = -module -avoid-version -no-undefined -AM_CFLAGS = -I../.. -I../../pcre -I../../curl -I../../adns +AM_CFLAGS = @PCRE_CFLAGS@ @CURL_CFLAGS@ -I$(top_srcdir)/lib/keeper/ -I$(top_srcdir)/lib/adns/ include $(top_srcdir)/autotools/rules.mk \ No newline at end of file diff --git a/src/modules/hostserv/Makefile.in b/modules/hostserv/Makefile.in similarity index 95% rename from src/modules/hostserv/Makefile.in rename to modules/hostserv/Makefile.in index 47e96b70..b95357de 100644 --- a/src/modules/hostserv/Makefile.in +++ b/modules/hostserv/Makefile.in @@ -19,7 +19,7 @@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../.. +top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ @@ -43,7 +43,6 @@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ -AS = @AS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -52,11 +51,11 @@ BUILD_CURL_FALSE = @BUILD_CURL_FALSE@ BUILD_CURL_TRUE = @BUILD_CURL_TRUE@ BUILD_PCRE_FALSE = @BUILD_PCRE_FALSE@ BUILD_PCRE_TRUE = @BUILD_PCRE_TRUE@ +BUILD_SQL_FALSE = @BUILD_SQL_FALSE@ +BUILD_SQL_TRUE = @BUILD_SQL_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@ -CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CURL_CFLAGS = @CURL_CFLAGS@ @@ -68,7 +67,6 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -79,13 +77,10 @@ F77 = @F77@ FFLAGS = @FFLAGS@ INCLTDL = @INCLTDL@ INSTALL_DATA = @INSTALL_DATA@ -INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@ -INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ -LIBADD_DL = @LIBADD_DL@ LIBLTDL = @LIBLTDL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -98,7 +93,6 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MODULES = @MODULES@ -OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -119,12 +113,9 @@ STRIP = @STRIP@ VERSION = @VERSION@ YACC = @YACC@ ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -141,7 +132,6 @@ build_configtool = @build_configtool@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ -buildsqlsrv = @buildsqlsrv@ datadir = $(prefix)/data exec_prefix = @exec_prefix@ host = @host@ @@ -161,17 +151,16 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -sqlsrvbuild = @sqlsrvbuild@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ pkglib_LTLIBRARIES = hostserv.la hostserv_la_SOURCES = hostserv.c hostserv.h hs_help.c hostserv_la_LDFLAGS = -module -avoid-version -no-undefined -AM_CFLAGS = -I../.. -I../../pcre -I../../curl -I../../adns +AM_CFLAGS = @PCRE_CFLAGS@ @CURL_CFLAGS@ -I$(top_srcdir)/lib/keeper/ -I$(top_srcdir)/lib/adns/ LINK = @echo "Linking $@"; $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -subdir = src/modules/hostserv +subdir = modules/hostserv ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/config.h @@ -202,7 +191,7 @@ all: all-am .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/autotools/rules.mk $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/modules/hostserv/Makefile + $(AUTOMAKE) --gnu modules/hostserv/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) pkglibLTLIBRARIES_INSTALL = $(INSTALL) @@ -300,11 +289,11 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -top_distdir = ../../.. +top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - $(mkinstalldirs) $(distdir)/../../../autotools + $(mkinstalldirs) $(distdir)/../../autotools @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ diff --git a/src/modules/hostserv/README b/modules/hostserv/README similarity index 100% rename from src/modules/hostserv/README rename to modules/hostserv/README diff --git a/src/modules/hostserv/hostserv.c b/modules/hostserv/hostserv.c similarity index 100% rename from src/modules/hostserv/hostserv.c rename to modules/hostserv/hostserv.c diff --git a/src/modules/hostserv/hostserv.h b/modules/hostserv/hostserv.h similarity index 100% rename from src/modules/hostserv/hostserv.h rename to modules/hostserv/hostserv.h diff --git a/src/modules/hostserv/hs_help.c b/modules/hostserv/hs_help.c similarity index 100% rename from src/modules/hostserv/hs_help.c rename to modules/hostserv/hs_help.c diff --git a/src/modules/ircdauth/Makefile.am b/modules/ircdauth/Makefile.am similarity index 63% rename from src/modules/ircdauth/Makefile.am rename to modules/ircdauth/Makefile.am index 5cfc6598..96f6b3cc 100644 --- a/src/modules/ircdauth/Makefile.am +++ b/modules/ircdauth/Makefile.am @@ -1,5 +1,5 @@ pkglib_LTLIBRARIES = ircdauth.la ircdauth_la_SOURCES = ircdauth.c ircdauth_la_LDFLAGS = -module -avoid-version -no-undefined -AM_CFLAGS = -I../.. -I../../pcre -I../../curl -I../../adns +AM_CFLAGS = @PCRE_CFLAGS@ @CURL_CFLAGS@ -I$(top_srcdir)/lib/keeper/ -I$(top_srcdir)/lib/adns/ include $(top_srcdir)/autotools/rules.mk \ No newline at end of file diff --git a/src/modules/ircdauth/Makefile.in b/modules/ircdauth/Makefile.in similarity index 95% rename from src/modules/ircdauth/Makefile.in rename to modules/ircdauth/Makefile.in index 140ffda4..061abfd4 100644 --- a/src/modules/ircdauth/Makefile.in +++ b/modules/ircdauth/Makefile.in @@ -19,7 +19,7 @@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../.. +top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ @@ -43,7 +43,6 @@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ -AS = @AS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -52,11 +51,11 @@ BUILD_CURL_FALSE = @BUILD_CURL_FALSE@ BUILD_CURL_TRUE = @BUILD_CURL_TRUE@ BUILD_PCRE_FALSE = @BUILD_PCRE_FALSE@ BUILD_PCRE_TRUE = @BUILD_PCRE_TRUE@ +BUILD_SQL_FALSE = @BUILD_SQL_FALSE@ +BUILD_SQL_TRUE = @BUILD_SQL_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@ -CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CURL_CFLAGS = @CURL_CFLAGS@ @@ -68,7 +67,6 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -79,13 +77,10 @@ F77 = @F77@ FFLAGS = @FFLAGS@ INCLTDL = @INCLTDL@ INSTALL_DATA = @INSTALL_DATA@ -INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@ -INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ -LIBADD_DL = @LIBADD_DL@ LIBLTDL = @LIBLTDL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -98,7 +93,6 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MODULES = @MODULES@ -OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -119,12 +113,9 @@ STRIP = @STRIP@ VERSION = @VERSION@ YACC = @YACC@ ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -141,7 +132,6 @@ build_configtool = @build_configtool@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ -buildsqlsrv = @buildsqlsrv@ datadir = $(prefix)/data exec_prefix = @exec_prefix@ host = @host@ @@ -161,17 +151,16 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -sqlsrvbuild = @sqlsrvbuild@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ pkglib_LTLIBRARIES = ircdauth.la ircdauth_la_SOURCES = ircdauth.c ircdauth_la_LDFLAGS = -module -avoid-version -no-undefined -AM_CFLAGS = -I../.. -I../../pcre -I../../curl -I../../adns +AM_CFLAGS = @PCRE_CFLAGS@ @CURL_CFLAGS@ -I$(top_srcdir)/lib/keeper/ -I$(top_srcdir)/lib/adns/ LINK = @echo "Linking $@"; $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -subdir = src/modules/ircdauth +subdir = modules/ircdauth ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/config.h @@ -202,7 +191,7 @@ all: all-am .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/autotools/rules.mk $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/modules/ircdauth/Makefile + $(AUTOMAKE) --gnu modules/ircdauth/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) pkglibLTLIBRARIES_INSTALL = $(INSTALL) @@ -299,11 +288,11 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -top_distdir = ../../.. +top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - $(mkinstalldirs) $(distdir)/../../../autotools + $(mkinstalldirs) $(distdir)/../../autotools @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ diff --git a/src/modules/ircdauth/ircdauth.c b/modules/ircdauth/ircdauth.c similarity index 100% rename from src/modules/ircdauth/ircdauth.c rename to modules/ircdauth/ircdauth.c diff --git a/src/modules/loveserv/.indent.pro b/modules/loveserv/.indent.pro similarity index 100% rename from src/modules/loveserv/.indent.pro rename to modules/loveserv/.indent.pro diff --git a/src/modules/loveserv/Makefile.am b/modules/loveserv/Makefile.am similarity index 66% rename from src/modules/loveserv/Makefile.am rename to modules/loveserv/Makefile.am index 06ff72b0..6ee54de7 100644 --- a/src/modules/loveserv/Makefile.am +++ b/modules/loveserv/Makefile.am @@ -1,5 +1,5 @@ pkglib_LTLIBRARIES = loveserv.la loveserv_la_SOURCES = loveserv.c loveserv.h ls_help.c loveserv_la_LDFLAGS = -module -avoid-version -no-undefined -AM_CFLAGS = -I../.. -I../../pcre -I../../curl -I../../adns +AM_CFLAGS = @PCRE_CFLAGS@ @CURL_CFLAGS@ -I$(top_srcdir)/lib/keeper/ -I$(top_srcdir)/lib/adns/ include $(top_srcdir)/autotools/rules.mk \ No newline at end of file diff --git a/src/modules/loveserv/Makefile.in b/modules/loveserv/Makefile.in similarity index 95% rename from src/modules/loveserv/Makefile.in rename to modules/loveserv/Makefile.in index 4374b96a..71c6031a 100644 --- a/src/modules/loveserv/Makefile.in +++ b/modules/loveserv/Makefile.in @@ -19,7 +19,7 @@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../.. +top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ @@ -43,7 +43,6 @@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ -AS = @AS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -52,11 +51,11 @@ BUILD_CURL_FALSE = @BUILD_CURL_FALSE@ BUILD_CURL_TRUE = @BUILD_CURL_TRUE@ BUILD_PCRE_FALSE = @BUILD_PCRE_FALSE@ BUILD_PCRE_TRUE = @BUILD_PCRE_TRUE@ +BUILD_SQL_FALSE = @BUILD_SQL_FALSE@ +BUILD_SQL_TRUE = @BUILD_SQL_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@ -CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CURL_CFLAGS = @CURL_CFLAGS@ @@ -68,7 +67,6 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -79,13 +77,10 @@ F77 = @F77@ FFLAGS = @FFLAGS@ INCLTDL = @INCLTDL@ INSTALL_DATA = @INSTALL_DATA@ -INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@ -INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ -LIBADD_DL = @LIBADD_DL@ LIBLTDL = @LIBLTDL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -98,7 +93,6 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MODULES = @MODULES@ -OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -119,12 +113,9 @@ STRIP = @STRIP@ VERSION = @VERSION@ YACC = @YACC@ ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -141,7 +132,6 @@ build_configtool = @build_configtool@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ -buildsqlsrv = @buildsqlsrv@ datadir = $(prefix)/data exec_prefix = @exec_prefix@ host = @host@ @@ -161,17 +151,16 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -sqlsrvbuild = @sqlsrvbuild@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ pkglib_LTLIBRARIES = loveserv.la loveserv_la_SOURCES = loveserv.c loveserv.h ls_help.c loveserv_la_LDFLAGS = -module -avoid-version -no-undefined -AM_CFLAGS = -I../.. -I../../pcre -I../../curl -I../../adns +AM_CFLAGS = @PCRE_CFLAGS@ @CURL_CFLAGS@ -I$(top_srcdir)/lib/keeper/ -I$(top_srcdir)/lib/adns/ LINK = @echo "Linking $@"; $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -subdir = src/modules/loveserv +subdir = modules/loveserv ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/config.h @@ -202,7 +191,7 @@ all: all-am .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/autotools/rules.mk $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/modules/loveserv/Makefile + $(AUTOMAKE) --gnu modules/loveserv/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) pkglibLTLIBRARIES_INSTALL = $(INSTALL) @@ -300,11 +289,11 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -top_distdir = ../../.. +top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - $(mkinstalldirs) $(distdir)/../../../autotools + $(mkinstalldirs) $(distdir)/../../autotools @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ diff --git a/src/modules/loveserv/TODO b/modules/loveserv/TODO similarity index 100% rename from src/modules/loveserv/TODO rename to modules/loveserv/TODO diff --git a/src/modules/loveserv/loveserv.c b/modules/loveserv/loveserv.c similarity index 100% rename from src/modules/loveserv/loveserv.c rename to modules/loveserv/loveserv.c diff --git a/src/modules/loveserv/loveserv.h b/modules/loveserv/loveserv.h similarity index 100% rename from src/modules/loveserv/loveserv.h rename to modules/loveserv/loveserv.h diff --git a/src/modules/loveserv/ls_help.c b/modules/loveserv/ls_help.c similarity index 100% rename from src/modules/loveserv/ls_help.c rename to modules/loveserv/ls_help.c diff --git a/src/modules/modules.txt b/modules/modules.txt similarity index 100% rename from src/modules/modules.txt rename to modules/modules.txt diff --git a/src/modules/moraleserv/.indent.pro b/modules/moraleserv/.indent.pro similarity index 100% rename from src/modules/moraleserv/.indent.pro rename to modules/moraleserv/.indent.pro diff --git a/src/modules/moraleserv/Makefile.am b/modules/moraleserv/Makefile.am similarity index 65% rename from src/modules/moraleserv/Makefile.am rename to modules/moraleserv/Makefile.am index 7aa00a1f..d7028aa9 100644 --- a/src/modules/moraleserv/Makefile.am +++ b/modules/moraleserv/Makefile.am @@ -1,5 +1,5 @@ pkglib_LTLIBRARIES = moraleserv.la moraleserv_la_SOURCES = ms.c ms.h ms_help.c moraleserv_la_LDFLAGS = -module -avoid-version -no-undefined -AM_CFLAGS = -I../.. -I../../pcre -I../../curl -I../../adns +AM_CFLAGS = @PCRE_CFLAGS@ @CURL_CFLAGS@ -I$(top_srcdir)/lib/keeper/ -I$(top_srcdir)/lib/adns/ include $(top_srcdir)/autotools/rules.mk \ No newline at end of file diff --git a/src/modules/moraleserv/Makefile.in b/modules/moraleserv/Makefile.in similarity index 95% rename from src/modules/moraleserv/Makefile.in rename to modules/moraleserv/Makefile.in index 3e393a2e..e6d7b53f 100644 --- a/src/modules/moraleserv/Makefile.in +++ b/modules/moraleserv/Makefile.in @@ -19,7 +19,7 @@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../.. +top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ @@ -43,7 +43,6 @@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ -AS = @AS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -52,11 +51,11 @@ BUILD_CURL_FALSE = @BUILD_CURL_FALSE@ BUILD_CURL_TRUE = @BUILD_CURL_TRUE@ BUILD_PCRE_FALSE = @BUILD_PCRE_FALSE@ BUILD_PCRE_TRUE = @BUILD_PCRE_TRUE@ +BUILD_SQL_FALSE = @BUILD_SQL_FALSE@ +BUILD_SQL_TRUE = @BUILD_SQL_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@ -CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CURL_CFLAGS = @CURL_CFLAGS@ @@ -68,7 +67,6 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -79,13 +77,10 @@ F77 = @F77@ FFLAGS = @FFLAGS@ INCLTDL = @INCLTDL@ INSTALL_DATA = @INSTALL_DATA@ -INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@ -INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ -LIBADD_DL = @LIBADD_DL@ LIBLTDL = @LIBLTDL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -98,7 +93,6 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MODULES = @MODULES@ -OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -119,12 +113,9 @@ STRIP = @STRIP@ VERSION = @VERSION@ YACC = @YACC@ ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -141,7 +132,6 @@ build_configtool = @build_configtool@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ -buildsqlsrv = @buildsqlsrv@ datadir = $(prefix)/data exec_prefix = @exec_prefix@ host = @host@ @@ -161,17 +151,16 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -sqlsrvbuild = @sqlsrvbuild@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ pkglib_LTLIBRARIES = moraleserv.la moraleserv_la_SOURCES = ms.c ms.h ms_help.c moraleserv_la_LDFLAGS = -module -avoid-version -no-undefined -AM_CFLAGS = -I../.. -I../../pcre -I../../curl -I../../adns +AM_CFLAGS = @PCRE_CFLAGS@ @CURL_CFLAGS@ -I$(top_srcdir)/lib/keeper/ -I$(top_srcdir)/lib/adns/ LINK = @echo "Linking $@"; $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -subdir = src/modules/moraleserv +subdir = modules/moraleserv ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/config.h @@ -202,7 +191,7 @@ all: all-am .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/autotools/rules.mk $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/modules/moraleserv/Makefile + $(AUTOMAKE) --gnu modules/moraleserv/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) pkglibLTLIBRARIES_INSTALL = $(INSTALL) @@ -300,11 +289,11 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -top_distdir = ../../.. +top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - $(mkinstalldirs) $(distdir)/../../../autotools + $(mkinstalldirs) $(distdir)/../../autotools @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ diff --git a/src/modules/moraleserv/ms.c b/modules/moraleserv/ms.c similarity index 100% rename from src/modules/moraleserv/ms.c rename to modules/moraleserv/ms.c diff --git a/src/modules/moraleserv/ms.h b/modules/moraleserv/ms.h similarity index 100% rename from src/modules/moraleserv/ms.h rename to modules/moraleserv/ms.h diff --git a/src/modules/moraleserv/ms_help.c b/modules/moraleserv/ms_help.c similarity index 100% rename from src/modules/moraleserv/ms_help.c rename to modules/moraleserv/ms_help.c diff --git a/src/modules/neoserv/Makefile b/modules/neoserv/Makefile similarity index 100% rename from src/modules/neoserv/Makefile rename to modules/neoserv/Makefile diff --git a/src/modules/neoserv/neoserv.c b/modules/neoserv/neoserv.c similarity index 100% rename from src/modules/neoserv/neoserv.c rename to modules/neoserv/neoserv.c diff --git a/src/modules/neoserv/neoserv_help.c b/modules/neoserv/neoserv_help.c similarity index 100% rename from src/modules/neoserv/neoserv_help.c rename to modules/neoserv/neoserv_help.c diff --git a/src/modules/operlog/ChangeLog b/modules/operlog/ChangeLog similarity index 100% rename from src/modules/operlog/ChangeLog rename to modules/operlog/ChangeLog diff --git a/src/modules/operlog/Makefile b/modules/operlog/Makefile similarity index 100% rename from src/modules/operlog/Makefile rename to modules/operlog/Makefile diff --git a/src/modules/operlog/ol_help.c b/modules/operlog/ol_help.c similarity index 100% rename from src/modules/operlog/ol_help.c rename to modules/operlog/ol_help.c diff --git a/src/modules/operlog/operlog.c b/modules/operlog/operlog.c similarity index 100% rename from src/modules/operlog/operlog.c rename to modules/operlog/operlog.c diff --git a/src/modules/statserv/.indent.pro b/modules/statserv/.indent.pro similarity index 100% rename from src/modules/statserv/.indent.pro rename to modules/statserv/.indent.pro diff --git a/src/modules/statserv/GeoIP.c b/modules/statserv/GeoIP.c similarity index 100% rename from src/modules/statserv/GeoIP.c rename to modules/statserv/GeoIP.c diff --git a/src/modules/statserv/GeoIP.dat b/modules/statserv/GeoIP.dat similarity index 100% rename from src/modules/statserv/GeoIP.dat rename to modules/statserv/GeoIP.dat diff --git a/src/modules/statserv/GeoIP.h b/modules/statserv/GeoIP.h similarity index 100% rename from src/modules/statserv/GeoIP.h rename to modules/statserv/GeoIP.h diff --git a/src/modules/statserv/GeoIPBitReader.c b/modules/statserv/GeoIPBitReader.c similarity index 100% rename from src/modules/statserv/GeoIPBitReader.c rename to modules/statserv/GeoIPBitReader.c diff --git a/src/modules/statserv/GeoIPBitReader.h b/modules/statserv/GeoIPBitReader.h similarity index 100% rename from src/modules/statserv/GeoIPBitReader.h rename to modules/statserv/GeoIPBitReader.h diff --git a/src/modules/statserv/GeoIPCity.c b/modules/statserv/GeoIPCity.c similarity index 100% rename from src/modules/statserv/GeoIPCity.c rename to modules/statserv/GeoIPCity.c diff --git a/src/modules/statserv/GeoIPCity.h b/modules/statserv/GeoIPCity.h similarity index 100% rename from src/modules/statserv/GeoIPCity.h rename to modules/statserv/GeoIPCity.h diff --git a/src/modules/statserv/Makefile.am b/modules/statserv/Makefile.am similarity index 76% rename from src/modules/statserv/Makefile.am rename to modules/statserv/Makefile.am index cafb2cc4..39582859 100644 --- a/src/modules/statserv/Makefile.am +++ b/modules/statserv/Makefile.am @@ -4,8 +4,7 @@ statserv_la_SOURCES = database.c GeoIPCity.c global.h md5.c stats.c \ GeoIPBitReader.h htmlstats.c sqlstats.h \ statserv.h GeoIP.c GeoIP.h ss_help.c tld.c statserv_la_LDFLAGS = -module -avoid-version -no-undefined -AM_CFLAGS = -I../.. -I../../pcre -I../../curl -I../../adns \ - -DGEOIPDATADIR=\"$(datadir)\" \ +AM_CFLAGS = @PCRE_CFLAGS@ @CURL_CFLAGS@ -I$(top_srcdir)/lib/keeper/ -I$(top_srcdir)/lib/adns/ -DGEOIPDATADIR=\"$(datadir)\" \ -DSYSCONFDIR=\"$(sysconfdir)\" dist_data_DATA = GeoIP.dat html/index.tpl include $(top_srcdir)/autotools/rules.mk \ No newline at end of file diff --git a/src/modules/statserv/Makefile.in b/modules/statserv/Makefile.in similarity index 96% rename from src/modules/statserv/Makefile.in rename to modules/statserv/Makefile.in index 837140ee..a5f5143a 100644 --- a/src/modules/statserv/Makefile.in +++ b/modules/statserv/Makefile.in @@ -19,7 +19,7 @@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../.. +top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ @@ -43,7 +43,6 @@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ -AS = @AS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -52,11 +51,11 @@ BUILD_CURL_FALSE = @BUILD_CURL_FALSE@ BUILD_CURL_TRUE = @BUILD_CURL_TRUE@ BUILD_PCRE_FALSE = @BUILD_PCRE_FALSE@ BUILD_PCRE_TRUE = @BUILD_PCRE_TRUE@ +BUILD_SQL_FALSE = @BUILD_SQL_FALSE@ +BUILD_SQL_TRUE = @BUILD_SQL_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@ -CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CURL_CFLAGS = @CURL_CFLAGS@ @@ -68,7 +67,6 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -79,13 +77,10 @@ F77 = @F77@ FFLAGS = @FFLAGS@ INCLTDL = @INCLTDL@ INSTALL_DATA = @INSTALL_DATA@ -INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@ -INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ -LIBADD_DL = @LIBADD_DL@ LIBLTDL = @LIBLTDL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -98,7 +93,6 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MODULES = @MODULES@ -OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -119,12 +113,9 @@ STRIP = @STRIP@ VERSION = @VERSION@ YACC = @YACC@ ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -141,7 +132,6 @@ build_configtool = @build_configtool@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ -buildsqlsrv = @buildsqlsrv@ datadir = $(prefix)/data exec_prefix = @exec_prefix@ host = @host@ @@ -161,7 +151,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -sqlsrvbuild = @sqlsrvbuild@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ pkglib_LTLIBRARIES = statserv.la @@ -171,15 +160,14 @@ statserv_la_SOURCES = database.c GeoIPCity.c global.h md5.c stats.c \ statserv.h GeoIP.c GeoIP.h ss_help.c tld.c statserv_la_LDFLAGS = -module -avoid-version -no-undefined -AM_CFLAGS = -I../.. -I../../pcre -I../../curl -I../../adns \ - -DGEOIPDATADIR=\"$(datadir)\" \ +AM_CFLAGS = @PCRE_CFLAGS@ @CURL_CFLAGS@ -I$(top_srcdir)/lib/keeper/ -I$(top_srcdir)/lib/adns/ -DGEOIPDATADIR=\"$(datadir)\" \ -DSYSCONFDIR=\"$(sysconfdir)\" dist_data_DATA = GeoIP.dat html/index.tpl LINK = @echo "Linking $@"; $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -subdir = src/modules/statserv +subdir = modules/statserv ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/config.h @@ -219,7 +207,7 @@ all: all-am .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/autotools/rules.mk $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/modules/statserv/Makefile + $(AUTOMAKE) --gnu modules/statserv/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) pkglibLTLIBRARIES_INSTALL = $(INSTALL) @@ -343,11 +331,11 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -top_distdir = ../../.. +top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - $(mkinstalldirs) $(distdir)/../../../autotools $(distdir)/html + $(mkinstalldirs) $(distdir)/../../autotools $(distdir)/html @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ diff --git a/src/modules/statserv/database.c b/modules/statserv/database.c similarity index 100% rename from src/modules/statserv/database.c rename to modules/statserv/database.c diff --git a/src/modules/statserv/global.h b/modules/statserv/global.h similarity index 100% rename from src/modules/statserv/global.h rename to modules/statserv/global.h diff --git a/src/modules/statserv/html/index.tpl b/modules/statserv/html/index.tpl similarity index 100% rename from src/modules/statserv/html/index.tpl rename to modules/statserv/html/index.tpl diff --git a/src/modules/statserv/htmlstats.c b/modules/statserv/htmlstats.c similarity index 100% rename from src/modules/statserv/htmlstats.c rename to modules/statserv/htmlstats.c diff --git a/src/modules/statserv/md5.c b/modules/statserv/md5.c similarity index 100% rename from src/modules/statserv/md5.c rename to modules/statserv/md5.c diff --git a/src/modules/statserv/md5.h b/modules/statserv/md5.h similarity index 100% rename from src/modules/statserv/md5.h rename to modules/statserv/md5.h diff --git a/src/modules/statserv/sqlstats.h b/modules/statserv/sqlstats.h similarity index 100% rename from src/modules/statserv/sqlstats.h rename to modules/statserv/sqlstats.h diff --git a/src/modules/statserv/ss_help.c b/modules/statserv/ss_help.c similarity index 100% rename from src/modules/statserv/ss_help.c rename to modules/statserv/ss_help.c diff --git a/src/modules/statserv/stats.c b/modules/statserv/stats.c similarity index 100% rename from src/modules/statserv/stats.c rename to modules/statserv/stats.c diff --git a/src/modules/statserv/statserv.c b/modules/statserv/statserv.c similarity index 100% rename from src/modules/statserv/statserv.c rename to modules/statserv/statserv.c diff --git a/src/modules/statserv/statserv.h b/modules/statserv/statserv.h similarity index 100% rename from src/modules/statserv/statserv.h rename to modules/statserv/statserv.h diff --git a/src/modules/statserv/tld.c b/modules/statserv/tld.c similarity index 100% rename from src/modules/statserv/tld.c rename to modules/statserv/tld.c diff --git a/src/modules/template/Makefile.am b/modules/template/Makefile.am similarity index 63% rename from src/modules/template/Makefile.am rename to modules/template/Makefile.am index ff503cf1..c7651b2a 100644 --- a/src/modules/template/Makefile.am +++ b/modules/template/Makefile.am @@ -1,5 +1,5 @@ pkglib_LTLIBRARIES = template.la template_la_SOURCES = template.c template_la_LDFLAGS = -module -avoid-version -no-undefined -AM_CFLAGS = -I../.. -I../../pcre -I../../curl -I../../adns +AM_CFLAGS = @PCRE_CFLAGS@ @CURL_CFLAGS@ -I$(top_srcdir)/lib/keeper/ -I$(top_srcdir)/lib/adns/ include $(top_srcdir)/autotools/rules.mk \ No newline at end of file diff --git a/src/modules/template/Makefile.in b/modules/template/Makefile.in similarity index 95% rename from src/modules/template/Makefile.in rename to modules/template/Makefile.in index d2e9cde9..100c73d4 100644 --- a/src/modules/template/Makefile.in +++ b/modules/template/Makefile.in @@ -19,7 +19,7 @@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../.. +top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ @@ -43,7 +43,6 @@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ -AS = @AS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -52,11 +51,11 @@ BUILD_CURL_FALSE = @BUILD_CURL_FALSE@ BUILD_CURL_TRUE = @BUILD_CURL_TRUE@ BUILD_PCRE_FALSE = @BUILD_PCRE_FALSE@ BUILD_PCRE_TRUE = @BUILD_PCRE_TRUE@ +BUILD_SQL_FALSE = @BUILD_SQL_FALSE@ +BUILD_SQL_TRUE = @BUILD_SQL_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@ -CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CURL_CFLAGS = @CURL_CFLAGS@ @@ -68,7 +67,6 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -79,13 +77,10 @@ F77 = @F77@ FFLAGS = @FFLAGS@ INCLTDL = @INCLTDL@ INSTALL_DATA = @INSTALL_DATA@ -INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@ -INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ -LIBADD_DL = @LIBADD_DL@ LIBLTDL = @LIBLTDL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -98,7 +93,6 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MODULES = @MODULES@ -OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -119,12 +113,9 @@ STRIP = @STRIP@ VERSION = @VERSION@ YACC = @YACC@ ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -141,7 +132,6 @@ build_configtool = @build_configtool@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ -buildsqlsrv = @buildsqlsrv@ datadir = $(prefix)/data exec_prefix = @exec_prefix@ host = @host@ @@ -161,17 +151,16 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -sqlsrvbuild = @sqlsrvbuild@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ pkglib_LTLIBRARIES = template.la template_la_SOURCES = template.c template_la_LDFLAGS = -module -avoid-version -no-undefined -AM_CFLAGS = -I../.. -I../../pcre -I../../curl -I../../adns +AM_CFLAGS = @PCRE_CFLAGS@ @CURL_CFLAGS@ -I$(top_srcdir)/lib/keeper/ -I$(top_srcdir)/lib/adns/ LINK = @echo "Linking $@"; $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -subdir = src/modules/template +subdir = modules/template ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/config.h @@ -202,7 +191,7 @@ all: all-am .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/autotools/rules.mk $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/modules/template/Makefile + $(AUTOMAKE) --gnu modules/template/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) pkglibLTLIBRARIES_INSTALL = $(INSTALL) @@ -299,11 +288,11 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -top_distdir = ../../.. +top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - $(mkinstalldirs) $(distdir)/../../../autotools + $(mkinstalldirs) $(distdir)/../../autotools @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ diff --git a/src/modules/template/template.c b/modules/template/template.c similarity index 100% rename from src/modules/template/template.c rename to modules/template/template.c diff --git a/src/modules/templateauth/Makefile.am b/modules/templateauth/Makefile.am similarity index 65% rename from src/modules/templateauth/Makefile.am rename to modules/templateauth/Makefile.am index bdd2a0ba..f5599ffa 100644 --- a/src/modules/templateauth/Makefile.am +++ b/modules/templateauth/Makefile.am @@ -1,5 +1,5 @@ pkglib_LTLIBRARIES = templateauth.la templateauth_la_SOURCES = templateauth.c templateauth_la_LDFLAGS = -module -avoid-version -no-undefined -AM_CFLAGS = -I../.. -I../../pcre -I../../curl -I../../adns +AM_CFLAGS = @PCRE_CFLAGS@ @CURL_CFLAGS@ -I$(top_srcdir)/lib/keeper/ -I$(top_srcdir)/lib/adns/ include $(top_srcdir)/autotools/rules.mk \ No newline at end of file diff --git a/src/modules/templateauth/Makefile.in b/modules/templateauth/Makefile.in similarity index 95% rename from src/modules/templateauth/Makefile.in rename to modules/templateauth/Makefile.in index 0e7e503c..9020cfbc 100644 --- a/src/modules/templateauth/Makefile.in +++ b/modules/templateauth/Makefile.in @@ -19,7 +19,7 @@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../.. +top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ @@ -43,7 +43,6 @@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ -AS = @AS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -52,11 +51,11 @@ BUILD_CURL_FALSE = @BUILD_CURL_FALSE@ BUILD_CURL_TRUE = @BUILD_CURL_TRUE@ BUILD_PCRE_FALSE = @BUILD_PCRE_FALSE@ BUILD_PCRE_TRUE = @BUILD_PCRE_TRUE@ +BUILD_SQL_FALSE = @BUILD_SQL_FALSE@ +BUILD_SQL_TRUE = @BUILD_SQL_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@ -CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CURL_CFLAGS = @CURL_CFLAGS@ @@ -68,7 +67,6 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -79,13 +77,10 @@ F77 = @F77@ FFLAGS = @FFLAGS@ INCLTDL = @INCLTDL@ INSTALL_DATA = @INSTALL_DATA@ -INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@ -INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ -LIBADD_DL = @LIBADD_DL@ LIBLTDL = @LIBLTDL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -98,7 +93,6 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MODULES = @MODULES@ -OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -119,12 +113,9 @@ STRIP = @STRIP@ VERSION = @VERSION@ YACC = @YACC@ ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -141,7 +132,6 @@ build_configtool = @build_configtool@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ -buildsqlsrv = @buildsqlsrv@ datadir = $(prefix)/data exec_prefix = @exec_prefix@ host = @host@ @@ -161,17 +151,16 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -sqlsrvbuild = @sqlsrvbuild@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ pkglib_LTLIBRARIES = templateauth.la templateauth_la_SOURCES = templateauth.c templateauth_la_LDFLAGS = -module -avoid-version -no-undefined -AM_CFLAGS = -I../.. -I../../pcre -I../../curl -I../../adns +AM_CFLAGS = @PCRE_CFLAGS@ @CURL_CFLAGS@ -I$(top_srcdir)/lib/keeper/ -I$(top_srcdir)/lib/adns/ LINK = @echo "Linking $@"; $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -subdir = src/modules/templateauth +subdir = modules/templateauth ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/config.h @@ -202,7 +191,7 @@ all: all-am .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/autotools/rules.mk $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/modules/templateauth/Makefile + $(AUTOMAKE) --gnu modules/templateauth/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) pkglibLTLIBRARIES_INSTALL = $(INSTALL) @@ -299,11 +288,11 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -top_distdir = ../../.. +top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - $(mkinstalldirs) $(distdir)/../../../autotools + $(mkinstalldirs) $(distdir)/../../autotools @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ diff --git a/src/modules/templateauth/templateauth.c b/modules/templateauth/templateauth.c similarity index 100% rename from src/modules/templateauth/templateauth.c rename to modules/templateauth/templateauth.c diff --git a/src/Makefile.am b/src/Makefile.am index 949c2f5c..0f8c5663 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,19 +1,4 @@ -if BUILD_PCRE -PCREDIR = pcre -else -PCREDIR = -endif - -if BUILD_CURL -CURLDIR = curl -else -CURLDIR = -endif - - - -SUBDIRS = protocol $(CURLDIR) keeper adns libltdl $(PCREDIR) . modules - +SUBDIRS = protocol keeper bin_PROGRAMS = neostats @@ -22,9 +7,10 @@ neostats_SOURCES = auth.c bans.c bots.c channels.c commands.c conf.c db.c \ keeper.c list.c log.c main.c match.c misc.c modules.c \ ns_help.c servers.c services.c signals.c sock.c support.c \ timer.c transfer.c users.c -AM_CFLAGS = @PCRE_CFLAGS@ -I$(top_srcdir)/lang -Iadns -Ikeeper @INCLTDL@ @CURL_CFLAGS@ -DNEOSTATSCORE -neostats_LDADD = keeper/libkeeper.a \ - adns/libadns.la libltdl/libltdlc.la @PCRE_LIBS@ @CURL_LIBS@ +AM_CFLAGS = -I$(top_srcdir)/lib/adns -I$(top_srcdir)/lib/keeper \ + @PCRE_CFLAGS@ @CURL_CFLAGS@ -DNEOSTATSCORE +neostats_LDADD = $top_srcdir)/lib/keeper/libkeeper.a \ + $(top_srcdir)/lib/adns/libadns.la @PCRE_LIBS@ @CURL_LIBS@ neostats_LDFLAGS = --export-dynamic -rdynamic include $(top_srcdir)/autotools/rules.mk diff --git a/src/Makefile.in b/src/Makefile.in index f7a4faf6..a88da65f 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -43,7 +43,6 @@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ -AS = @AS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -52,11 +51,11 @@ BUILD_CURL_FALSE = @BUILD_CURL_FALSE@ BUILD_CURL_TRUE = @BUILD_CURL_TRUE@ BUILD_PCRE_FALSE = @BUILD_PCRE_FALSE@ BUILD_PCRE_TRUE = @BUILD_PCRE_TRUE@ +BUILD_SQL_FALSE = @BUILD_SQL_FALSE@ +BUILD_SQL_TRUE = @BUILD_SQL_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@ -CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CURL_CFLAGS = @CURL_CFLAGS@ @@ -68,7 +67,6 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -79,13 +77,10 @@ F77 = @F77@ FFLAGS = @FFLAGS@ INCLTDL = @INCLTDL@ INSTALL_DATA = @INSTALL_DATA@ -INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@ -INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ -LIBADD_DL = @LIBADD_DL@ LIBLTDL = @LIBLTDL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -98,7 +93,6 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MODULES = @MODULES@ -OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -119,12 +113,9 @@ STRIP = @STRIP@ VERSION = @VERSION@ YACC = @YACC@ ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -141,7 +132,6 @@ build_configtool = @build_configtool@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ -buildsqlsrv = @buildsqlsrv@ datadir = $(prefix)/data exec_prefix = @exec_prefix@ host = @host@ @@ -161,16 +151,9 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -sqlsrvbuild = @sqlsrvbuild@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -@BUILD_PCRE_TRUE@PCREDIR = pcre -@BUILD_PCRE_FALSE@PCREDIR = -@BUILD_CURL_FALSE@CURLDIR = - -@BUILD_CURL_TRUE@CURLDIR = curl - -SUBDIRS = protocol $(CURLDIR) keeper adns libltdl $(PCREDIR) . modules +SUBDIRS = protocol keeper bin_PROGRAMS = neostats @@ -180,9 +163,11 @@ neostats_SOURCES = auth.c bans.c bots.c channels.c commands.c conf.c db.c \ ns_help.c servers.c services.c signals.c sock.c support.c \ timer.c transfer.c users.c -AM_CFLAGS = @PCRE_CFLAGS@ -I$(top_srcdir)/lang -Iadns -Ikeeper @INCLTDL@ @CURL_CFLAGS@ -DNEOSTATSCORE -neostats_LDADD = keeper/libkeeper.a \ - adns/libadns.la libltdl/libltdlc.la @PCRE_LIBS@ @CURL_LIBS@ +AM_CFLAGS = -I$(top_srcdir)/lib/adns -I$(top_srcdir)/lib/keeper \ + @PCRE_CFLAGS@ @CURL_CFLAGS@ -DNEOSTATSCORE + +neostats_LDADD = $top_srcdir)/lib/keeper/libkeeper.a \ + $(top_srcdir)/lib/adns/libadns.la @PCRE_LIBS@ @CURL_LIBS@ neostats_LDFLAGS = --export-dynamic -rdynamic LINK = @echo "Linking $@"; $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -207,8 +192,8 @@ am_neostats_OBJECTS = auth.$(OBJEXT) bans.$(OBJEXT) bots.$(OBJEXT) \ support.$(OBJEXT) timer.$(OBJEXT) transfer.$(OBJEXT) \ users.$(OBJEXT) neostats_OBJECTS = $(am_neostats_OBJECTS) -neostats_DEPENDENCIES = keeper/libkeeper.a adns/libadns.la \ - libltdl/libltdlc.la +neostats_DEPENDENCIES = $top_srcdir)/lib/keeper/libkeeper.a \ + $(top_srcdir)/lib/adns/libadns.la DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include depcomp = $(SHELL) $(top_srcdir)/autotools/depcomp @@ -242,7 +227,7 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ check-recursive installcheck-recursive DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/autotools/rules.mk \ Makefile.am -DIST_SUBDIRS = protocol curl keeper adns libltdl pcre . modules +DIST_SUBDIRS = $(SUBDIRS) SOURCES = $(neostats_SOURCES) all: all-recursive @@ -490,7 +475,7 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d $(distdir)/$$subdir \ || mkdir $(distdir)/$$subdir \ diff --git a/src/libltdl/COPYING.LIB b/src/libltdl/COPYING.LIB deleted file mode 100644 index c4792dd2..00000000 --- a/src/libltdl/COPYING.LIB +++ /dev/null @@ -1,515 +0,0 @@ - - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations -below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. -^L - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it -becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. -^L - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control -compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. -^L - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. -^L - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. -^L - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. -^L - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply, and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License -may add an explicit geographical distribution limitation excluding those -countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. -^L - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS -^L - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms -of the ordinary General Public License). - - To apply these terms, attach the following notices to the library. -It is safest to attach them to the start of each source file to most -effectively convey the exclusion of warranty; and each file should -have at least the "copyright" line and a pointer to where the full -notice is found. - - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Also add information on how to contact you by electronic and paper -mail. - -You should also get your employer (if you work as a programmer) or -your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James -Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - diff --git a/src/libltdl/Makefile.am b/src/libltdl/Makefile.am deleted file mode 100644 index 2ece3ffc..00000000 --- a/src/libltdl/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -## Process this file with automake to produce Makefile.in - -AUTOMAKE_OPTIONS = foreign - -noinst_HEADERS = ltdl.h - -noinst_LTLIBRARIES = libltdlc.la - -## Make sure these will be cleaned even when they're not built by -## default. -CLEANFILES = libltdlc.a - -libltdlc_la_SOURCES = ltdl.c -libltdlc_la_LIBADD = $(LIBADD_DL) - -include $(top_srcdir)/autotools/rules.mk \ No newline at end of file diff --git a/src/libltdl/Makefile.in b/src/libltdl/Makefile.in deleted file mode 100644 index a9fcba6f..00000000 --- a/src/libltdl/Makefile.in +++ /dev/null @@ -1,473 +0,0 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. -# @configure_input@ - -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. -# This Makefile.in 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. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. - -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_triplet = @host@ - -pkglibdir = $(prefix)/modules -ACLOCAL = @ACLOCAL@ -ALLOCA = @ALLOCA@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BUILD_CURL_FALSE = @BUILD_CURL_FALSE@ -BUILD_CURL_TRUE = @BUILD_CURL_TRUE@ -BUILD_PCRE_FALSE = @BUILD_PCRE_FALSE@ -BUILD_PCRE_TRUE = @BUILD_PCRE_TRUE@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@ -CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CURL_CFLAGS = @CURL_CFLAGS@ -CURL_LIBS = @CURL_LIBS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -INCLTDL = @INCLTDL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@ -INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBADD_DL = @LIBADD_DL@ -LIBLTDL = @LIBLTDL@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ -MAKEINFO = @MAKEINFO@ -MODULES = @MODULES@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PCRE_CFLAGS = @PCRE_CFLAGS@ -PCRE_LIBS = @PCRE_LIBS@ -POW_LIB = @POW_LIB@ -PROTOCOL = @PROTOCOL@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -YACC = @YACC@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ -ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_configtool = @build_configtool@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -buildsqlsrv = @buildsqlsrv@ -datadir = $(prefix)/data -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -oldincludedir = @oldincludedir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sqlsrvbuild = @sqlsrvbuild@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ - -AUTOMAKE_OPTIONS = foreign - -noinst_HEADERS = ltdl.h - -noinst_LTLIBRARIES = libltdlc.la - -CLEANFILES = libltdlc.a - -libltdlc_la_SOURCES = ltdl.c -libltdlc_la_LIBADD = $(LIBADD_DL) -LINK = @echo "Linking $@"; $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ - -subdir = src/libltdl -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/include/config.h -CONFIG_CLEAN_FILES = -LTLIBRARIES = $(noinst_LTLIBRARIES) - -libltdlc_la_LDFLAGS = -libltdlc_la_DEPENDENCIES = -am_libltdlc_la_OBJECTS = ltdl.lo -libltdlc_la_OBJECTS = $(am_libltdlc_la_OBJECTS) - -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -depcomp = $(SHELL) $(top_srcdir)/autotools/depcomp -am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ltdl.Plo -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -DIST_SOURCES = $(libltdlc_la_SOURCES) -HEADERS = $(noinst_HEADERS) - -DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.in \ - $(top_srcdir)/autotools/rules.mk COPYING.LIB Makefile.am -SOURCES = $(libltdlc_la_SOURCES) - -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/autotools/rules.mk $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/libltdl/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - -clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libltdlc.la: $(libltdlc_la_OBJECTS) $(libltdlc_la_DEPENDENCIES) - $(LINK) $(libltdlc_la_LDFLAGS) $(libltdlc_la_OBJECTS) $(libltdlc_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ltdl.Plo@am__quote@ - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: - -ETAGS = etags -ETAGSFLAGS = - -CTAGS = ctags -CTAGSFLAGS = - -tags: TAGS - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique - -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = ../.. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - -distdir: $(DISTFILES) - $(mkinstalldirs) $(distdir)/../../autotools - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LTLIBRARIES) $(HEADERS) - -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-libtool distclean-tags - -dvi: dvi-am - -dvi-am: - -info: info-am - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am info info-am install \ - install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ - pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am - - -.c.o: - @echo "Building $@" -@am__fastdepCC_TRUE@ @if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ @source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - -.c.obj: - @echo "Building $@" -@am__fastdepCC_TRUE@ @if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ @source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - -.c.lo: - @echo "Building $@" -@am__fastdepCC_TRUE@ @if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ @source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - -install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(pkglibdir) - @list='ls .libs/*.so'; for p in $$list; do \ - if test -f $$p; then \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(pkglibdir)/$$f"; \ - $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(pkglibdir)/$$f; \ - else :; fi; \ - done -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/src/libltdl/README b/src/libltdl/README deleted file mode 100644 index e57b99f2..00000000 --- a/src/libltdl/README +++ /dev/null @@ -1,9 +0,0 @@ -This is GNU libltdl, a system independent dlopen wrapper for GNU libtool. - -It supports the following dlopen interfaces: -* dlopen (Solaris, Linux and various BSD flavors) -* shl_load (HP-UX) -* LoadLibrary (Win16 and Win32) -* load_add_on (BeOS) -* GNU DLD (emulates dynamic linking for static libraries) -* libtool's dlpreopen diff --git a/src/libltdl/ltdl.c b/src/libltdl/ltdl.c deleted file mode 100644 index 820bd307..00000000 --- a/src/libltdl/ltdl.c +++ /dev/null @@ -1,3999 +0,0 @@ -/* ltdl.c -- system independent dlopen wrapper - Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. - Originally by Thomas Tanner - This file is part of GNU Libtool. - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser 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 Lesser General Public License, -if you distribute this file as part of a program or library that -is built using GNU libtool, you may include it under the same -distribution terms that you use for the rest of that program. - -This library 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 -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA - -*/ - -#if HAVE_CONFIG_H -# include -#endif - -#if HAVE_UNISTD_H -# include -#endif - -#if HAVE_STDIO_H -# include -#endif - -#if HAVE_STDLIB_H -# include -#endif - -#if HAVE_STRING_H -# include -#else -# if HAVE_STRINGS_H -# include -# endif -#endif - -#if HAVE_CTYPE_H -# include -#endif - -#if HAVE_MALLOC_H -# include -#endif - -#if HAVE_MEMORY_H -# include -#endif - -#if HAVE_ERRNO_H -# include -#endif - -#if HAVE_DIRENT_H -# include -# define LT_D_NAMLEN(dirent) (strlen((dirent)->d_name)) -#else -# define dirent direct -# define LT_D_NAMLEN(dirent) ((dirent)->d_namlen) -# if HAVE_SYS_NDIR_H -# include -# endif -# if HAVE_SYS_DIR_H -# include -# endif -# if HAVE_NDIR_H -# include -# endif -#endif - -#if HAVE_ARGZ_H -# include -#endif - -#if HAVE_ASSERT_H -# include -#else -# define assert(arg) ((void) 0) -#endif - -#include "ltdl.h" - -#if WITH_DMALLOC -# include -#endif - - - - -/* --- WINDOWS SUPPORT --- */ - - -#ifdef DLL_EXPORT -# define LT_GLOBAL_DATA __declspec(dllexport) -#else -# define LT_GLOBAL_DATA -#endif - -/* fopen() mode flags for reading a text file */ -#undef LT_READTEXT_MODE -#ifdef __WINDOWS__ -# define LT_READTEXT_MODE "rt" -#else -# define LT_READTEXT_MODE "r" -#endif - - - - -/* --- MANIFEST CONSTANTS --- */ - - -/* Standard libltdl search path environment variable name */ -#undef LTDL_SEARCHPATH_VAR -#define LTDL_SEARCHPATH_VAR "LTDL_LIBRARY_PATH" - -/* Standard libtool archive file extension. */ -#undef LTDL_ARCHIVE_EXT -#define LTDL_ARCHIVE_EXT ".la" - -/* max. filename length */ -#ifndef LT_FILENAME_MAX -# define LT_FILENAME_MAX 1024 -#endif - -/* This is the maximum symbol size that won't require malloc/free */ -#undef LT_SYMBOL_LENGTH -#define LT_SYMBOL_LENGTH 128 - -/* This accounts for the _LTX_ separator */ -#undef LT_SYMBOL_OVERHEAD -#define LT_SYMBOL_OVERHEAD 5 - - - - -/* --- MEMORY HANDLING --- */ - - -/* These are the functions used internally. In addition to making - use of the associated function pointers above, they also perform - error handling. */ -static char *lt_estrdup LT_PARAMS((const char *str)); -static lt_ptr lt_emalloc LT_PARAMS((size_t size)); -static lt_ptr lt_erealloc LT_PARAMS((lt_ptr addr, size_t size)); - -static lt_ptr rpl_realloc LT_PARAMS((lt_ptr ptr, size_t size)); - -/* These are the pointers that can be changed by the caller: */ -LT_GLOBAL_DATA lt_ptr (*lt_dlmalloc) LT_PARAMS((size_t size)) - = (lt_ptr (*) LT_PARAMS((size_t))) malloc; -LT_GLOBAL_DATA lt_ptr (*lt_dlrealloc) LT_PARAMS((lt_ptr ptr, size_t size)) - = (lt_ptr (*) LT_PARAMS((lt_ptr, size_t))) rpl_realloc; -LT_GLOBAL_DATA void (*lt_dlfree) LT_PARAMS((lt_ptr ptr)) - = (void (*) LT_PARAMS((lt_ptr))) free; - -/* The following macros reduce the amount of typing needed to cast - assigned memory. */ -#if WITH_DMALLOC - -#define LT_DLMALLOC(tp, n) ((tp *) xmalloc ((n) * sizeof(tp))) -#define LT_DLREALLOC(tp, p, n) ((tp *) xrealloc ((p), (n) * sizeof(tp))) -#define LT_DLFREE(p) \ - LT_STMT_START { if (p) (p) = (xfree (p), (lt_ptr) 0); } LT_STMT_END - -#define LT_EMALLOC(tp, n) ((tp *) xmalloc ((n) * sizeof(tp))) -#define LT_EREALLOC(tp, p, n) ((tp *) xrealloc ((p), (n) * sizeof(tp))) - -#else - -#define LT_DLMALLOC(tp, n) ((tp *) lt_dlmalloc ((n) * sizeof(tp))) -#define LT_DLREALLOC(tp, p, n) ((tp *) rpl_realloc ((p), (n) * sizeof(tp))) -#define LT_DLFREE(p) \ - LT_STMT_START { if (p) (p) = (lt_dlfree (p), (lt_ptr) 0); } LT_STMT_END - -#define LT_EMALLOC(tp, n) ((tp *) lt_emalloc ((n) * sizeof(tp))) -#define LT_EREALLOC(tp, p, n) ((tp *) lt_erealloc ((p), (n) * sizeof(tp))) - -#endif - -#define LT_DLMEM_REASSIGN(p, q) LT_STMT_START { \ - if ((p) != (q)) { if (p) lt_dlfree (p); (p) = (q); (q) = 0; } \ - } LT_STMT_END - - -/* --- REPLACEMENT FUNCTIONS --- */ - - -#undef strdup -#define strdup rpl_strdup - -static char *strdup LT_PARAMS((const char *str)); - -static char * -strdup(str) - const char *str; -{ - char *tmp = NULL; - - if (str) - { - tmp = LT_DLMALLOC (char, 1+ strlen (str)); - if (tmp) - { - strcpy(tmp, str); - } - } - - return tmp; -} - - -#if ! HAVE_STRCMP - -#undef strcmp -#define strcmp rpl_strcmp - -static int strcmp LT_PARAMS((const char *str1, const char *str2)); - -static int -strcmp (str1, str2) - const char *str1; - const char *str2; -{ - if (str1 == str2) - return 0; - if (str1 == NULL) - return -1; - if (str2 == NULL) - return 1; - - for (;*str1 && *str2; ++str1, ++str2) - { - if (*str1 != *str2) - break; - } - - return (int)(*str1 - *str2); -} -#endif - - -#if ! HAVE_STRCHR - -# if HAVE_INDEX -# define strchr index -# else -# define strchr rpl_strchr - -static const char *strchr LT_PARAMS((const char *str, int ch)); - -static const char* -strchr(str, ch) - const char *str; - int ch; -{ - const char *p; - - for (p = str; *p != (char)ch && *p != LT_EOS_CHAR; ++p) - /*NOWORK*/; - - return (*p == (char)ch) ? p : 0; -} - -# endif -#endif /* !HAVE_STRCHR */ - - -#if ! HAVE_STRRCHR - -# if HAVE_RINDEX -# define strrchr rindex -# else -# define strrchr rpl_strrchr - -static const char *strrchr LT_PARAMS((const char *str, int ch)); - -static const char* -strrchr(str, ch) - const char *str; - int ch; -{ - const char *p, *q = NULL; - - for (p = str; *p != LT_EOS_CHAR; ++p) - { - if (*p == (char) ch) - { - q = p; - } - } - - return q; -} - -# endif -#endif - -/* NOTE: Neither bcopy nor the memcpy implementation below can - reliably handle copying in overlapping areas of memory. Use - memmove (for which there is a fallback implmentation below) - if you need that behaviour. */ -#if ! HAVE_MEMCPY - -# if HAVE_BCOPY -# define memcpy(dest, src, size) bcopy (src, dest, size) -# else -# define memcpy rpl_memcpy - -static lt_ptr memcpy LT_PARAMS((lt_ptr dest, const lt_ptr src, size_t size)); - -static lt_ptr -memcpy (dest, src, size) - lt_ptr dest; - const lt_ptr src; - size_t size; -{ - size_t i = 0; - - for (i = 0; i < size; ++i) - { - dest[i] = src[i]; - } - - return dest; -} - -# endif /* !HAVE_BCOPY */ -#endif /* !HAVE_MEMCPY */ - -#if ! HAVE_MEMMOVE -# define memmove rpl_memmove - -static lt_ptr memmove LT_PARAMS((lt_ptr dest, const lt_ptr src, size_t size)); - -static lt_ptr -memmove (dest, src, size) - lt_ptr dest; - const lt_ptr src; - size_t size; -{ - size_t i; - - if (dest < src) - for (i = 0; i < size; ++i) - { - dest[i] = src[i]; - } - else if (dest > src) - for (i = size -1; i >= 0; --i) - { - dest[i] = src[i]; - } - - return dest; -} - -#endif /* !HAVE_MEMMOVE */ - - -/* According to Alexandre Oliva , - ``realloc is not entirely portable'' - In any case we want to use the allocator supplied by the user without - burdening them with an lt_dlrealloc function pointer to maintain. - Instead implement our own version (with known boundary conditions) - using lt_dlmalloc and lt_dlfree. */ - -#undef realloc -#define realloc rpl_realloc - -static lt_ptr -realloc (ptr, size) - lt_ptr ptr; - size_t size; -{ - if (size == 0) - { - /* For zero or less bytes, free the original memory */ - if (ptr != NULL) - { - lt_dlfree (ptr); - } - - return (lt_ptr) 0; - } - else if (ptr == NULL) - { - /* Allow reallocation of a NULL pointer. */ - return lt_dlmalloc (size); - } - else - { - /* Allocate a new block, copy and free the old block. */ - lt_ptr mem = lt_dlmalloc (size); - - if (mem) - { - memcpy (mem, ptr, size); - lt_dlfree (ptr); - } - - /* Note that the contents of PTR are not damaged if there is - insufficient memory to realloc. */ - return mem; - } -} - - -#if ! HAVE_ARGZ_APPEND -# define argz_append rpl_argz_append - -static error_t argz_append LT_PARAMS((char **pargz, size_t *pargz_len, - const char *buf, size_t buf_len)); - -static error_t -argz_append (pargz, pargz_len, buf, buf_len) - char **pargz; - size_t *pargz_len; - const char *buf; - size_t buf_len; -{ - size_t argz_len; - char *argz; - - assert (pargz); - assert (pargz_len); - assert ((*pargz && *pargz_len) || (!*pargz && !*pargz_len)); - - /* If nothing needs to be appended, no more work is required. */ - if (buf_len == 0) - return 0; - - /* Ensure there is enough room to append BUF_LEN. */ - argz_len = *pargz_len + buf_len; - argz = LT_DLREALLOC (char, *pargz, argz_len); - if (!argz) - return ENOMEM; - - /* Copy characters from BUF after terminating '\0' in ARGZ. */ - memcpy (argz + *pargz_len, buf, buf_len); - - /* Assign new values. */ - *pargz = argz; - *pargz_len = argz_len; - - return 0; -} -#endif /* !HAVE_ARGZ_APPEND */ - - -#if ! HAVE_ARGZ_CREATE_SEP -# define argz_create_sep rpl_argz_create_sep - -static error_t argz_create_sep LT_PARAMS((const char *str, int delim, - char **pargz, size_t *pargz_len)); - -static error_t -argz_create_sep (str, delim, pargz, pargz_len) - const char *str; - int delim; - char **pargz; - size_t *pargz_len; -{ - size_t argz_len; - char *argz = NULL; - - assert (str); - assert (pargz); - assert (pargz_len); - - /* Make a copy of STR, but replacing each occurence of - DELIM with '\0'. */ - argz_len = 1+ LT_STRLEN (str); - if (argz_len) - { - const char *p; - char *q; - - argz = LT_DLMALLOC (char, argz_len); - if (!argz) - return ENOMEM; - - for (p = str, q = argz; *p != LT_EOS_CHAR; ++p) - { - if (*p == delim) - { - /* Ignore leading delimiters, and fold consecutive - delimiters in STR into a single '\0' in ARGZ. */ - if ((q > argz) && (q[-1] != LT_EOS_CHAR)) - *q++ = LT_EOS_CHAR; - else - --argz_len; - } - else - *q++ = *p; - } - /* Copy terminating LT_EOS_CHAR. */ - *q = *p; - } - - /* If ARGZ_LEN has shrunk to nothing, release ARGZ's memory. */ - if (!argz_len) - LT_DLFREE (argz); - - /* Assign new values. */ - *pargz = argz; - *pargz_len = argz_len; - - return 0; -} -#endif /* !HAVE_ARGZ_CREATE_SEP */ - - -#if ! HAVE_ARGZ_INSERT -# define argz_insert rpl_argz_insert - -static error_t argz_insert LT_PARAMS((char **pargz, size_t *pargz_len, - char *before, const char *entry)); - -static error_t -argz_insert (pargz, pargz_len, before, entry) - char **pargz; - size_t *pargz_len; - char *before; - const char *entry; -{ - assert (pargz); - assert (pargz_len); - assert (entry && *entry); - - /* No BEFORE address indicates ENTRY should be inserted after the - current last element. */ - if (!before) - return argz_append (pargz, pargz_len, entry, 1+ LT_STRLEN (entry)); - - /* This probably indicates a programmer error, but to preserve - semantics, scan back to the start of an entry if BEFORE points - into the middle of it. */ - while ((before >= *pargz) && (before[-1] != LT_EOS_CHAR)) - --before; - - { - size_t entry_len = 1+ LT_STRLEN (entry); - size_t argz_len = *pargz_len + entry_len; - size_t offset = before - *pargz; - char *argz = LT_DLREALLOC (char, *pargz, argz_len); - - if (!argz) - return ENOMEM; - - /* Make BEFORE point to the equivalent offset in ARGZ that it - used to have in *PARGZ incase realloc() moved the block. */ - before = argz + offset; - - /* Move the ARGZ entries starting at BEFORE up into the new - space at the end -- making room to copy ENTRY into the - resulting gap. */ - memmove (before + entry_len, before, *pargz_len - offset); - memcpy (before, entry, entry_len); - - /* Assign new values. */ - *pargz = argz; - *pargz_len = argz_len; - } - - return 0; -} -#endif /* !HAVE_ARGZ_INSERT */ - - -#if ! HAVE_ARGZ_NEXT -# define argz_next rpl_argz_next - -static char *argz_next LT_PARAMS((char *argz, size_t argz_len, - const char *entry)); - -static char * -argz_next (argz, argz_len, entry) - char *argz; - size_t argz_len; - const char *entry; -{ - assert ((argz && argz_len) || (!argz && !argz_len)); - - if (entry) - { - /* Either ARGZ/ARGZ_LEN is empty, or ENTRY points into an address - within the ARGZ vector. */ - assert ((!argz && !argz_len) - || ((argz <= entry) && (entry < (argz + argz_len)))); - - /* Move to the char immediately after the terminating - '\0' of ENTRY. */ - entry = 1+ strchr (entry, LT_EOS_CHAR); - - /* Return either the new ENTRY, or else NULL if ARGZ is - exhausted. */ - return (entry >= argz + argz_len) ? 0 : (char *) entry; - } - else - { - /* This should probably be flagged as a programmer error, - since starting an argz_next loop with the iterator set - to ARGZ is safer. To preserve semantics, handle the NULL - case by returning the start of ARGZ (if any). */ - if (argz_len > 0) - return argz; - else - return 0; - } -} -#endif /* !HAVE_ARGZ_NEXT */ - - - -#if ! HAVE_ARGZ_STRINGIFY -# define argz_stringify rpl_argz_stringify - -static void argz_stringify LT_PARAMS((char *argz, size_t argz_len, - int sep)); - -static void -argz_stringify (argz, argz_len, sep) - char *argz; - size_t argz_len; - int sep; -{ - assert ((argz && argz_len) || (!argz && !argz_len)); - - if (sep) - { - --argz_len; /* don't stringify the terminating EOS */ - while (--argz_len > 0) - { - if (argz[argz_len] == LT_EOS_CHAR) - argz[argz_len] = sep; - } - } -} -#endif /* !HAVE_ARGZ_STRINGIFY */ - - - - -/* --- TYPE DEFINITIONS -- */ - - -/* This type is used for the array of caller data sets in each handler. */ -typedef struct { - lt_dlcaller_id key; - lt_ptr data; -} lt_caller_data; - - - - -/* --- OPAQUE STRUCTURES DECLARED IN LTDL.H --- */ - - -/* Extract the diagnostic strings from the error table macro in the same - order as the enumerated indices in ltdl.h. */ - -static const char *lt_dlerror_strings[] = - { -#define LT_ERROR(name, diagnostic) (diagnostic), - lt_dlerror_table -#undef LT_ERROR - - 0 - }; - -/* This structure is used for the list of registered loaders. */ -struct lt_dlloader { - struct lt_dlloader *next; - const char *loader_name; /* identifying name for each loader */ - const char *sym_prefix; /* prefix for symbols */ - lt_module_open *module_open; - lt_module_close *module_close; - lt_find_sym *find_sym; - lt_dlloader_exit *dlloader_exit; - lt_user_data dlloader_data; -}; - -struct lt_dlhandle_struct { - struct lt_dlhandle_struct *next; - lt_dlloader *loader; /* dlopening interface */ - lt_dlinfo info; - int depcount; /* number of dependencies */ - lt_dlhandle *deplibs; /* dependencies */ - lt_module module; /* system module handle */ - lt_ptr system; /* system specific data */ - lt_caller_data *caller_data; /* per caller associated data */ - int flags; /* various boolean stats */ -}; - -/* Various boolean flags can be stored in the flags field of an - lt_dlhandle_struct... */ -#define LT_DLGET_FLAG(handle, flag) (((handle)->flags & (flag)) == (flag)) -#define LT_DLSET_FLAG(handle, flag) ((handle)->flags |= (flag)) - -#define LT_DLRESIDENT_FLAG (0x01 << 0) -/* ...add more flags here... */ - -#define LT_DLIS_RESIDENT(handle) LT_DLGET_FLAG(handle, LT_DLRESIDENT_FLAG) - - -#define LT_DLSTRERROR(name) lt_dlerror_strings[LT_CONC(LT_ERROR_,name)] - -static const char objdir[] = LTDL_OBJDIR; -static const char archive_ext[] = LTDL_ARCHIVE_EXT; -#ifdef LTDL_SHLIB_EXT -static const char shlib_ext[] = LTDL_SHLIB_EXT; -#endif -#ifdef LTDL_SYSSEARCHPATH -static const char sys_search_path[] = LTDL_SYSSEARCHPATH; -#endif - - - - -/* --- MUTEX LOCKING --- */ - - -/* Macros to make it easier to run the lock functions only if they have - been registered. The reason for the complicated lock macro is to - ensure that the stored error message from the last error is not - accidentally erased if the current function doesn't generate an - error of its own. */ -#define LT_DLMUTEX_LOCK() LT_STMT_START { \ - if (lt_dlmutex_lock_func) (*lt_dlmutex_lock_func)(); \ - } LT_STMT_END -#define LT_DLMUTEX_UNLOCK() LT_STMT_START { \ - if (lt_dlmutex_unlock_func) (*lt_dlmutex_unlock_func)();\ - } LT_STMT_END -#define LT_DLMUTEX_SETERROR(errormsg) LT_STMT_START { \ - if (lt_dlmutex_seterror_func) \ - (*lt_dlmutex_seterror_func) (errormsg); \ - else lt_dllast_error = (errormsg); } LT_STMT_END -#define LT_DLMUTEX_GETERROR(errormsg) LT_STMT_START { \ - if (lt_dlmutex_seterror_func) \ - (errormsg) = (*lt_dlmutex_geterror_func) (); \ - else (errormsg) = lt_dllast_error; } LT_STMT_END - -/* The mutex functions stored here are global, and are necessarily the - same for all threads that wish to share access to libltdl. */ -static lt_dlmutex_lock *lt_dlmutex_lock_func = NULL; -static lt_dlmutex_unlock *lt_dlmutex_unlock_func = NULL; -static lt_dlmutex_seterror *lt_dlmutex_seterror_func = NULL; -static lt_dlmutex_geterror *lt_dlmutex_geterror_func = NULL; -static const char *lt_dllast_error = NULL; - - -/* Either set or reset the mutex functions. Either all the arguments must - be valid functions, or else all can be NULL to turn off locking entirely. - The registered functions should be manipulating a static global lock - from the lock() and unlock() callbacks, which needs to be reentrant. */ -int -lt_dlmutex_register (lock, unlock, seterror, geterror) - lt_dlmutex_lock *lock; - lt_dlmutex_unlock *unlock; - lt_dlmutex_seterror *seterror; - lt_dlmutex_geterror *geterror; -{ - lt_dlmutex_unlock *old_unlock = unlock; - int errors = 0; - - /* Lock using the old lock() callback, if any. */ - LT_DLMUTEX_LOCK (); - - if ((lock && unlock && seterror && geterror) - || !(lock || unlock || seterror || geterror)) - { - lt_dlmutex_lock_func = lock; - lt_dlmutex_unlock_func = unlock; - lt_dlmutex_geterror_func = geterror; - } - else - { - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_MUTEX_ARGS)); - ++errors; - } - - /* Use the old unlock() callback we saved earlier, if any. Otherwise - record any errors using internal storage. */ - if (old_unlock) - (*old_unlock) (); - - /* Return the number of errors encountered during the execution of - this function. */ - return errors; -} - - - - -/* --- ERROR HANDLING --- */ - - -static const char **user_error_strings = NULL; -static int errorcount = LT_ERROR_MAX; - -int -lt_dladderror (diagnostic) - const char *diagnostic; -{ - int errindex = 0; - int result = -1; - const char **temp = NULL; - - assert (diagnostic); - - LT_DLMUTEX_LOCK (); - - errindex = errorcount - LT_ERROR_MAX; - temp = LT_EREALLOC (const char *, user_error_strings, 1 + errindex); - if (temp) - { - user_error_strings = temp; - user_error_strings[errindex] = diagnostic; - result = errorcount++; - } - - LT_DLMUTEX_UNLOCK (); - - return result; -} - -int -lt_dlseterror (errindex) - int errindex; -{ - int errors = 0; - - LT_DLMUTEX_LOCK (); - - if (errindex >= errorcount || errindex < 0) - { - /* Ack! Error setting the error message! */ - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_ERRORCODE)); - ++errors; - } - else if (errindex < LT_ERROR_MAX) - { - /* No error setting the error message! */ - LT_DLMUTEX_SETERROR (lt_dlerror_strings[errindex]); - } - else - { - /* No error setting the error message! */ - LT_DLMUTEX_SETERROR (user_error_strings[errindex - LT_ERROR_MAX]); - } - - LT_DLMUTEX_UNLOCK (); - - return errors; -} - -static lt_ptr -lt_emalloc (size) - size_t size; -{ - lt_ptr mem = lt_dlmalloc (size); - if (size && !mem) - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (NO_MEMORY)); - return mem; -} - -static lt_ptr -lt_erealloc (addr, size) - lt_ptr addr; - size_t size; -{ - lt_ptr mem = realloc (addr, size); - if (size && !mem) - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (NO_MEMORY)); - return mem; -} - -static char * -lt_estrdup (str) - const char *str; -{ - char *copy = strdup (str); - if (LT_STRLEN (str) && !copy) - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (NO_MEMORY)); - return copy; -} - - - - -/* --- DLOPEN() INTERFACE LOADER --- */ - - -/* The Cygwin dlopen implementation prints a spurious error message to - stderr if its call to LoadLibrary() fails for any reason. We can - mitigate this by not using the Cygwin implementation, and falling - back to our own LoadLibrary() wrapper. */ -#if HAVE_LIBDL && !defined(__CYGWIN__) - -/* dynamic linking with dlopen/dlsym */ - -#if HAVE_DLFCN_H -# include -#endif - -#if HAVE_SYS_DL_H -# include -#endif - -#ifdef RTLD_GLOBAL -# define LT_GLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_GLOBAL DL_GLOBAL -# endif -#endif /* !RTLD_GLOBAL */ -#ifndef LT_GLOBAL -# define LT_GLOBAL 0 -#endif /* !LT_GLOBAL */ - -/* We may have to define LT_LAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_LAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_LAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_LAZY_OR_NOW DL_LAZY -# endif -# endif /* !RTLD_LAZY */ -#endif -#ifndef LT_LAZY_OR_NOW -# ifdef RTLD_NOW -# define LT_LAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_LAZY_OR_NOW DL_NOW -# endif -# endif /* !RTLD_NOW */ -#endif -#ifndef LT_LAZY_OR_NOW -# define LT_LAZY_OR_NOW 0 -#endif /* !LT_LAZY_OR_NOW */ - -#if HAVE_DLERROR -# define DLERROR(arg) dlerror () -#else -# define DLERROR(arg) LT_DLSTRERROR (arg) -#endif - -static lt_module -sys_dl_open (loader_data, filename) - lt_user_data loader_data; - const char *filename; -{ - lt_module module = dlopen (filename, LT_GLOBAL | LT_LAZY_OR_NOW); - - if (!module) - { - LT_DLMUTEX_SETERROR (DLERROR (CANNOT_OPEN)); - } - - return module; -} - -static int -sys_dl_close (loader_data, module) - lt_user_data loader_data; - lt_module module; -{ - int errors = 0; - - if (dlclose (module) != 0) - { - LT_DLMUTEX_SETERROR (DLERROR (CANNOT_CLOSE)); - ++errors; - } - - return errors; -} - -static lt_ptr -sys_dl_sym (loader_data, module, symbol) - lt_user_data loader_data; - lt_module module; - const char *symbol; -{ - lt_ptr address = dlsym (module, symbol); - - if (!address) - { - LT_DLMUTEX_SETERROR (DLERROR (SYMBOL_NOT_FOUND)); - } - - return address; -} - -static struct lt_user_dlloader sys_dl = - { -# ifdef NEED_USCORE - "_", -# else - 0, -# endif - sys_dl_open, sys_dl_close, sys_dl_sym, 0, 0 }; - - -#endif /* HAVE_LIBDL */ - - - -/* --- SHL_LOAD() INTERFACE LOADER --- */ - -#if HAVE_SHL_LOAD - -/* dynamic linking with shl_load (HP-UX) (comments from gmodule) */ - -#ifdef HAVE_DL_H -# include -#endif - -/* some flags are missing on some systems, so we provide - * harmless defaults. - * - * Mandatory: - * BIND_IMMEDIATE - Resolve symbol references when the library is loaded. - * BIND_DEFERRED - Delay code symbol resolution until actual reference. - * - * Optionally: - * BIND_FIRST - Place the library at the head of the symbol search - * order. - * BIND_NONFATAL - The default BIND_IMMEDIATE behavior is to treat all - * unsatisfied symbols as fatal. This flag allows - * binding of unsatisfied code symbols to be deferred - * until use. - * [Perl: For certain libraries, like DCE, deferred - * binding often causes run time problems. Adding - * BIND_NONFATAL to BIND_IMMEDIATE still allows - * unresolved references in situations like this.] - * BIND_NOSTART - Do not call the initializer for the shared library - * when the library is loaded, nor on a future call to - * shl_unload(). - * BIND_VERBOSE - Print verbose messages concerning possible - * unsatisfied symbols. - * - * hp9000s700/hp9000s800: - * BIND_RESTRICTED - Restrict symbols visible by the library to those - * present at library load time. - * DYNAMIC_PATH - Allow the loader to dynamically search for the - * library specified by the path argument. - */ - -#ifndef DYNAMIC_PATH -# define DYNAMIC_PATH 0 -#endif -#ifndef BIND_RESTRICTED -# define BIND_RESTRICTED 0 -#endif - -#define LT_BIND_FLAGS (BIND_IMMEDIATE | BIND_NONFATAL | DYNAMIC_PATH) - -static lt_module -sys_shl_open (loader_data, filename) - lt_user_data loader_data; - const char *filename; -{ - static shl_t self = (shl_t) 0; - lt_module module = shl_load (filename, LT_BIND_FLAGS, 0L); - - /* Since searching for a symbol against a NULL module handle will also - look in everything else that was already loaded and exported with - the -E compiler flag, we always cache a handle saved before any - modules are loaded. */ - if (!self) - { - lt_ptr address; - shl_findsym (&self, "main", TYPE_UNDEFINED, &address); - } - - if (!filename) - { - module = self; - } - else - { - module = shl_load (filename, LT_BIND_FLAGS, 0L); - - if (!module) - { - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CANNOT_OPEN)); - } - } - - return module; -} - -static int -sys_shl_close (loader_data, module) - lt_user_data loader_data; - lt_module module; -{ - int errors = 0; - - if (module && (shl_unload ((shl_t) (module)) != 0)) - { - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CANNOT_CLOSE)); - ++errors; - } - - return errors; -} - -static lt_ptr -sys_shl_sym (loader_data, module, symbol) - lt_user_data loader_data; - lt_module module; - const char *symbol; -{ - lt_ptr address = NULL; - - /* sys_shl_open should never return a NULL module handle */ - if (module == (lt_module) 0) - { - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_HANDLE)); - } - else if (!shl_findsym((shl_t*) &module, symbol, TYPE_UNDEFINED, &address)) - { - if (!address) - { - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (SYMBOL_NOT_FOUND)); - } - } - - return address; -} - -static struct lt_user_dlloader sys_shl = { - 0, sys_shl_open, sys_shl_close, sys_shl_sym, 0, 0 -}; - -#endif /* HAVE_SHL_LOAD */ - - - - -/* --- LOADLIBRARY() INTERFACE LOADER --- */ - -#ifdef __WINDOWS__ - -/* dynamic linking for Win32 */ - -#include - -/* Forward declaration; required to implement handle search below. */ -static lt_dlhandle handles; - -static lt_module -sys_wll_open (loader_data, filename) - lt_user_data loader_data; - const char *filename; -{ - lt_dlhandle cur; - lt_module module = NULL; - const char *errormsg = NULL; - char *searchname = NULL; - char *ext; - char self_name_buf[MAX_PATH]; - - if (!filename) - { - /* Get the name of main module */ - *self_name_buf = '\0'; - GetModuleFileName (NULL, self_name_buf, sizeof (self_name_buf)); - filename = ext = self_name_buf; - } - else - { - ext = strrchr (filename, '.'); - } - - if (ext) - { - /* FILENAME already has an extension. */ - searchname = lt_estrdup (filename); - } - else - { - /* Append a `.' to stop Windows from adding an - implicit `.dll' extension. */ - searchname = LT_EMALLOC (char, 2+ LT_STRLEN (filename)); - if (searchname) - sprintf (searchname, "%s.", filename); - } - if (!searchname) - return 0; - -#if __CYGWIN__ - { - char wpath[MAX_PATH]; - cygwin_conv_to_full_win32_path(searchname, wpath); - module = LoadLibrary(wpath); - } -#else - module = LoadLibrary (searchname); -#endif - LT_DLFREE (searchname); - - /* libltdl expects this function to fail if it is unable - to physically load the library. Sadly, LoadLibrary - will search the loaded libraries for a match and return - one of them if the path search load fails. - - We check whether LoadLibrary is returning a handle to - an already loaded module, and simulate failure if we - find one. */ - LT_DLMUTEX_LOCK (); - cur = handles; - while (cur) - { - if (!cur->module) - { - cur = NULL; - break; - } - - if (cur->module == module) - { - break; - } - - cur = cur->next; - } - LT_DLMUTEX_UNLOCK (); - - if (cur || !module) - { - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CANNOT_OPEN)); - module = NULL; - } - - return module; -} - -static int -sys_wll_close (loader_data, module) - lt_user_data loader_data; - lt_module module; -{ - int errors = 0; - - if (FreeLibrary(module) == 0) - { - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CANNOT_CLOSE)); - ++errors; - } - - return errors; -} - -static lt_ptr -sys_wll_sym (loader_data, module, symbol) - lt_user_data loader_data; - lt_module module; - const char *symbol; -{ - lt_ptr address = GetProcAddress (module, symbol); - - if (!address) - { - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (SYMBOL_NOT_FOUND)); - } - - return address; -} - -static struct lt_user_dlloader sys_wll = { - 0, sys_wll_open, sys_wll_close, sys_wll_sym, 0, 0 -}; - -#endif /* __WINDOWS__ */ - - - - -/* --- LOAD_ADD_ON() INTERFACE LOADER --- */ - - -#ifdef __BEOS__ - -/* dynamic linking for BeOS */ - -#include - -static lt_module -sys_bedl_open (loader_data, filename) - lt_user_data loader_data; - const char *filename; -{ - image_id image = 0; - - if (filename) - { - image = load_add_on (filename); - } - else - { - image_info info; - int32 cookie = 0; - if (get_next_image_info (0, &cookie, &info) == B_OK) - image = load_add_on (info.name); - } - - if (image <= 0) - { - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CANNOT_OPEN)); - image = 0; - } - - return (lt_module) image; -} - -static int -sys_bedl_close (loader_data, module) - lt_user_data loader_data; - lt_module module; -{ - int errors = 0; - - if (unload_add_on ((image_id) module) != B_OK) - { - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CANNOT_CLOSE)); - ++errors; - } - - return errors; -} - -static lt_ptr -sys_bedl_sym (loader_data, module, symbol) - lt_user_data loader_data; - lt_module module; - const char *symbol; -{ - lt_ptr address = NULL; - image_id image = (image_id) module; - - if (get_image_symbol (image, symbol, B_SYMBOL_TYPE_ANY, address) != B_OK) - { - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (SYMBOL_NOT_FOUND)); - address = NULL; - } - - return address; -} - -static struct lt_user_dlloader sys_bedl = { - 0, sys_bedl_open, sys_bedl_close, sys_bedl_sym, 0, 0 -}; - -#endif /* __BEOS__ */ - - - - -/* --- DLD_LINK() INTERFACE LOADER --- */ - - -#if HAVE_DLD - -/* dynamic linking with dld */ - -#if HAVE_DLD_H -#include -#endif - -static lt_module -sys_dld_open (loader_data, filename) - lt_user_data loader_data; - const char *filename; -{ - lt_module module = strdup (filename); - - if (dld_link (filename) != 0) - { - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CANNOT_OPEN)); - LT_DLFREE (module); - module = NULL; - } - - return module; -} - -static int -sys_dld_close (loader_data, module) - lt_user_data loader_data; - lt_module module; -{ - int errors = 0; - - if (dld_unlink_by_file ((char*)(module), 1) != 0) - { - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CANNOT_CLOSE)); - ++errors; - } - else - { - LT_DLFREE (module); - } - - return errors; -} - -static lt_ptr -sys_dld_sym (loader_data, module, symbol) - lt_user_data loader_data; - lt_module module; - const char *symbol; -{ - lt_ptr address = dld_get_func (symbol); - - if (!address) - { - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (SYMBOL_NOT_FOUND)); - } - - return address; -} - -static struct lt_user_dlloader sys_dld = { - 0, sys_dld_open, sys_dld_close, sys_dld_sym, 0, 0 -}; - -#endif /* HAVE_DLD */ - - - - -/* --- DLPREOPEN() INTERFACE LOADER --- */ - - -/* emulate dynamic linking using preloaded_symbols */ - -typedef struct lt_dlsymlists_t -{ - struct lt_dlsymlists_t *next; - const lt_dlsymlist *syms; -} lt_dlsymlists_t; - -static const lt_dlsymlist *default_preloaded_symbols = NULL; -static lt_dlsymlists_t *preloaded_symbols = NULL; - -static int -presym_init (loader_data) - lt_user_data loader_data; -{ - int errors = 0; - - LT_DLMUTEX_LOCK (); - - preloaded_symbols = NULL; - if (default_preloaded_symbols) - { - errors = lt_dlpreload (default_preloaded_symbols); - } - - LT_DLMUTEX_UNLOCK (); - - return errors; -} - -static int -presym_free_symlists () -{ - lt_dlsymlists_t *lists; - - LT_DLMUTEX_LOCK (); - - lists = preloaded_symbols; - while (lists) - { - lt_dlsymlists_t *tmp = lists; - - lists = lists->next; - LT_DLFREE (tmp); - } - preloaded_symbols = NULL; - - LT_DLMUTEX_UNLOCK (); - - return 0; -} - -static int -presym_exit (loader_data) - lt_user_data loader_data; -{ - presym_free_symlists (); - return 0; -} - -static int -presym_add_symlist (preloaded) - const lt_dlsymlist *preloaded; -{ - lt_dlsymlists_t *tmp; - lt_dlsymlists_t *lists; - int errors = 0; - - LT_DLMUTEX_LOCK (); - - lists = preloaded_symbols; - while (lists) - { - if (lists->syms == preloaded) - { - goto done; - } - lists = lists->next; - } - - tmp = LT_EMALLOC (lt_dlsymlists_t, 1); - if (tmp) - { - memset (tmp, 0, sizeof(lt_dlsymlists_t)); - tmp->syms = preloaded; - tmp->next = preloaded_symbols; - preloaded_symbols = tmp; - } - else - { - ++errors; - } - - done: - LT_DLMUTEX_UNLOCK (); - return errors; -} - -static lt_module -presym_open (loader_data, filename) - lt_user_data loader_data; - const char *filename; -{ - lt_dlsymlists_t *lists; - lt_module module = (lt_module) 0; - - LT_DLMUTEX_LOCK (); - lists = preloaded_symbols; - - if (!lists) - { - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (NO_SYMBOLS)); - goto done; - } - - /* Can't use NULL as the reflective symbol header, as NULL is - used to mark the end of the entire symbol list. Self-dlpreopened - symbols follow this magic number, chosen to be an unlikely - clash with a real module name. */ - if (!filename) - { - filename = "@PROGRAM@"; - } - - while (lists) - { - const lt_dlsymlist *syms = lists->syms; - - while (syms->name) - { - if (!syms->address && strcmp(syms->name, filename) == 0) - { - module = (lt_module) syms; - goto done; - } - ++syms; - } - - lists = lists->next; - } - - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (FILE_NOT_FOUND)); - - done: - LT_DLMUTEX_UNLOCK (); - return module; -} - -static int -presym_close (loader_data, module) - lt_user_data loader_data; - lt_module module; -{ - /* Just to silence gcc -Wall */ - module = NULL; - return 0; -} - -static lt_ptr -presym_sym (loader_data, module, symbol) - lt_user_data loader_data; - lt_module module; - const char *symbol; -{ - lt_dlsymlist *syms = (lt_dlsymlist*) module; - - ++syms; - while (syms->address) - { - if (strcmp(syms->name, symbol) == 0) - { - return syms->address; - } - - ++syms; - } - - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (SYMBOL_NOT_FOUND)); - - return 0; -} - -static struct lt_user_dlloader presym = { - 0, presym_open, presym_close, presym_sym, presym_exit, 0 -}; - - - - - -/* --- DYNAMIC MODULE LOADING --- */ - - -/* The type of a function used at each iteration of foreach_dirinpath(). */ -typedef int foreach_callback_func LT_PARAMS((char *filename, lt_ptr data1, - lt_ptr data2)); - -static int foreach_dirinpath LT_PARAMS((const char *search_path, - const char *base_name, - foreach_callback_func *func, - lt_ptr data1, lt_ptr data2)); - -static int find_file_callback LT_PARAMS((char *filename, lt_ptr data, - lt_ptr ignored)); -static int find_handle_callback LT_PARAMS((char *filename, lt_ptr data, - lt_ptr ignored)); -static int foreachfile_callback LT_PARAMS((char *filename, lt_ptr data1, - lt_ptr data2)); - - -static int canonicalize_path LT_PARAMS((const char *path, - char **pcanonical)); -static int argzize_path LT_PARAMS((const char *path, - char **pargz, - size_t *pargz_len)); -static FILE *find_file LT_PARAMS((const char *search_path, - const char *base_name, - char **pdir)); -static lt_dlhandle *find_handle LT_PARAMS((const char *search_path, - const char *base_name, - lt_dlhandle *handle)); -static int find_module LT_PARAMS((lt_dlhandle *handle, - const char *dir, - const char *libdir, - const char *dlname, - const char *old_name, - int installed)); -static int free_vars LT_PARAMS((char *dlname, char *oldname, - char *libdir, char *deplibs)); -static int load_deplibs LT_PARAMS((lt_dlhandle handle, - char *deplibs)); -static int trim LT_PARAMS((char **dest, - const char *str)); -static int try_dlopen LT_PARAMS((lt_dlhandle *handle, - const char *filename)); -static int tryall_dlopen LT_PARAMS((lt_dlhandle *handle, - const char *filename)); -static int unload_deplibs LT_PARAMS((lt_dlhandle handle)); -static int lt_argz_insert LT_PARAMS((char **pargz, - size_t *pargz_len, - char *before, - const char *entry)); -static int lt_argz_insertinorder LT_PARAMS((char **pargz, - size_t *pargz_len, - const char *entry)); -static int lt_argz_insertdir LT_PARAMS((char **pargz, - size_t *pargz_len, - const char *dirnam, - struct dirent *dp)); -static int lt_dlpath_insertdir LT_PARAMS((char **ppath, - char *before, - const char *dir)); -static int list_files_by_dir LT_PARAMS((const char *dirnam, - char **pargz, - size_t *pargz_len)); -static int file_not_found LT_PARAMS((void)); - -static char *user_search_path= NULL; -static lt_dlloader *loaders = NULL; -static lt_dlhandle handles = NULL; -static int initialized = 0; - -/* Initialize libltdl. */ -int -lt_dlinit () -{ - int errors = 0; - - LT_DLMUTEX_LOCK (); - - /* Initialize only at first call. */ - if (++initialized == 1) - { - handles = NULL; - user_search_path = NULL; /* empty search path */ - -#if HAVE_LIBDL && !defined(__CYGWIN__) - errors += lt_dlloader_add (lt_dlloader_next (0), &sys_dl, "dlopen"); -#endif -#if HAVE_SHL_LOAD - errors += lt_dlloader_add (lt_dlloader_next (0), &sys_shl, "dlopen"); -#endif -#ifdef __WINDOWS__ - errors += lt_dlloader_add (lt_dlloader_next (0), &sys_wll, "dlopen"); -#endif -#ifdef __BEOS__ - errors += lt_dlloader_add (lt_dlloader_next (0), &sys_bedl, "dlopen"); -#endif -#if HAVE_DLD - errors += lt_dlloader_add (lt_dlloader_next (0), &sys_dld, "dld"); -#endif - errors += lt_dlloader_add (lt_dlloader_next (0), &presym, "dlpreload"); - - if (presym_init (presym.dlloader_data)) - { - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INIT_LOADER)); - ++errors; - } - else if (errors != 0) - { - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (DLOPEN_NOT_SUPPORTED)); - ++errors; - } - } - - LT_DLMUTEX_UNLOCK (); - - return errors; -} - -int -lt_dlpreload (preloaded) - const lt_dlsymlist *preloaded; -{ - int errors = 0; - - if (preloaded) - { - errors = presym_add_symlist (preloaded); - } - else - { - presym_free_symlists(); - - LT_DLMUTEX_LOCK (); - if (default_preloaded_symbols) - { - errors = lt_dlpreload (default_preloaded_symbols); - } - LT_DLMUTEX_UNLOCK (); - } - - return errors; -} - -int -lt_dlpreload_default (preloaded) - const lt_dlsymlist *preloaded; -{ - LT_DLMUTEX_LOCK (); - default_preloaded_symbols = preloaded; - LT_DLMUTEX_UNLOCK (); - return 0; -} - -int -lt_dlexit () -{ - /* shut down libltdl */ - lt_dlloader *loader; - int errors = 0; - - LT_DLMUTEX_LOCK (); - loader = loaders; - - if (!initialized) - { - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (SHUTDOWN)); - ++errors; - goto done; - } - - /* shut down only at last call. */ - if (--initialized == 0) - { - int level; - - while (handles && LT_DLIS_RESIDENT (handles)) - { - handles = handles->next; - } - - /* close all modules */ - for (level = 1; handles; ++level) - { - lt_dlhandle cur = handles; - int saw_nonresident = 0; - - while (cur) - { - lt_dlhandle tmp = cur; - cur = cur->next; - if (!LT_DLIS_RESIDENT (tmp)) - saw_nonresident = 1; - if (!LT_DLIS_RESIDENT (tmp) && tmp->info.ref_count <= level) - { - if (lt_dlclose (tmp)) - { - ++errors; - } - } - } - /* done if only resident modules are left */ - if (!saw_nonresident) - break; - } - - /* close all loaders */ - while (loader) - { - lt_dlloader *next = loader->next; - lt_user_data data = loader->dlloader_data; - if (loader->dlloader_exit && loader->dlloader_exit (data)) - { - ++errors; - } - - LT_DLMEM_REASSIGN (loader, next); - } - loaders = NULL; - } - - done: - LT_DLMUTEX_UNLOCK (); - return errors; -} - -static int -tryall_dlopen (handle, filename) - lt_dlhandle *handle; - const char *filename; -{ - lt_dlhandle cur; - lt_dlloader *loader; - const char *saved_error; - int errors = 0; - - LT_DLMUTEX_GETERROR (saved_error); - LT_DLMUTEX_LOCK (); - - cur = handles; - loader = loaders; - - /* check whether the module was already opened */ - while (cur) - { - /* try to dlopen the program itself? */ - if (!cur->info.filename && !filename) - { - break; - } - - if (cur->info.filename && filename - && strcmp (cur->info.filename, filename) == 0) - { - break; - } - - cur = cur->next; - } - - if (cur) - { - ++cur->info.ref_count; - *handle = cur; - goto done; - } - - cur = *handle; - if (filename) - { - cur->info.filename = lt_estrdup (filename); - if (!cur->info.filename) - { - ++errors; - goto done; - } - } - else - { - cur->info.filename = NULL; - } - - while (loader) - { - lt_user_data data = loader->dlloader_data; - - cur->module = loader->module_open (data, filename); - - if (cur->module != NULL) - { - break; - } - loader = loader->next; - } - - if (!loader) - { - LT_DLFREE (cur->info.filename); - ++errors; - goto done; - } - - cur->loader = loader; - LT_DLMUTEX_SETERROR (saved_error); - - done: - LT_DLMUTEX_UNLOCK (); - - return errors; -} - -static int -tryall_dlopen_module (handle, prefix, dirname, dlname) - lt_dlhandle *handle; - const char *prefix; - const char *dirname; - const char *dlname; -{ - int error = 0; - char *filename = NULL; - size_t filename_len = 0; - size_t dirname_len = LT_STRLEN (dirname); - - assert (handle); - assert (dirname); - assert (dlname); -#ifdef LT_DIRSEP_CHAR - /* Only canonicalized names (i.e. with DIRSEP chars already converted) - should make it into this function: */ - assert (strchr (dirname, LT_DIRSEP_CHAR) == NULL); -#endif - - if (dirname[dirname_len -1] == '/') - --dirname_len; - filename_len = dirname_len + 1 + LT_STRLEN (dlname); - - /* Allocate memory, and combine DIRNAME and MODULENAME into it. - The PREFIX (if any) is handled below. */ - filename = LT_EMALLOC (char, dirname_len + 1 + filename_len + 1); - if (!filename) - return 1; - - sprintf (filename, "%.*s/%s", (int) dirname_len, dirname, dlname); - - /* Now that we have combined DIRNAME and MODULENAME, if there is - also a PREFIX to contend with, simply recurse with the arguments - shuffled. Otherwise, attempt to open FILENAME as a module. */ - if (prefix) - { - error += tryall_dlopen_module (handle, - (const char *) 0, prefix, filename); - } - else if (tryall_dlopen (handle, filename) != 0) - { - ++error; - } - - LT_DLFREE (filename); - return error; -} - -static int -find_module (handle, dir, libdir, dlname, old_name, installed) - lt_dlhandle *handle; - const char *dir; - const char *libdir; - const char *dlname; - const char *old_name; - int installed; -{ - /* Try to open the old library first; if it was dlpreopened, - we want the preopened version of it, even if a dlopenable - module is available. */ - if (old_name && tryall_dlopen (handle, old_name) == 0) - { - return 0; - } - - /* Try to open the dynamic library. */ - if (dlname) - { - /* try to open the installed module */ - if (installed && libdir) - { - if (tryall_dlopen_module (handle, - (const char *) 0, libdir, dlname) == 0) - return 0; - } - - /* try to open the not-installed module */ - if (!installed) - { - if (tryall_dlopen_module (handle, dir, objdir, dlname) == 0) - return 0; - } - - /* maybe it was moved to another directory */ - { - if (tryall_dlopen_module (handle, - (const char *) 0, dir, dlname) == 0) - return 0; - } - } - - return 1; -} - - -static int -canonicalize_path (path, pcanonical) - const char *path; - char **pcanonical; -{ - char *canonical = NULL; - - assert (path && *path); - assert (pcanonical); - - canonical = LT_EMALLOC (char, 1+ LT_STRLEN (path)); - if (!canonical) - return 1; - - { - size_t dest = 0; - size_t src; - for (src = 0; path[src] != LT_EOS_CHAR; ++src) - { - /* Path separators are not copied to the beginning or end of - the destination, or if another separator would follow - immediately. */ - if (path[src] == LT_PATHSEP_CHAR) - { - if ((dest == 0) - || (path[1+ src] == LT_PATHSEP_CHAR) - || (path[1+ src] == LT_EOS_CHAR)) - continue; - } - - /* Anything other than a directory separator is copied verbatim. */ - if ((path[src] != '/') -#ifdef LT_DIRSEP_CHAR - && (path[src] != LT_DIRSEP_CHAR) -#endif - ) - { - canonical[dest++] = path[src]; - } - /* Directory separators are converted and copied only if they are - not at the end of a path -- i.e. before a path separator or - NULL terminator. */ - else if ((path[1+ src] != LT_PATHSEP_CHAR) - && (path[1+ src] != LT_EOS_CHAR) -#ifdef LT_DIRSEP_CHAR - && (path[1+ src] != LT_DIRSEP_CHAR) -#endif - && (path[1+ src] != '/')) - { - canonical[dest++] = '/'; - } - } - - /* Add an end-of-string marker at the end. */ - canonical[dest] = LT_EOS_CHAR; - } - - /* Assign new value. */ - *pcanonical = canonical; - - return 0; -} - -static int -argzize_path (path, pargz, pargz_len) - const char *path; - char **pargz; - size_t *pargz_len; -{ - error_t error; - - assert (path); - assert (pargz); - assert (pargz_len); - - if ((error = argz_create_sep (path, LT_PATHSEP_CHAR, pargz, pargz_len))) - { - switch (error) - { - case ENOMEM: - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (NO_MEMORY)); - break; - default: - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (UNKNOWN)); - break; - } - - return 1; - } - - return 0; -} - -/* Repeatedly call FUNC with each LT_PATHSEP_CHAR delimited element - of SEARCH_PATH and references to DATA1 and DATA2, until FUNC returns - non-zero or all elements are exhausted. If BASE_NAME is non-NULL, - it is appended to each SEARCH_PATH element before FUNC is called. */ -static int -foreach_dirinpath (search_path, base_name, func, data1, data2) - const char *search_path; - const char *base_name; - foreach_callback_func *func; - lt_ptr data1; - lt_ptr data2; -{ - int result = 0; - int filenamesize = 0; - size_t lenbase = LT_STRLEN (base_name); - size_t argz_len = 0; - char *argz = NULL; - char *filename = NULL; - char *canonical = NULL; - - LT_DLMUTEX_LOCK (); - - if (!search_path || !*search_path) - { - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (FILE_NOT_FOUND)); - goto cleanup; - } - - if (canonicalize_path (search_path, &canonical) != 0) - goto cleanup; - - if (argzize_path (canonical, &argz, &argz_len) != 0) - goto cleanup; - - { - char *dir_name = NULL; - while ((dir_name = argz_next (argz, argz_len, dir_name))) - { - size_t lendir = LT_STRLEN (dir_name); - - if (lendir +1 +lenbase >= filenamesize) - { - LT_DLFREE (filename); - filenamesize = lendir +1 +lenbase +1; /* "/d" + '/' + "f" + '\0' */ - filename = LT_EMALLOC (char, filenamesize); - if (!filename) - goto cleanup; - } - - assert (filenamesize > lendir); - strcpy (filename, dir_name); - - if (base_name && *base_name) - { - if (filename[lendir -1] != '/') - filename[lendir++] = '/'; - strcpy (filename +lendir, base_name); - } - - if ((result = (*func) (filename, data1, data2))) - { - break; - } - } - } - - cleanup: - LT_DLFREE (argz); - LT_DLFREE (canonical); - LT_DLFREE (filename); - - LT_DLMUTEX_UNLOCK (); - - return result; -} - -/* If FILEPATH can be opened, store the name of the directory component - in DATA1, and the opened FILE* structure address in DATA2. Otherwise - DATA1 is unchanged, but DATA2 is set to a pointer to NULL. */ -static int -find_file_callback (filename, data1, data2) - char *filename; - lt_ptr data1; - lt_ptr data2; -{ - char **pdir = (char **) data1; - FILE **pfile = (FILE **) data2; - int is_done = 0; - - assert (filename && *filename); - assert (pdir); - assert (pfile); - - if ((*pfile = fopen (filename, LT_READTEXT_MODE))) - { - char *dirend = strrchr (filename, '/'); - - if (dirend > filename) - *dirend = LT_EOS_CHAR; - - LT_DLFREE (*pdir); - *pdir = lt_estrdup (filename); - is_done = (*pdir == NULL) ? -1 : 1; - } - - return is_done; -} - -static FILE * -find_file (search_path, base_name, pdir) - const char *search_path; - const char *base_name; - char **pdir; -{ - FILE *file = NULL; - - foreach_dirinpath (search_path, base_name, find_file_callback, pdir, &file); - - return file; -} - -static int -find_handle_callback (filename, data, ignored) - char *filename; - lt_ptr data; - lt_ptr ignored; -{ - lt_dlhandle *handle = (lt_dlhandle *) data; - int notfound = access (filename, R_OK); - - /* Bail out if file cannot be read... */ - if (notfound) - return 0; - - /* Try to dlopen the file, but do not continue searching in any - case. */ - if (tryall_dlopen (handle, filename) != 0) - *handle = NULL; - - return 1; -} - -/* If HANDLE was found return it, otherwise return 0. If HANDLE was - found but could not be opened, *HANDLE will be set to 0. */ -static lt_dlhandle * -find_handle (search_path, base_name, handle) - const char *search_path; - const char *base_name; - lt_dlhandle *handle; -{ - if (!search_path) - return 0; - - if (!foreach_dirinpath (search_path, base_name, find_handle_callback, - handle, 0)) - return 0; - - return handle; -} - -static int -load_deplibs (handle, deplibs) - lt_dlhandle handle; - char *deplibs; -{ -#if LTDL_DLOPEN_DEPLIBS - char *p, *save_search_path = NULL; - int depcount = 0; - int i; - char **names = NULL; -#endif - int errors = 0; - - handle->depcount = 0; - -#if LTDL_DLOPEN_DEPLIBS - if (!deplibs) - { - return errors; - } - ++errors; - - LT_DLMUTEX_LOCK (); - if (user_search_path) - { - save_search_path = lt_estrdup (user_search_path); - if (!save_search_path) - goto cleanup; - } - - /* extract search paths and count deplibs */ - p = deplibs; - while (*p) - { - if (!isspace ((int) *p)) - { - char *end = p+1; - while (*end && !isspace((int) *end)) - { - ++end; - } - - if (strncmp(p, "-L", 2) == 0 || strncmp(p, "-R", 2) == 0) - { - char save = *end; - *end = '\0'; /* set a temporary string terminator */ - if (lt_dladdsearchdir(p+2)) - { - goto cleanup; - } - *end = save; - } - else - { - ++depcount; - } - - p = end; - } - else - { - ++p; - } - } - - /* restore the old search path */ - LT_DLFREE (user_search_path); - user_search_path = save_search_path; - - LT_DLMUTEX_UNLOCK (); - - if (!depcount) - { - errors = 0; - goto cleanup; - } - - names = LT_EMALLOC (char *, depcount * sizeof (char*)); - if (!names) - goto cleanup; - - /* now only extract the actual deplibs */ - depcount = 0; - p = deplibs; - while (*p) - { - if (isspace ((int) *p)) - { - ++p; - } - else - { - char *end = p+1; - while (*end && !isspace ((int) *end)) - { - ++end; - } - - if (strncmp(p, "-L", 2) != 0 && strncmp(p, "-R", 2) != 0) - { - char *name; - char save = *end; - *end = '\0'; /* set a temporary string terminator */ - if (strncmp(p, "-l", 2) == 0) - { - size_t name_len = 3+ /* "lib" */ LT_STRLEN (p + 2); - name = LT_EMALLOC (char, 1+ name_len); - if (name) - sprintf (name, "lib%s", p+2); - } - else - name = lt_estrdup(p); - - if (!name) - goto cleanup_names; - - names[depcount++] = name; - *end = save; - } - p = end; - } - } - - /* load the deplibs (in reverse order) - At this stage, don't worry if the deplibs do not load correctly, - they may already be statically linked into the loading application - for instance. There will be a more enlightening error message - later on if the loaded module cannot resolve all of its symbols. */ - if (depcount) - { - int j = 0; - - handle->deplibs = (lt_dlhandle*) LT_EMALLOC (lt_dlhandle *, depcount); - if (!handle->deplibs) - goto cleanup; - - for (i = 0; i < depcount; ++i) - { - handle->deplibs[j] = lt_dlopenext(names[depcount-1-i]); - if (handle->deplibs[j]) - { - ++j; - } - } - - handle->depcount = j; /* Number of successfully loaded deplibs */ - errors = 0; - } - - cleanup_names: - for (i = 0; i < depcount; ++i) - { - LT_DLFREE (names[i]); - } - - cleanup: - LT_DLFREE (names); -#endif - - return errors; -} - -static int -unload_deplibs (handle) - lt_dlhandle handle; -{ - int i; - int errors = 0; - - if (handle->depcount) - { - for (i = 0; i < handle->depcount; ++i) - { - if (!LT_DLIS_RESIDENT (handle->deplibs[i])) - { - errors += lt_dlclose (handle->deplibs[i]); - } - } - } - - return errors; -} - -static int -trim (dest, str) - char **dest; - const char *str; -{ - /* remove the leading and trailing "'" from str - and store the result in dest */ - const char *end = strrchr (str, '\''); - size_t len = LT_STRLEN (str); - char *tmp; - - LT_DLFREE (*dest); - - if (len > 3 && str[0] == '\'') - { - tmp = LT_EMALLOC (char, end - str); - if (!tmp) - return 1; - - strncpy(tmp, &str[1], (end - str) - 1); - tmp[len-3] = LT_EOS_CHAR; - *dest = tmp; - } - else - { - *dest = NULL; - } - - return 0; -} - -static int -free_vars (dlname, oldname, libdir, deplibs) - char *dlname; - char *oldname; - char *libdir; - char *deplibs; -{ - LT_DLFREE (dlname); - LT_DLFREE (oldname); - LT_DLFREE (libdir); - LT_DLFREE (deplibs); - - return 0; -} - -static int -try_dlopen (phandle, filename) - lt_dlhandle *phandle; - const char *filename; -{ - const char * ext = NULL; - const char * saved_error = NULL; - char * canonical = NULL; - char * base_name = NULL; - char * dir = NULL; - char * name = NULL; - int errors = 0; - lt_dlhandle newhandle; - - assert (phandle); - assert (*phandle == NULL); - - LT_DLMUTEX_GETERROR (saved_error); - - /* dlopen self? */ - if (!filename) - { - *phandle = (lt_dlhandle) LT_EMALLOC (struct lt_dlhandle_struct, 1); - if (*phandle == NULL) - return 1; - - memset (*phandle, 0, sizeof(struct lt_dlhandle_struct)); - newhandle = *phandle; - - /* lt_dlclose()ing yourself is very bad! Disallow it. */ - LT_DLSET_FLAG (*phandle, LT_DLRESIDENT_FLAG); - - if (tryall_dlopen (&newhandle, 0) != 0) - { - LT_DLFREE (*phandle); - return 1; - } - - goto register_handle; - } - - assert (filename && *filename); - - /* Doing this immediately allows internal functions to safely - assume only canonicalized paths are passed. */ - if (canonicalize_path (filename, &canonical) != 0) - { - ++errors; - goto cleanup; - } - - /* If the canonical module name is a path (relative or absolute) - then split it into a directory part and a name part. */ - base_name = strrchr (canonical, '/'); - if (base_name) - { - size_t dirlen = (1+ base_name) - canonical; - - dir = LT_EMALLOC (char, 1+ dirlen); - if (!dir) - { - ++errors; - goto cleanup; - } - - strncpy (dir, canonical, dirlen); - dir[dirlen] = LT_EOS_CHAR; - - ++base_name; - } - else - LT_DLMEM_REASSIGN (base_name, canonical); - - assert (base_name && *base_name); - - /* Check whether we are opening a libtool module (.la extension). */ - ext = strrchr (base_name, '.'); - if (ext && strcmp (ext, archive_ext) == 0) - { - /* this seems to be a libtool module */ - FILE * file = NULL; - char * dlname = NULL; - char * old_name = NULL; - char * libdir = NULL; - char * deplibs = NULL; - char * line = NULL; - size_t line_len; - - /* if we can't find the installed flag, it is probably an - installed libtool archive, produced with an old version - of libtool */ - int installed = 1; - - /* extract the module name from the file name */ - name = LT_EMALLOC (char, ext - base_name + 1); - if (!name) - { - ++errors; - goto cleanup; - } - - /* canonicalize the module name */ - { - size_t i; - for (i = 0; i < ext - base_name; ++i) - { - if (isalnum ((int)(base_name[i]))) - { - name[i] = base_name[i]; - } - else - { - name[i] = '_'; - } - } - name[ext - base_name] = LT_EOS_CHAR; - } - - /* Now try to open the .la file. If there is no directory name - component, try to find it first in user_search_path and then other - prescribed paths. Otherwise (or in any case if the module was not - yet found) try opening just the module name as passed. */ - if (!dir) - { - const char *search_path; - - LT_DLMUTEX_LOCK (); - search_path = user_search_path; - if (search_path) - file = find_file (user_search_path, base_name, &dir); - LT_DLMUTEX_UNLOCK (); - - if (!file) - { - search_path = getenv (LTDL_SEARCHPATH_VAR); - if (search_path) - file = find_file (search_path, base_name, &dir); - } - -#ifdef LTDL_SHLIBPATH_VAR - if (!file) - { - search_path = getenv (LTDL_SHLIBPATH_VAR); - if (search_path) - file = find_file (search_path, base_name, &dir); - } -#endif -#ifdef LTDL_SYSSEARCHPATH - if (!file && sys_search_path) - { - file = find_file (sys_search_path, base_name, &dir); - } -#endif - } - if (!file) - { - file = fopen (filename, LT_READTEXT_MODE); - } - - /* If we didn't find the file by now, it really isn't there. Set - the status flag, and bail out. */ - if (!file) - { - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (FILE_NOT_FOUND)); - ++errors; - goto cleanup; - } - - line_len = LT_FILENAME_MAX; - line = LT_EMALLOC (char, line_len); - if (!line) - { - fclose (file); - ++errors; - goto cleanup; - } - - /* read the .la file */ - while (!feof (file)) - { - if (!fgets (line, (int) line_len, file)) - { - break; - } - - /* Handle the case where we occasionally need to read a line - that is longer than the initial buffer size. */ - while (line[LT_STRLEN(line) -1] != '\n') - { - line = LT_DLREALLOC (char, line, line_len *2); - if (!fgets (&line[line_len -1], (int) line_len +1, file)) - { - break; - } - line_len *= 2; - } - - if (line[0] == '\n' || line[0] == '#') - { - continue; - } - -#undef STR_DLNAME -#define STR_DLNAME "dlname=" - if (strncmp (line, STR_DLNAME, sizeof (STR_DLNAME) - 1) == 0) - { - errors += trim (&dlname, &line[sizeof (STR_DLNAME) - 1]); - } - -#undef STR_OLD_LIBRARY -#define STR_OLD_LIBRARY "old_library=" - else if (strncmp (line, STR_OLD_LIBRARY, - sizeof (STR_OLD_LIBRARY) - 1) == 0) - { - errors += trim (&old_name, &line[sizeof (STR_OLD_LIBRARY) - 1]); - } -#undef STR_LIBDIR -#define STR_LIBDIR "libdir=" - else if (strncmp (line, STR_LIBDIR, sizeof (STR_LIBDIR) - 1) == 0) - { - errors += trim (&libdir, &line[sizeof(STR_LIBDIR) - 1]); - } - -#undef STR_DL_DEPLIBS -#define STR_DL_DEPLIBS "dependency_libs=" - else if (strncmp (line, STR_DL_DEPLIBS, - sizeof (STR_DL_DEPLIBS) - 1) == 0) - { - errors += trim (&deplibs, &line[sizeof (STR_DL_DEPLIBS) - 1]); - } - else if (strcmp (line, "installed=yes\n") == 0) - { - installed = 1; - } - else if (strcmp (line, "installed=no\n") == 0) - { - installed = 0; - } - -#undef STR_LIBRARY_NAMES -#define STR_LIBRARY_NAMES "library_names=" - else if (! dlname && strncmp (line, STR_LIBRARY_NAMES, - sizeof (STR_LIBRARY_NAMES) - 1) == 0) - { - char *last_libname; - errors += trim (&dlname, &line[sizeof (STR_LIBRARY_NAMES) - 1]); - if (!errors - && dlname - && (last_libname = strrchr (dlname, ' ')) != NULL) - { - last_libname = lt_estrdup (last_libname + 1); - if (!last_libname) - { - ++errors; - goto cleanup; - } - LT_DLMEM_REASSIGN (dlname, last_libname); - } - } - - if (errors) - break; - } - - fclose (file); - LT_DLFREE (line); - - /* allocate the handle */ - *phandle = (lt_dlhandle) LT_EMALLOC (struct lt_dlhandle_struct, 1); - if (*phandle == NULL) - ++errors; - - if (errors) - { - free_vars (dlname, old_name, libdir, deplibs); - LT_DLFREE (*phandle); - goto cleanup; - } - - assert (*phandle); - - memset (*phandle, 0, sizeof(struct lt_dlhandle_struct)); - if (load_deplibs (*phandle, deplibs) == 0) - { - newhandle = *phandle; - /* find_module may replace newhandle */ - if (find_module (&newhandle, dir, libdir, dlname, old_name, installed)) - { - unload_deplibs (*phandle); - ++errors; - } - } - else - { - ++errors; - } - - free_vars (dlname, old_name, libdir, deplibs); - if (errors) - { - LT_DLFREE (*phandle); - goto cleanup; - } - - if (*phandle != newhandle) - { - unload_deplibs (*phandle); - } - } - else - { - /* not a libtool module */ - *phandle = (lt_dlhandle) LT_EMALLOC (struct lt_dlhandle_struct, 1); - if (*phandle == NULL) - { - ++errors; - goto cleanup; - } - - memset (*phandle, 0, sizeof (struct lt_dlhandle_struct)); - newhandle = *phandle; - - /* If the module has no directory name component, try to find it - first in user_search_path and then other prescribed paths. - Otherwise (or in any case if the module was not yet found) try - opening just the module name as passed. */ - if ((dir || (!find_handle (user_search_path, base_name, &newhandle) - && !find_handle (getenv (LTDL_SEARCHPATH_VAR), base_name, - &newhandle) -#ifdef LTDL_SHLIBPATH_VAR - && !find_handle (getenv (LTDL_SHLIBPATH_VAR), base_name, - &newhandle) -#endif -#ifdef LTDL_SYSSEARCHPATH - && !find_handle (sys_search_path, base_name, &newhandle) -#endif - ))) - { - if (tryall_dlopen (&newhandle, filename) != 0) - { - newhandle = NULL; - } - } - - if (!newhandle) - { - LT_DLFREE (*phandle); - ++errors; - goto cleanup; - } - } - - register_handle: - LT_DLMEM_REASSIGN (*phandle, newhandle); - - if ((*phandle)->info.ref_count == 0) - { - (*phandle)->info.ref_count = 1; - LT_DLMEM_REASSIGN ((*phandle)->info.name, name); - - LT_DLMUTEX_LOCK (); - (*phandle)->next = handles; - handles = *phandle; - LT_DLMUTEX_UNLOCK (); - } - - LT_DLMUTEX_SETERROR (saved_error); - - cleanup: - LT_DLFREE (dir); - LT_DLFREE (name); - LT_DLFREE (canonical); - - return errors; -} - -lt_dlhandle -lt_dlopen (filename) - const char *filename; -{ - lt_dlhandle handle = NULL; - - /* Just incase we missed a code path in try_dlopen() that reports - an error, but forgets to reset handle... */ - if (try_dlopen (&handle, filename) != 0) - return 0; - - return handle; -} - -/* If the last error messge store was `FILE_NOT_FOUND', then return - non-zero. */ -static int -file_not_found () -{ - const char *error = NULL; - - LT_DLMUTEX_GETERROR (error); - if (error == LT_DLSTRERROR (FILE_NOT_FOUND)) - return 1; - - return 0; -} - -/* If FILENAME has an ARCHIVE_EXT or SHLIB_EXT extension, try to - open the FILENAME as passed. Otherwise try appending ARCHIVE_EXT, - and if a file is still not found try again with SHLIB_EXT appended - instead. */ -lt_dlhandle -lt_dlopenext (filename) - const char *filename; -{ - lt_dlhandle handle = NULL; - char * tmp = NULL; - char * ext = NULL; - size_t len; - int errors = 0; - - if (!filename) - { - return lt_dlopen (filename); - } - - assert (filename); - - len = LT_STRLEN (filename); - ext = strrchr (filename, '.'); - - /* If FILENAME already bears a suitable extension, there is no need - to try appending additional extensions. */ - if (ext && ((strcmp (ext, archive_ext) == 0) -#ifdef LTDL_SHLIB_EXT - || (strcmp (ext, shlib_ext) == 0) -#endif - )) - { - return lt_dlopen (filename); - } - - /* First try appending ARCHIVE_EXT. */ - tmp = LT_EMALLOC (char, len + LT_STRLEN (archive_ext) + 1); - if (!tmp) - return 0; - - strcpy (tmp, filename); - strcat (tmp, archive_ext); - errors = try_dlopen (&handle, tmp); - - /* If we found FILENAME, stop searching -- whether we were able to - load the file as a module or not. If the file exists but loading - failed, it is better to return an error message here than to - report FILE_NOT_FOUND when the alternatives (foo.so etc) are not - in the module search path. */ - if (handle || ((errors > 0) && file_not_found ())) - { - LT_DLFREE (tmp); - return handle; - } - -#ifdef LTDL_SHLIB_EXT - /* Try appending SHLIB_EXT. */ - if (LT_STRLEN (shlib_ext) > LT_STRLEN (archive_ext)) - { - LT_DLFREE (tmp); - tmp = LT_EMALLOC (char, len + LT_STRLEN (shlib_ext) + 1); - if (!tmp) - return 0; - - strcpy (tmp, filename); - } - else - { - tmp[len] = LT_EOS_CHAR; - } - - strcat(tmp, shlib_ext); - errors = try_dlopen (&handle, tmp); - - /* As before, if the file was found but loading failed, return now - with the current error message. */ - if (handle || ((errors > 0) && file_not_found ())) - { - LT_DLFREE (tmp); - return handle; - } -#endif - - /* Still here? Then we really did fail to locate any of the file - names we tried. */ - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (FILE_NOT_FOUND)); - LT_DLFREE (tmp); - return 0; -} - - -static int -lt_argz_insert (pargz, pargz_len, before, entry) - char **pargz; - size_t *pargz_len; - char *before; - const char *entry; -{ - error_t error; - - if ((error = argz_insert (pargz, pargz_len, before, entry))) - { - switch (error) - { - case ENOMEM: - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (NO_MEMORY)); - break; - default: - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (UNKNOWN)); - break; - } - return 1; - } - - return 0; -} - -static int -lt_argz_insertinorder (pargz, pargz_len, entry) - char **pargz; - size_t *pargz_len; - const char *entry; -{ - char *before = NULL; - - assert (pargz); - assert (pargz_len); - assert (entry && *entry); - - if (*pargz) - while ((before = argz_next (*pargz, *pargz_len, before))) - { - int cmp = strcmp (entry, before); - - if (cmp < 0) break; - if (cmp == 0) return 0; /* No duplicates! */ - } - - return lt_argz_insert (pargz, pargz_len, before, entry); -} - -static int -lt_argz_insertdir (pargz, pargz_len, dirnam, dp) - char **pargz; - size_t *pargz_len; - const char *dirnam; - struct dirent *dp; -{ - char *buf = NULL; - size_t buf_len = 0; - char *end = NULL; - size_t end_offset = 0; - size_t dir_len = 0; - int errors = 0; - - assert (pargz); - assert (pargz_len); - assert (dp); - - dir_len = LT_STRLEN (dirnam); - end = dp->d_name + LT_D_NAMLEN(dp); - - /* Ignore version numbers. */ - { - char *p; - for (p = end; p -1 > dp->d_name; --p) - if (strchr (".0123456789", p[-1]) == 0) - break; - - if (*p == '.') - end = p; - } - - /* Ignore filename extension. */ - { - char *p; - for (p = end -1; p > dp->d_name; --p) - if (*p == '.') - { - end = p; - break; - } - } - - /* Prepend the directory name. */ - end_offset = end - dp->d_name; - buf_len = dir_len + 1+ end_offset; - buf = LT_EMALLOC (char, 1+ buf_len); - if (!buf) - return ++errors; - - assert (buf); - - strcpy (buf, dirnam); - strcat (buf, "/"); - strncat (buf, dp->d_name, end_offset); - buf[buf_len] = LT_EOS_CHAR; - - /* Try to insert (in order) into ARGZ/ARGZ_LEN. */ - if (lt_argz_insertinorder (pargz, pargz_len, buf) != 0) - ++errors; - - LT_DLFREE (buf); - - return errors; -} - -static int -list_files_by_dir (dirnam, pargz, pargz_len) - const char *dirnam; - char **pargz; - size_t *pargz_len; -{ - DIR *dirp = NULL; - int errors = 0; - - assert (dirnam && *dirnam); - assert (pargz); - assert (pargz_len); - assert (dirnam[LT_STRLEN(dirnam) -1] != '/'); - - dirp = opendir (dirnam); - if (dirp) - { - struct dirent *dp = NULL; - - while ((dp = readdir (dirp))) - if (dp->d_name[0] != '.') - if (lt_argz_insertdir (pargz, pargz_len, dirnam, dp)) - { - ++errors; - break; - } - - closedir (dirp); - } - else - ++errors; - - return errors; -} - - -/* If there are any files in DIRNAME, call the function passed in - DATA1 (with the name of each file and DATA2 as arguments). */ -static int -foreachfile_callback (dirname, data1, data2) - char *dirname; - lt_ptr data1; - lt_ptr data2; -{ - int (*func) LT_PARAMS((const char *filename, lt_ptr data)) - = (int (*) LT_PARAMS((const char *filename, lt_ptr data))) data1; - - int is_done = 0; - char *argz = NULL; - size_t argz_len = 0; - - if (list_files_by_dir (dirname, &argz, &argz_len) != 0) - goto cleanup; - if (!argz) - goto cleanup; - - { - char *filename = NULL; - while ((filename = argz_next (argz, argz_len, filename))) - if ((is_done = (*func) (filename, data2))) - break; - } - - cleanup: - LT_DLFREE (argz); - - return is_done; -} - - -/* Call FUNC for each unique extensionless file in SEARCH_PATH, along - with DATA. The filenames passed to FUNC would be suitable for - passing to lt_dlopenext. The extensions are stripped so that - individual modules do not generate several entries (e.g. libfoo.la, - libfoo.so, libfoo.so.1, libfoo.so.1.0.0). If SEARCH_PATH is NULL, - then the same directories that lt_dlopen would search are examined. */ -int -lt_dlforeachfile (search_path, func, data) - const char *search_path; - int (*func) LT_PARAMS ((const char *filename, lt_ptr data)); - lt_ptr data; -{ - int is_done = 0; - - if (search_path) - { - /* If a specific path was passed, search only the directories - listed in it. */ - is_done = foreach_dirinpath (search_path, 0, - foreachfile_callback, func, data); - } - else - { - /* Otherwise search the default paths. */ - is_done = foreach_dirinpath (user_search_path, 0, - foreachfile_callback, func, data); - if (!is_done) - { - is_done = foreach_dirinpath (getenv("LTDL_LIBRARY_PATH"), 0, - foreachfile_callback, func, data); - } - -#ifdef LTDL_SHLIBPATH_VAR - if (!is_done) - { - is_done = foreach_dirinpath (getenv(LTDL_SHLIBPATH_VAR), 0, - foreachfile_callback, func, data); - } -#endif -#ifdef LTDL_SYSSEARCHPATH - if (!is_done) - { - is_done = foreach_dirinpath (getenv(LTDL_SYSSEARCHPATH), 0, - foreachfile_callback, func, data); - } -#endif - } - - return is_done; -} - -int -lt_dlclose (handle) - lt_dlhandle handle; -{ - lt_dlhandle cur, last; - int errors = 0; - - LT_DLMUTEX_LOCK (); - - /* check whether the handle is valid */ - last = cur = handles; - while (cur && handle != cur) - { - last = cur; - cur = cur->next; - } - - if (!cur) - { - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_HANDLE)); - ++errors; - goto done; - } - - handle->info.ref_count--; - - /* Note that even with resident modules, we must track the ref_count - correctly incase the user decides to reset the residency flag - later (even though the API makes no provision for that at the - moment). */ - if (handle->info.ref_count <= 0 && !LT_DLIS_RESIDENT (handle)) - { - lt_user_data data = handle->loader->dlloader_data; - - if (handle != handles) - { - last->next = handle->next; - } - else - { - handles = handle->next; - } - - errors += handle->loader->module_close (data, handle->module); - errors += unload_deplibs(handle); - - /* It is up to the callers to free the data itself. */ - LT_DLFREE (handle->caller_data); - - LT_DLFREE (handle->info.filename); - LT_DLFREE (handle->info.name); - LT_DLFREE (handle); - - goto done; - } - - if (LT_DLIS_RESIDENT (handle)) - { - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CLOSE_RESIDENT_MODULE)); - ++errors; - } - - done: - LT_DLMUTEX_UNLOCK (); - - return errors; -} - -lt_ptr -lt_dlsym (handle, symbol) - lt_dlhandle handle; - const char *symbol; -{ - size_t lensym; - char lsym[LT_SYMBOL_LENGTH]; - char *sym; - lt_ptr address; - lt_user_data data; - - if (!handle) - { - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_HANDLE)); - return 0; - } - - if (!symbol) - { - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (SYMBOL_NOT_FOUND)); - return 0; - } - - lensym = LT_STRLEN (symbol) + LT_STRLEN (handle->loader->sym_prefix) - + LT_STRLEN (handle->info.name); - - if (lensym + LT_SYMBOL_OVERHEAD < LT_SYMBOL_LENGTH) - { - sym = lsym; - } - else - { - sym = LT_EMALLOC (char, lensym + LT_SYMBOL_OVERHEAD + 1); - if (!sym) - { - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (BUFFER_OVERFLOW)); - return 0; - } - } - - data = handle->loader->dlloader_data; - if (handle->info.name) - { - const char *saved_error; - - LT_DLMUTEX_GETERROR (saved_error); - - /* this is a libtool module */ - if (handle->loader->sym_prefix) - { - strcpy(sym, handle->loader->sym_prefix); - strcat(sym, handle->info.name); - } - else - { - strcpy(sym, handle->info.name); - } - - strcat(sym, "_LTX_"); - strcat(sym, symbol); - - /* try "modulename_LTX_symbol" */ - address = handle->loader->find_sym (data, handle->module, sym); - if (address) - { - if (sym != lsym) - { - LT_DLFREE (sym); - } - return address; - } - LT_DLMUTEX_SETERROR (saved_error); - } - - /* otherwise try "symbol" */ - if (handle->loader->sym_prefix) - { - strcpy(sym, handle->loader->sym_prefix); - strcat(sym, symbol); - } - else - { - strcpy(sym, symbol); - } - - address = handle->loader->find_sym (data, handle->module, sym); - if (sym != lsym) - { - LT_DLFREE (sym); - } - - return address; -} - -const char * -lt_dlerror () -{ - const char *error; - - LT_DLMUTEX_GETERROR (error); - LT_DLMUTEX_SETERROR (0); - - return error ? error : LT_DLSTRERROR (UNKNOWN); -} - -static int -lt_dlpath_insertdir (ppath, before, dir) - char **ppath; - char *before; - const char *dir; -{ - int errors = 0; - char *canonical = NULL; - char *argz = NULL; - size_t argz_len = 0; - - assert (ppath); - assert (dir && *dir); - - if (canonicalize_path (dir, &canonical) != 0) - { - ++errors; - goto cleanup; - } - - assert (canonical && *canonical); - - /* If *PPATH is empty, set it to DIR. */ - if (*ppath == NULL) - { - assert (!before); /* BEFORE cannot be set without PPATH. */ - assert (dir); /* Without DIR, don't call this function! */ - - *ppath = lt_estrdup (dir); - if (*ppath == NULL) - ++errors; - - return errors; - } - - assert (ppath && *ppath); - - if (argzize_path (*ppath, &argz, &argz_len) != 0) - { - ++errors; - goto cleanup; - } - - /* Convert BEFORE into an equivalent offset into ARGZ. This only works - if *PPATH is already canonicalized, and hence does not change length - with respect to ARGZ. We canonicalize each entry as it is added to - the search path, and don't call this function with (uncanonicalized) - user paths, so this is a fair assumption. */ - if (before) - { - assert (*ppath <= before); - assert (before - *ppath <= strlen (*ppath)); - - before = before - *ppath + argz; - } - - if (lt_argz_insert (&argz, &argz_len, before, dir) != 0) - { - ++errors; - goto cleanup; - } - - argz_stringify (argz, argz_len, LT_PATHSEP_CHAR); - LT_DLMEM_REASSIGN (*ppath, argz); - - cleanup: - LT_DLFREE (canonical); - LT_DLFREE (argz); - - return errors; -} - -int -lt_dladdsearchdir (search_dir) - const char *search_dir; -{ - int errors = 0; - - if (search_dir && *search_dir) - { - LT_DLMUTEX_LOCK (); - if (lt_dlpath_insertdir (&user_search_path, 0, search_dir) != 0) - ++errors; - LT_DLMUTEX_UNLOCK (); - } - - return errors; -} - -int -lt_dlinsertsearchdir (before, search_dir) - const char *before; - const char *search_dir; -{ - int errors = 0; - - if (before) - { - LT_DLMUTEX_LOCK (); - if ((before < user_search_path) - || (before >= user_search_path + LT_STRLEN (user_search_path))) - { - LT_DLMUTEX_UNLOCK (); - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_POSITION)); - return 1; - } - LT_DLMUTEX_UNLOCK (); - } - - if (search_dir && *search_dir) - { - LT_DLMUTEX_LOCK (); - if (lt_dlpath_insertdir (&user_search_path, - (char *) before, search_dir) != 0) - { - ++errors; - } - LT_DLMUTEX_UNLOCK (); - } - - return errors; -} - -int -lt_dlsetsearchpath (search_path) - const char *search_path; -{ - int errors = 0; - - LT_DLMUTEX_LOCK (); - LT_DLFREE (user_search_path); - LT_DLMUTEX_UNLOCK (); - - if (!search_path || !LT_STRLEN (search_path)) - { - return errors; - } - - LT_DLMUTEX_LOCK (); - if (canonicalize_path (search_path, &user_search_path) != 0) - ++errors; - LT_DLMUTEX_UNLOCK (); - - return errors; -} - -const char * -lt_dlgetsearchpath () -{ - const char *saved_path; - - LT_DLMUTEX_LOCK (); - saved_path = user_search_path; - LT_DLMUTEX_UNLOCK (); - - return saved_path; -} - -int -lt_dlmakeresident (handle) - lt_dlhandle handle; -{ - int errors = 0; - - if (!handle) - { - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_HANDLE)); - ++errors; - } - else - { - LT_DLSET_FLAG (handle, LT_DLRESIDENT_FLAG); - } - - return errors; -} - -int -lt_dlisresident (handle) - lt_dlhandle handle; -{ - if (!handle) - { - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_HANDLE)); - return -1; - } - - return LT_DLIS_RESIDENT (handle); -} - - - - -/* --- MODULE INFORMATION --- */ - -const lt_dlinfo * -lt_dlgetinfo (handle) - lt_dlhandle handle; -{ - if (!handle) - { - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_HANDLE)); - return 0; - } - - return &(handle->info); -} - -lt_dlhandle -lt_dlhandle_next (place) - lt_dlhandle place; -{ - return place ? place->next : handles; -} - -int -lt_dlforeach (func, data) - int (*func) LT_PARAMS((lt_dlhandle handle, lt_ptr data)); - lt_ptr data; -{ - int errors = 0; - lt_dlhandle cur; - - LT_DLMUTEX_LOCK (); - - cur = handles; - while (cur) - { - lt_dlhandle tmp = cur; - - cur = cur->next; - if ((*func) (tmp, data)) - { - ++errors; - break; - } - } - - LT_DLMUTEX_UNLOCK (); - - return errors; -} - -lt_dlcaller_id -lt_dlcaller_register () -{ - static lt_dlcaller_id last_caller_id = 0; - int result; - - LT_DLMUTEX_LOCK (); - result = ++last_caller_id; - LT_DLMUTEX_UNLOCK (); - - return result; -} - -lt_ptr -lt_dlcaller_set_data (key, handle, data) - lt_dlcaller_id key; - lt_dlhandle handle; - lt_ptr data; -{ - int n_elements = 0; - lt_ptr stale = NULL; - int i; - - /* This needs to be locked so that the caller data can be updated - simultaneously by different threads. */ - LT_DLMUTEX_LOCK (); - - if (handle->caller_data) - while (handle->caller_data[n_elements].key) - ++n_elements; - - for (i = 0; i < n_elements; ++i) - { - if (handle->caller_data[i].key == key) - { - stale = handle->caller_data[i].data; - break; - } - } - - /* Ensure that there is enough room in this handle's caller_data - array to accept a new element (and an empty end marker). */ - if (i == n_elements) - { - lt_caller_data *temp - = LT_DLREALLOC (lt_caller_data, handle->caller_data, 2+ n_elements); - - if (!temp) - { - stale = NULL; - goto done; - } - - handle->caller_data = temp; - - /* We only need this if we needed to allocate a new caller_data. */ - handle->caller_data[i].key = key; - handle->caller_data[1+ i].key = 0; - } - - handle->caller_data[i].data = data; - - done: - LT_DLMUTEX_UNLOCK (); - - return stale; -} - -lt_ptr -lt_dlcaller_get_data (key, handle) - lt_dlcaller_id key; - lt_dlhandle handle; -{ - lt_ptr result = (lt_ptr) 0; - - /* This needs to be locked so that the caller data isn't updated by - another thread part way through this function. */ - LT_DLMUTEX_LOCK (); - - /* Locate the index of the element with a matching KEY. */ - { - int i; - for (i = 0; handle->caller_data[i].key; ++i) - { - if (handle->caller_data[i].key == key) - { - result = handle->caller_data[i].data; - break; - } - } - } - - LT_DLMUTEX_UNLOCK (); - - return result; -} - - - -/* --- USER MODULE LOADER API --- */ - - -int -lt_dlloader_add (place, dlloader, loader_name) - lt_dlloader *place; - const struct lt_user_dlloader *dlloader; - const char *loader_name; -{ - int errors = 0; - lt_dlloader *node = NULL, *ptr = NULL; - - if ((dlloader == NULL) /* diagnose null parameters */ - || (dlloader->module_open == NULL) - || (dlloader->module_close == NULL) - || (dlloader->find_sym == NULL)) - { - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_LOADER)); - return 1; - } - - /* Create a new dlloader node with copies of the user callbacks. */ - node = LT_EMALLOC (lt_dlloader, 1); - if (!node) - return 1; - - node->next = NULL; - node->loader_name = loader_name; - node->sym_prefix = dlloader->sym_prefix; - node->dlloader_exit = dlloader->dlloader_exit; - node->module_open = dlloader->module_open; - node->module_close = dlloader->module_close; - node->find_sym = dlloader->find_sym; - node->dlloader_data = dlloader->dlloader_data; - - LT_DLMUTEX_LOCK (); - if (!loaders) - { - /* If there are no loaders, NODE becomes the list! */ - loaders = node; - } - else if (!place) - { - /* If PLACE is not set, add NODE to the end of the - LOADERS list. */ - for (ptr = loaders; ptr->next; ptr = ptr->next) - { - /*NOWORK*/; - } - - ptr->next = node; - } - else if (loaders == place) - { - /* If PLACE is the first loader, NODE goes first. */ - node->next = place; - loaders = node; - } - else - { - /* Find the node immediately preceding PLACE. */ - for (ptr = loaders; ptr->next != place; ptr = ptr->next) - { - /*NOWORK*/; - } - - if (ptr->next != place) - { - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_LOADER)); - ++errors; - } - else - { - /* Insert NODE between PTR and PLACE. */ - node->next = place; - ptr->next = node; - } - } - - LT_DLMUTEX_UNLOCK (); - - return errors; -} - -int -lt_dlloader_remove (loader_name) - const char *loader_name; -{ - lt_dlloader *place = lt_dlloader_find (loader_name); - lt_dlhandle handle; - int errors = 0; - - if (!place) - { - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_LOADER)); - return 1; - } - - LT_DLMUTEX_LOCK (); - - /* Fail if there are any open modules which use this loader. */ - for (handle = handles; handle; handle = handle->next) - { - if (handle->loader == place) - { - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (REMOVE_LOADER)); - ++errors; - goto done; - } - } - - if (place == loaders) - { - /* PLACE is the first loader in the list. */ - loaders = loaders->next; - } - else - { - /* Find the loader before the one being removed. */ - lt_dlloader *prev; - for (prev = loaders; prev->next; prev = prev->next) - { - if (!strcmp (prev->next->loader_name, loader_name)) - { - break; - } - } - - place = prev->next; - prev->next = prev->next->next; - } - - if (place->dlloader_exit) - { - errors = place->dlloader_exit (place->dlloader_data); - } - - LT_DLFREE (place); - - done: - LT_DLMUTEX_UNLOCK (); - - return errors; -} - -lt_dlloader * -lt_dlloader_next (place) - lt_dlloader *place; -{ - lt_dlloader *next; - - LT_DLMUTEX_LOCK (); - next = place ? place->next : loaders; - LT_DLMUTEX_UNLOCK (); - - return next; -} - -const char * -lt_dlloader_name (place) - lt_dlloader *place; -{ - const char *name = NULL; - - if (place) - { - LT_DLMUTEX_LOCK (); - name = place ? place->loader_name : 0; - LT_DLMUTEX_UNLOCK (); - } - else - { - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_LOADER)); - } - - return name; -} - -lt_user_data * -lt_dlloader_data (place) - lt_dlloader *place; -{ - lt_user_data *data = NULL; - - if (place) - { - LT_DLMUTEX_LOCK (); - data = place ? &(place->dlloader_data) : 0; - LT_DLMUTEX_UNLOCK (); - } - else - { - LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_LOADER)); - } - - return data; -} - -lt_dlloader * -lt_dlloader_find (loader_name) - const char *loader_name; -{ - lt_dlloader *place = NULL; - - LT_DLMUTEX_LOCK (); - for (place = loaders; place; place = place->next) - { - if (strcmp (place->loader_name, loader_name) == 0) - { - break; - } - } - LT_DLMUTEX_UNLOCK (); - - return place; -} diff --git a/src/libltdl/ltdl.h b/src/libltdl/ltdl.h deleted file mode 100644 index 2bbfa302..00000000 --- a/src/libltdl/ltdl.h +++ /dev/null @@ -1,361 +0,0 @@ -/* ltdl.h -- generic dlopen functions - Copyright (C) 1998-2000 Free Software Foundation, Inc. - Originally by Thomas Tanner - This file is part of GNU Libtool. - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser 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 Lesser General Public License, -if you distribute this file as part of a program or library that -is built using GNU libtool, you may include it under the same -distribution terms that you use for the rest of that program. - -This library 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 -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free -Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA -*/ - -/* Only include this header file once. */ -#ifndef LTDL_H -#define LTDL_H 1 - -#include /* for size_t declaration */ - - -/* --- MACROS FOR PORTABILITY --- */ - - -/* Saves on those hard to debug '\0' typos.... */ -#define LT_EOS_CHAR '\0' - -/* LTDL_BEGIN_C_DECLS should be used at the beginning of your declarations, - so that C++ compilers don't mangle their names. Use LTDL_END_C_DECLS at - the end of C declarations. */ -#ifdef __cplusplus -# define LT_BEGIN_C_DECLS extern "C" { -# define LT_END_C_DECLS } -#else -# define LT_BEGIN_C_DECLS /* empty */ -# define LT_END_C_DECLS /* empty */ -#endif - -LT_BEGIN_C_DECLS - - -/* LT_PARAMS is a macro used to wrap function prototypes, so that compilers - that don't understand ANSI C prototypes still work, and ANSI C - compilers can issue warnings about type mismatches. */ -#if defined (__STDC__) || defined (_AIX) || (defined (__mips) && defined (_SYSTYPE_SVR4)) || defined(WIN32) || defined(__cplusplus) -# define LT_PARAMS(protos) protos -# define lt_ptr void* -#else -# define LT_PARAMS(protos) () -# define lt_ptr char* -#endif - -/* LT_STMT_START/END are used to create macros which expand to a - a single compound statement in a portable way. */ -#if defined (__GNUC__) && !defined (__STRICT_ANSI__) && !defined (__cplusplus) -# define LT_STMT_START (void)( -# define LT_STMT_END ) -#else -# if (defined (sun) || defined (__sun__)) -# define LT_STMT_START if (1) -# define LT_STMT_END else (void)0 -# else -# define LT_STMT_START do -# define LT_STMT_END while (0) -# endif -#endif - -/* LT_CONC creates a new concatenated symbol for the compiler - in a portable way. */ -#if defined(__STDC__) || defined(__cplusplus) -# define LT_CONC(s,t) s##t -#else -# define LT_CONC(s,t) s/**/t -#endif - -/* LT_STRLEN can be used safely on NULL pointers. */ -#define LT_STRLEN(s) (((s) && (s)[0]) ? strlen (s) : 0) - - - -/* --- WINDOWS SUPPORT --- */ - - -/* Canonicalise Windows and Cygwin recognition macros. */ -#ifdef __CYGWIN32__ -# ifndef __CYGWIN__ -# define __CYGWIN__ __CYGWIN32__ -# endif -#endif -#if defined(_WIN32) || defined(WIN32) -# ifndef __WINDOWS__ -# ifdef _WIN32 -# define __WINDOWS__ _WIN32 -# else -# ifdef WIN32 -# define __WINDOWS__ WIN32 -# endif -# endif -# endif -#endif - -#ifdef __WINDOWS__ -# ifndef __CYGWIN__ -/* LT_DIRSEP_CHAR is accepted *in addition* to '/' as a directory - separator when it is set. */ -# define LT_DIRSEP_CHAR '\\' -# define LT_PATHSEP_CHAR ';' -# endif -#endif -#ifndef LT_PATHSEP_CHAR -# define LT_PATHSEP_CHAR ':' -#endif - -/* DLL building support on win32 hosts; mostly to workaround their - ridiculous implementation of data symbol exporting. */ -#ifndef LT_SCOPE -# ifdef __WINDOWS__ -# ifdef DLL_EXPORT /* defined by libtool (if required) */ -# define LT_SCOPE __declspec(dllexport) -# endif -# ifdef LIBLTDL_DLL_IMPORT /* define if linking with this dll */ -# define LT_SCOPE extern __declspec(dllimport) -# endif -# endif -# ifndef LT_SCOPE /* static linking or !__WINDOWS__ */ -# define LT_SCOPE extern -# endif -#endif - - - - -/* --- DYNAMIC MODULE LOADING API --- */ - - -typedef struct lt_dlhandle_struct *lt_dlhandle; /* A loaded module. */ - -/* Initialisation and finalisation functions for libltdl. */ -extern int lt_dlinit LT_PARAMS((void)); -extern int lt_dlexit LT_PARAMS((void)); - -/* Module search path manipulation. */ -extern int lt_dladdsearchdir LT_PARAMS((const char *search_dir)); -extern int lt_dlinsertsearchdir LT_PARAMS((const char *before, - const char *search_dir)); -extern int lt_dlsetsearchpath LT_PARAMS((const char *search_path)); -extern const char *lt_dlgetsearchpath LT_PARAMS((void)); -extern int lt_dlforeachfile LT_PARAMS(( - const char *search_path, - int (*func) (const char *filename, lt_ptr data), - lt_ptr data)); - -/* Portable libltdl versions of the system dlopen() API. */ -extern lt_dlhandle lt_dlopen LT_PARAMS((const char *filename)); -extern lt_dlhandle lt_dlopenext LT_PARAMS((const char *filename)); -extern lt_ptr lt_dlsym LT_PARAMS((lt_dlhandle handle, - const char *name)); -extern const char *lt_dlerror LT_PARAMS((void)); -extern int lt_dlclose LT_PARAMS((lt_dlhandle handle)); - -/* Module residency management. */ -extern int lt_dlmakeresident LT_PARAMS((lt_dlhandle handle)); -extern int lt_dlisresident LT_PARAMS((lt_dlhandle handle)); - - - - -/* --- MUTEX LOCKING --- */ - - -typedef void lt_dlmutex_lock LT_PARAMS((void)); -typedef void lt_dlmutex_unlock LT_PARAMS((void)); -typedef void lt_dlmutex_seterror LT_PARAMS((const char *errmsg)); -typedef const char *lt_dlmutex_geterror LT_PARAMS((void)); - -extern int lt_dlmutex_register LT_PARAMS((lt_dlmutex_lock *lock, - lt_dlmutex_unlock *unlock, - lt_dlmutex_seterror *seterror, - lt_dlmutex_geterror *geterror)); - - - - -/* --- MEMORY HANDLING --- */ - - -/* By default, the realloc function pointer is set to our internal - realloc implementation which iself uses lt_dlmalloc and lt_dlfree. - libltdl relies on a featureful realloc, but if you are sure yours - has the right semantics then you can assign it directly. Generally, - it is safe to assign just a malloc() and a free() function. */ -LT_SCOPE lt_ptr (*lt_dlmalloc) LT_PARAMS((size_t size)); -LT_SCOPE lt_ptr (*lt_dlrealloc) LT_PARAMS((lt_ptr ptr, size_t size)); -LT_SCOPE void (*lt_dlfree) LT_PARAMS((lt_ptr ptr)); - - - - -/* --- PRELOADED MODULE SUPPORT --- */ - - -/* A preopened symbol. Arrays of this type comprise the exported - symbols for a dlpreopened module. */ -typedef struct { - const char *name; - lt_ptr address; -} lt_dlsymlist; - -extern int lt_dlpreload LT_PARAMS((const lt_dlsymlist *preloaded)); -extern int lt_dlpreload_default - LT_PARAMS((const lt_dlsymlist *preloaded)); - -#define LTDL_SET_PRELOADED_SYMBOLS() LT_STMT_START{ \ - extern const lt_dlsymlist lt_preloaded_symbols[]; \ - lt_dlpreload_default(lt_preloaded_symbols); \ - }LT_STMT_END - - - - -/* --- MODULE INFORMATION --- */ - - -/* Read only information pertaining to a loaded module. */ -typedef struct { - char *filename; /* file name */ - char *name; /* module name */ - int ref_count; /* number of times lt_dlopened minus - number of times lt_dlclosed. */ -} lt_dlinfo; - -extern const lt_dlinfo *lt_dlgetinfo LT_PARAMS((lt_dlhandle handle)); -extern lt_dlhandle lt_dlhandle_next LT_PARAMS((lt_dlhandle place)); -extern int lt_dlforeach LT_PARAMS(( - int (*func) (lt_dlhandle handle, lt_ptr data), - lt_ptr data)); - -/* Associating user data with loaded modules. */ -typedef unsigned lt_dlcaller_id; - -extern lt_dlcaller_id lt_dlcaller_register LT_PARAMS((void)); -extern lt_ptr lt_dlcaller_set_data LT_PARAMS((lt_dlcaller_id key, - lt_dlhandle handle, - lt_ptr data)); -extern lt_ptr lt_dlcaller_get_data LT_PARAMS((lt_dlcaller_id key, - lt_dlhandle handle)); - - - -/* --- USER MODULE LOADER API --- */ - - -typedef struct lt_dlloader lt_dlloader; -typedef lt_ptr lt_user_data; -typedef lt_ptr lt_module; - -/* Function pointer types for creating user defined module loaders. */ -typedef lt_module lt_module_open LT_PARAMS((lt_user_data loader_data, - const char *filename)); -typedef int lt_module_close LT_PARAMS((lt_user_data loader_data, - lt_module handle)); -typedef lt_ptr lt_find_sym LT_PARAMS((lt_user_data loader_data, - lt_module handle, - const char *symbol)); -typedef int lt_dlloader_exit LT_PARAMS((lt_user_data loader_data)); - -struct lt_user_dlloader { - const char *sym_prefix; - lt_module_open *module_open; - lt_module_close *module_close; - lt_find_sym *find_sym; - lt_dlloader_exit *dlloader_exit; - lt_user_data dlloader_data; -}; - -extern lt_dlloader *lt_dlloader_next LT_PARAMS((lt_dlloader *place)); -extern lt_dlloader *lt_dlloader_find LT_PARAMS(( - const char *loader_name)); -extern const char *lt_dlloader_name LT_PARAMS((lt_dlloader *place)); -extern lt_user_data *lt_dlloader_data LT_PARAMS((lt_dlloader *place)); -extern int lt_dlloader_add LT_PARAMS((lt_dlloader *place, - const struct lt_user_dlloader *dlloader, - const char *loader_name)); -extern int lt_dlloader_remove LT_PARAMS(( - const char *loader_name)); - - - -/* --- ERROR MESSAGE HANDLING --- */ - - -/* Defining error strings alongside their symbolic names in a macro in - this way allows us to expand the macro in different contexts with - confidence that the enumeration of symbolic names will map correctly - onto the table of error strings. */ -#define lt_dlerror_table \ - LT_ERROR(UNKNOWN, "unknown error") \ - LT_ERROR(DLOPEN_NOT_SUPPORTED, "dlopen support not available") \ - LT_ERROR(INVALID_LOADER, "invalid loader") \ - LT_ERROR(INIT_LOADER, "loader initialization failed") \ - LT_ERROR(REMOVE_LOADER, "loader removal failed") \ - LT_ERROR(FILE_NOT_FOUND, "file not found") \ - LT_ERROR(DEPLIB_NOT_FOUND, "dependency library not found") \ - LT_ERROR(NO_SYMBOLS, "no symbols defined") \ - LT_ERROR(CANNOT_OPEN, "can't open the module") \ - LT_ERROR(CANNOT_CLOSE, "can't close the module") \ - LT_ERROR(SYMBOL_NOT_FOUND, "symbol not found") \ - LT_ERROR(NO_MEMORY, "not enough memory") \ - LT_ERROR(INVALID_HANDLE, "invalid module handle") \ - LT_ERROR(BUFFER_OVERFLOW, "internal buffer overflow") \ - LT_ERROR(INVALID_ERRORCODE, "invalid errorcode") \ - LT_ERROR(SHUTDOWN, "library already shutdown") \ - LT_ERROR(CLOSE_RESIDENT_MODULE, "can't close resident module") \ - LT_ERROR(INVALID_MUTEX_ARGS, "invalid mutex handler registration") \ - LT_ERROR(INVALID_POSITION, "invalid search path insert position") - -/* Enumerate the symbolic error names. */ -enum { -#define LT_ERROR(name, diagnostic) LT_CONC(LT_ERROR_, name), - lt_dlerror_table -#undef LT_ERROR - - LT_ERROR_MAX -}; - -/* These functions are only useful from inside custom module loaders. */ -extern int lt_dladderror LT_PARAMS((const char *diagnostic)); -extern int lt_dlseterror LT_PARAMS((int errorcode)); - - - - -/* --- SOURCE COMPATIBILITY WITH OLD LIBLTDL --- */ - - -#ifdef LT_NON_POSIX_NAMESPACE -# define lt_ptr_t lt_ptr -# define lt_module_t lt_module -# define lt_module_open_t lt_module_open -# define lt_module_close_t lt_module_close -# define lt_find_sym_t lt_find_sym -# define lt_dlloader_exit_t lt_dlloader_exit -# define lt_dlloader_t lt_dlloader -# define lt_dlloader_data_t lt_user_data -#endif - -LT_END_C_DECLS - -#endif /* !LTDL_H */ diff --git a/src/protocol/Makefile.am b/src/protocol/Makefile.am index 6a504f87..7bff76e1 100644 --- a/src/protocol/Makefile.am +++ b/src/protocol/Makefile.am @@ -15,5 +15,5 @@ unreal31_la_SOURCES = unreal31.c unreal31.h unreal32_la_SOURCES = unreal32.c unreal32.h viagra_la_SOURCES = viagra.c viagra.h AM_LDFLAGS = -module -avoid-version -no-undefined -AM_CFLAGS = -I.. -I../../include -I../pcre -I../adns +AM_CFLAGS = -I$(top_srcdir)/lib/adns/ -I$(top_srcdir)/lib/keeper @PCRE_CFLAGS@ @CURL_CFLAGS@ include $(top_srcdir)/autotools/rules.mk \ No newline at end of file diff --git a/src/protocol/Makefile.in b/src/protocol/Makefile.in index b44fca79..b6feabdc 100755 --- a/src/protocol/Makefile.in +++ b/src/protocol/Makefile.in @@ -43,7 +43,6 @@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ -AS = @AS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -52,11 +51,11 @@ BUILD_CURL_FALSE = @BUILD_CURL_FALSE@ BUILD_CURL_TRUE = @BUILD_CURL_TRUE@ BUILD_PCRE_FALSE = @BUILD_PCRE_FALSE@ BUILD_PCRE_TRUE = @BUILD_PCRE_TRUE@ +BUILD_SQL_FALSE = @BUILD_SQL_FALSE@ +BUILD_SQL_TRUE = @BUILD_SQL_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@ -CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CURL_CFLAGS = @CURL_CFLAGS@ @@ -68,7 +67,6 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -79,13 +77,10 @@ F77 = @F77@ FFLAGS = @FFLAGS@ INCLTDL = @INCLTDL@ INSTALL_DATA = @INSTALL_DATA@ -INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@ -INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ -LIBADD_DL = @LIBADD_DL@ LIBLTDL = @LIBLTDL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -98,7 +93,6 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MODULES = @MODULES@ -OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -119,12 +113,9 @@ STRIP = @STRIP@ VERSION = @VERSION@ YACC = @YACC@ ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -141,7 +132,6 @@ build_configtool = @build_configtool@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ -buildsqlsrv = @buildsqlsrv@ datadir = $(prefix)/data exec_prefix = @exec_prefix@ host = @host@ @@ -161,7 +151,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -sqlsrvbuild = @sqlsrvbuild@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ pkglib_LTLIBRARIES = bahamut.la client.la hybrid7.la ircup10.la liquid.la \ @@ -182,7 +171,7 @@ unreal31_la_SOURCES = unreal31.c unreal31.h unreal32_la_SOURCES = unreal32.c unreal32.h viagra_la_SOURCES = viagra.c viagra.h AM_LDFLAGS = -module -avoid-version -no-undefined -AM_CFLAGS = -I.. -I../../include -I../pcre -I../adns +AM_CFLAGS = -I$(top_srcdir)/lib/adns/ -I$(top_srcdir)/lib/keeper @PCRE_CFLAGS@ @CURL_CFLAGS@ LINK = @echo "Linking $@"; $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ diff --git a/src/tools/Makefile.in b/tools/Makefile.in similarity index 100% rename from src/tools/Makefile.in rename to tools/Makefile.in diff --git a/src/tools/README.kptool b/tools/README.kptool similarity index 100% rename from src/tools/README.kptool rename to tools/README.kptool diff --git a/src/tools/cfgtool/Makefile b/tools/cfgtool/Makefile similarity index 100% rename from src/tools/cfgtool/Makefile rename to tools/cfgtool/Makefile diff --git a/src/tools/cfgtool/README.configtool b/tools/cfgtool/README.configtool similarity index 100% rename from src/tools/cfgtool/README.configtool rename to tools/cfgtool/README.configtool diff --git a/src/tools/cfgtool/dialog.c b/tools/cfgtool/dialog.c similarity index 100% rename from src/tools/cfgtool/dialog.c rename to tools/cfgtool/dialog.c diff --git a/src/tools/cfgtool/edit.c b/tools/cfgtool/edit.c similarity index 100% rename from src/tools/cfgtool/edit.c rename to tools/cfgtool/edit.c diff --git a/src/tools/cfgtool/gkeeper.c b/tools/cfgtool/gkeeper.c similarity index 100% rename from src/tools/cfgtool/gkeeper.c rename to tools/cfgtool/gkeeper.c diff --git a/src/tools/cfgtool/gkeeper.h b/tools/cfgtool/gkeeper.h similarity index 100% rename from src/tools/cfgtool/gkeeper.h rename to tools/cfgtool/gkeeper.h diff --git a/src/tools/cfgtool/menu.c b/tools/cfgtool/menu.c similarity index 100% rename from src/tools/cfgtool/menu.c rename to tools/cfgtool/menu.c diff --git a/src/tools/cfgtool/pixmaps/book_closed.xpm b/tools/cfgtool/pixmaps/book_closed.xpm similarity index 100% rename from src/tools/cfgtool/pixmaps/book_closed.xpm rename to tools/cfgtool/pixmaps/book_closed.xpm diff --git a/src/tools/cfgtool/pixmaps/book_open.xpm b/tools/cfgtool/pixmaps/book_open.xpm similarity index 100% rename from src/tools/cfgtool/pixmaps/book_open.xpm rename to tools/cfgtool/pixmaps/book_open.xpm diff --git a/src/tools/cfgtool/pixmaps/data.xpm b/tools/cfgtool/pixmaps/data.xpm similarity index 100% rename from src/tools/cfgtool/pixmaps/data.xpm rename to tools/cfgtool/pixmaps/data.xpm diff --git a/src/tools/cfgtool/pixmaps/float.xpm b/tools/cfgtool/pixmaps/float.xpm similarity index 100% rename from src/tools/cfgtool/pixmaps/float.xpm rename to tools/cfgtool/pixmaps/float.xpm diff --git a/src/tools/cfgtool/pixmaps/folder_closed.xpm b/tools/cfgtool/pixmaps/folder_closed.xpm similarity index 100% rename from src/tools/cfgtool/pixmaps/folder_closed.xpm rename to tools/cfgtool/pixmaps/folder_closed.xpm diff --git a/src/tools/cfgtool/pixmaps/folder_open.xpm b/tools/cfgtool/pixmaps/folder_open.xpm similarity index 100% rename from src/tools/cfgtool/pixmaps/folder_open.xpm rename to tools/cfgtool/pixmaps/folder_open.xpm diff --git a/src/tools/cfgtool/pixmaps/num.xpm b/tools/cfgtool/pixmaps/num.xpm similarity index 100% rename from src/tools/cfgtool/pixmaps/num.xpm rename to tools/cfgtool/pixmaps/num.xpm diff --git a/src/tools/cfgtool/pixmaps/string.xpm b/tools/cfgtool/pixmaps/string.xpm similarity index 100% rename from src/tools/cfgtool/pixmaps/string.xpm rename to tools/cfgtool/pixmaps/string.xpm diff --git a/src/tools/cfgtool/pixmaps/warning.xpm b/tools/cfgtool/pixmaps/warning.xpm similarity index 100% rename from src/tools/cfgtool/pixmaps/warning.xpm rename to tools/cfgtool/pixmaps/warning.xpm diff --git a/src/tools/cfgtool/tree.c b/tools/cfgtool/tree.c similarity index 100% rename from src/tools/cfgtool/tree.c rename to tools/cfgtool/tree.c diff --git a/src/tools/kp_exp.c b/tools/kp_exp.c similarity index 100% rename from src/tools/kp_exp.c rename to tools/kp_exp.c diff --git a/src/tools/kp_imp.c b/tools/kp_imp.c similarity index 100% rename from src/tools/kp_imp.c rename to tools/kp_imp.c diff --git a/src/tools/kptool.c b/tools/kptool.c similarity index 100% rename from src/tools/kptool.c rename to tools/kptool.c diff --git a/src/tools/kptool.h b/tools/kptool.h similarity index 100% rename from src/tools/kptool.h rename to tools/kptool.h diff --git a/src/tools/misc.c b/tools/misc.c similarity index 100% rename from src/tools/misc.c rename to tools/misc.c diff --git a/src/tools/sqlphp/README b/tools/sqlphp/README similarity index 100% rename from src/tools/sqlphp/README rename to tools/sqlphp/README diff --git a/src/tools/sqlphp/rta_tables.php b/tools/sqlphp/rta_tables.php similarity index 100% rename from src/tools/sqlphp/rta_tables.php rename to tools/sqlphp/rta_tables.php diff --git a/src/tools/sqlphp/rta_view.php b/tools/sqlphp/rta_view.php similarity index 100% rename from src/tools/sqlphp/rta_view.php rename to tools/sqlphp/rta_view.php