[SCM] idjc/master: Imported Upstream version 0.8.15
sramacher at users.alioth.debian.org
sramacher at users.alioth.debian.org
Sun Nov 15 11:39:43 UTC 2015
The following commit has been merged in the master branch:
commit 6c6e29b9cacced7d3f4135da70250888a5ea09d6
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Sun Nov 15 11:56:13 2015 +0100
Imported Upstream version 0.8.15
diff --git a/ChangeLog b/ChangeLog
index f0f861b..3c1efef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,59 @@
+* Changes in version 0.8.15 *
+
+Documentation update for VoIP.
+
+Support for more signals by the IDJCMonitor class.
+
+Support for latest version of python-irc.
+
+Added full support for ITU-R BS.1770 / EBU R128 tags.
+
+Fixed saving of announcement text in .xspf playlists.
+
+The announcement text now appears in the playlist allowing the DJ to pre-read the announcements.
+
+Updated copyright year to 2015
+
+Internationalisation mostly of format.py which was missing from POTFILES.
+
+Git commit hash and build date appears in the 'About' page.
+
+Improved song database connectivity. Fixes and enhancements to last DJ played. Patch: B Millham.
+
+Added wrappers to all glib timeout_add, idle_add, and source_remove calls.
+
+Documentation update.
+
+French language translation update.
+
+Song title database credentials now exportable with DBus.
+
+'Last Played' column added to song title database viewer. This includes a scalable cooldown bar.
+
+Fix for IRC metadata so that Stream Info metadata updates are tied to stream connection, not song title changes.
+
+IDJC now reports server connect/disconnect to IRC in a formalised manner and in messages %U can be used for the source URI.
+
+Added an AppData file.
+
+Added support for generating m3u8 playlist files and added support for file URI's in m3u files.
+
+Fixed metadata to icecast servers now sent with latin1 encoding when streaming mpeg formats.
+
+User can now select latin1 encoding for fixed metadata to shoutcast servers.
+
+Fix for stream metadata character encoding: applied to extant metadata also.
+
+Can now read ReplayGain info from ID3 TXXX tags. Has priority over RVAD/RVA2 tags.
+
+Build system now handles problem with a too old libogg breaking Opus support.
+
+Can now obtain listener stats from Shoutcast 2 servers.
+
+Applied patches for libav 9 and 10 build and build warnings, courtesy: Sebastian Ramacher <sramacher at debian.org>
+
+Build fix for older ffmpeg dependency.
+
* Changes in version 0.8.14 *
Fix for playlist controls having an overly dark background.
diff --git a/Makefile.am b/Makefile.am
index 3a5dcfc..b5b1373 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,9 +5,12 @@ nodist_bin_SCRIPTS=${PACKAGE_NAME}
dist_noinst_SCRIPTS=idjc.in.in bootstrap
nodist_doc_DATA=AUTHORS.gz NEWS.gz README.gz ChangeLog.gz
docdir=${prefix}/share/doc/${PACKAGE_NAME}-${PACKAGE_VERSION}
-dist_noinst_DATA=idjc.desktop.in.in
+dist_noinst_DATA=idjc.desktop.in.in idjc.appdata.xml.in.in
nodist_appmenu_DATA=${PACKAGE_NAME}.desktop
appmenudir=${prefix}/share/applications
+nodist_appdata_DATA=${PACKAGE_NAME}.appdata.xml
+appdatadir=${datadir}/appdata
+nodist_pkgdata_DATA=buildinfo
${PACKAGE_NAME}: idjc.in
@sed -e 's|$${prefix}|${prefix}|g' -e 's|$${pkglibdir}|${pkglibdir}|g' $? >$@
@@ -15,6 +18,9 @@ ${PACKAGE_NAME}: idjc.in
${PACKAGE_NAME}.desktop: idjc.desktop.in
@sed -e 's|$${prefix}|${prefix}|g' -e 's|$${exec_prefix}|${exec_prefix}|g' $? >$@
+${PACKAGE_NAME}.appdata.xml: idjc.appdata.xml.in
+ @sed -e 's|$${prefix}|${prefix}|g' -e 's|$${exec_prefix}|${exec_prefix}|g' $? >$@
+
AUTHORS.gz: AUTHORS
@ gzip -c $? >$@
@@ -27,8 +33,20 @@ README.gz: README
ChangeLog.gz: ChangeLog
@ gzip -c $? >$@
+buildinfo:
+if GIT_VERSION_CONTROL
+ echo Commit hash: $$(git log -n1 "--pretty=format:%H") > buildinfo
+ echo Commit date: $$(git log -n1 "--pretty=format:%aD") >> buildinfo
+ echo Repo status: $$(if test -z "$(git status --porcelain) 2>&1" ; then echo "clean" ; else echo "dirty" ; fi) >> buildinfo
+ echo Remote URL: $$(git config --get remote.origin.url) >> buildinfo
+ echo >> buildinfo
+else
+ rm buildinfo
+endif
+ echo Build date: $$(date -R) >> buildinfo
+
clean-local:
- rm -f ChangeLog.gz README.gz NEWS.gz AUTHORS.gz ${PACKAGE_NAME}.desktop idjcctrl ${PACKAGE_NAME}
+ rm -f buildinfo ChangeLog.gz README.gz NEWS.gz AUTHORS.gz ${PACKAGE_NAME}.desktop ${PACKAGE_NAME}.appdata.xml ${PACKAGE_NAME}
dtdist:
make dist
@@ -38,7 +56,7 @@ sfpublish:
make dist
curl --retry 3 --connect-timeout 10 -T ${PACKAGE_TARNAME}-${PACKAGE_VERSION}.tar.gz -n sftp://frs.sourceforge.net/home/frs/project/i/id/idjc/idjc/0.8/
-.PHONY: dtdist sfpublish ${PACKAGE_NAME} ${PACKAGE_NAME}.desktop
+.PHONY: buildinfo dtdist sfpublish ${PACKAGE_NAME} ${PACKAGE_NAME}.desktop
ACLOCAL_AMFLAGS = -I m4
diff --git a/Makefile.in b/Makefile.in
index afa2c4f..6126cf9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -85,9 +85,10 @@ DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/configure $(am__configure_deps) \
$(srcdir)/config.h.in $(srcdir)/idjc.in.in \
- $(srcdir)/idjc.desktop.in.in ABOUT-NLS $(dist_noinst_SCRIPTS) \
- $(dist_noinst_DATA) COPYING compile config.guess config.rpath \
- config.sub depcomp install-sh missing py-compile ltmain.sh
+ $(srcdir)/idjc.desktop.in.in $(srcdir)/idjc.appdata.xml.in.in \
+ ABOUT-NLS $(dist_noinst_SCRIPTS) $(dist_noinst_DATA) COPYING \
+ compile config.guess config.rpath config.sub depcomp \
+ install-sh missing py-compile ltmain.sh
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
@@ -103,7 +104,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = idjc.in idjc.desktop.in
+CONFIG_CLEAN_FILES = idjc.in idjc.desktop.in idjc.appdata.xml.in
CONFIG_CLEAN_VPATH_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
@@ -132,8 +133,9 @@ am__uninstall_files_from_dir = { \
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmenudir)" \
- "$(DESTDIR)$(docdir)"
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appdatadir)" \
+ "$(DESTDIR)$(appmenudir)" "$(DESTDIR)$(docdir)" \
+ "$(DESTDIR)$(pkgdatadir)"
SCRIPTS = $(dist_noinst_SCRIPTS) $(nodist_bin_SCRIPTS)
AM_V_P = $(am__v_P_ at AM_V@)
am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
@@ -162,7 +164,9 @@ am__can_run_installinfo = \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
-DATA = $(dist_noinst_DATA) $(nodist_appmenu_DATA) $(nodist_doc_DATA)
+DATA = $(dist_noinst_DATA) $(nodist_appdata_DATA) \
+ $(nodist_appmenu_DATA) $(nodist_doc_DATA) \
+ $(nodist_pkgdata_DATA)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
am__recursive_targets = \
@@ -268,6 +272,7 @@ EXEEXT = @EXEEXT@
EXT = @EXT@
FGREP = @FGREP@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GIT_PROG_EXISTS = @GIT_PROG_EXISTS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
GMSGFMT = @GMSGFMT@
@@ -325,6 +330,7 @@ LN_S = @LN_S@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
@@ -442,9 +448,12 @@ EXTRA_SCRIPTS =
nodist_bin_SCRIPTS = ${PACKAGE_NAME}
dist_noinst_SCRIPTS = idjc.in.in bootstrap
nodist_doc_DATA = AUTHORS.gz NEWS.gz README.gz ChangeLog.gz
-dist_noinst_DATA = idjc.desktop.in.in
+dist_noinst_DATA = idjc.desktop.in.in idjc.appdata.xml.in.in
nodist_appmenu_DATA = ${PACKAGE_NAME}.desktop
appmenudir = ${prefix}/share/applications
+nodist_appdata_DATA = ${PACKAGE_NAME}.appdata.xml
+appdatadir = ${datadir}/appdata
+nodist_pkgdata_DATA = buildinfo
ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = config.rpath m4/ChangeLog
all: config.h
@@ -504,6 +513,8 @@ idjc.in: $(top_builddir)/config.status $(srcdir)/idjc.in.in
cd $(top_builddir) && $(SHELL) ./config.status $@
idjc.desktop.in: $(top_builddir)/config.status $(srcdir)/idjc.desktop.in.in
cd $(top_builddir) && $(SHELL) ./config.status $@
+idjc.appdata.xml.in: $(top_builddir)/config.status $(srcdir)/idjc.appdata.xml.in.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
install-nodist_binSCRIPTS: $(nodist_bin_SCRIPTS)
@$(NORMAL_INSTALL)
@list='$(nodist_bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
@@ -548,6 +559,27 @@ clean-libtool:
distclean-libtool:
-rm -f libtool config.lt
+install-nodist_appdataDATA: $(nodist_appdata_DATA)
+ @$(NORMAL_INSTALL)
+ @list='$(nodist_appdata_DATA)'; test -n "$(appdatadir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(appdatadir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(appdatadir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(appdatadir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(appdatadir)" || exit $$?; \
+ done
+
+uninstall-nodist_appdataDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(nodist_appdata_DATA)'; test -n "$(appdatadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(appdatadir)'; $(am__uninstall_files_from_dir)
install-nodist_appmenuDATA: $(nodist_appmenu_DATA)
@$(NORMAL_INSTALL)
@list='$(nodist_appmenu_DATA)'; test -n "$(appmenudir)" || list=; \
@@ -590,6 +622,27 @@ uninstall-nodist_docDATA:
@list='$(nodist_doc_DATA)'; test -n "$(docdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir)
+install-nodist_pkgdataDATA: $(nodist_pkgdata_DATA)
+ @$(NORMAL_INSTALL)
+ @list='$(nodist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
+ done
+
+uninstall-nodist_pkgdataDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(nodist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(pkgdatadir)'; $(am__uninstall_files_from_dir)
# This directory's subdirectories are mostly independent; you can cd
# into them and run 'make' without going through this Makefile.
@@ -883,7 +936,7 @@ check: check-recursive
all-am: Makefile $(SCRIPTS) $(DATA) config.h
installdirs: installdirs-recursive
installdirs-am:
- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmenudir)" "$(DESTDIR)$(docdir)"; do \
+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appdatadir)" "$(DESTDIR)$(appmenudir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(pkgdatadir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-recursive
@@ -938,7 +991,8 @@ info: info-recursive
info-am:
-install-data-am: install-nodist_appmenuDATA install-nodist_docDATA
+install-data-am: install-nodist_appdataDATA install-nodist_appmenuDATA \
+ install-nodist_docDATA install-nodist_pkgdataDATA
install-dvi: install-dvi-recursive
@@ -984,8 +1038,9 @@ ps: ps-recursive
ps-am:
-uninstall-am: uninstall-nodist_appmenuDATA uninstall-nodist_binSCRIPTS \
- uninstall-nodist_docDATA
+uninstall-am: uninstall-nodist_appdataDATA \
+ uninstall-nodist_appmenuDATA uninstall-nodist_binSCRIPTS \
+ uninstall-nodist_docDATA uninstall-nodist_pkgdataDATA
.MAKE: $(am__recursive_targets) all install-am install-strip
@@ -1000,14 +1055,16 @@ uninstall-am: uninstall-nodist_appmenuDATA uninstall-nodist_binSCRIPTS \
install-data install-data-am install-dvi install-dvi-am \
install-exec install-exec-am install-html install-html-am \
install-info install-info-am install-man \
- install-nodist_appmenuDATA install-nodist_binSCRIPTS \
- install-nodist_docDATA install-pdf install-pdf-am install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs installdirs-am maintainer-clean \
+ install-nodist_appdataDATA install-nodist_appmenuDATA \
+ install-nodist_binSCRIPTS install-nodist_docDATA \
+ install-nodist_pkgdataDATA install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
- uninstall-am uninstall-nodist_appmenuDATA \
- uninstall-nodist_binSCRIPTS uninstall-nodist_docDATA
+ uninstall-am uninstall-nodist_appdataDATA \
+ uninstall-nodist_appmenuDATA uninstall-nodist_binSCRIPTS \
+ uninstall-nodist_docDATA uninstall-nodist_pkgdataDATA
${PACKAGE_NAME}: idjc.in
@@ -1016,6 +1073,9 @@ ${PACKAGE_NAME}: idjc.in
${PACKAGE_NAME}.desktop: idjc.desktop.in
@sed -e 's|$${prefix}|${prefix}|g' -e 's|$${exec_prefix}|${exec_prefix}|g' $? >$@
+${PACKAGE_NAME}.appdata.xml: idjc.appdata.xml.in
+ @sed -e 's|$${prefix}|${prefix}|g' -e 's|$${exec_prefix}|${exec_prefix}|g' $? >$@
+
AUTHORS.gz: AUTHORS
@ gzip -c $? >$@
@@ -1028,8 +1088,17 @@ README.gz: README
ChangeLog.gz: ChangeLog
@ gzip -c $? >$@
+buildinfo:
+ at GIT_VERSION_CONTROL_TRUE@ echo Commit hash: $$(git log -n1 "--pretty=format:%H") > buildinfo
+ at GIT_VERSION_CONTROL_TRUE@ echo Commit date: $$(git log -n1 "--pretty=format:%aD") >> buildinfo
+ at GIT_VERSION_CONTROL_TRUE@ echo Repo status: $$(if test -z "$(git status --porcelain) 2>&1" ; then echo "clean" ; else echo "dirty" ; fi) >> buildinfo
+ at GIT_VERSION_CONTROL_TRUE@ echo Remote URL: $$(git config --get remote.origin.url) >> buildinfo
+ at GIT_VERSION_CONTROL_TRUE@ echo >> buildinfo
+ at GIT_VERSION_CONTROL_FALSE@ rm buildinfo
+ echo Build date: $$(date -R) >> buildinfo
+
clean-local:
- rm -f ChangeLog.gz README.gz NEWS.gz AUTHORS.gz ${PACKAGE_NAME}.desktop idjcctrl ${PACKAGE_NAME}
+ rm -f buildinfo ChangeLog.gz README.gz NEWS.gz AUTHORS.gz ${PACKAGE_NAME}.desktop ${PACKAGE_NAME}.appdata.xml ${PACKAGE_NAME}
dtdist:
make dist
@@ -1039,7 +1108,7 @@ sfpublish:
make dist
curl --retry 3 --connect-timeout 10 -T ${PACKAGE_TARNAME}-${PACKAGE_VERSION}.tar.gz -n sftp://frs.sourceforge.net/home/frs/project/i/id/idjc/idjc/0.8/
-.PHONY: dtdist sfpublish ${PACKAGE_NAME} ${PACKAGE_NAME}.desktop
+.PHONY: buildinfo dtdist sfpublish ${PACKAGE_NAME} ${PACKAGE_NAME}.desktop
# 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.
diff --git a/artwork/Makefile.in b/artwork/Makefile.in
index 4e5680a..7c0fadc 100644
--- a/artwork/Makefile.in
+++ b/artwork/Makefile.in
@@ -180,6 +180,7 @@ EXEEXT = @EXEEXT@
EXT = @EXT@
FGREP = @FGREP@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GIT_PROG_EXISTS = @GIT_PROG_EXISTS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
GMSGFMT = @GMSGFMT@
@@ -237,6 +238,7 @@ LN_S = @LN_S@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
diff --git a/c/Makefile.in b/c/Makefile.in
index dc64779..ab6a5db 100644
--- a/c/Makefile.in
+++ b/c/Makefile.in
@@ -258,6 +258,7 @@ EXEEXT = @EXEEXT@
EXT = @EXT@
FGREP = @FGREP@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GIT_PROG_EXISTS = @GIT_PROG_EXISTS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
GMSGFMT = @GMSGFMT@
@@ -315,6 +316,7 @@ LN_S = @LN_S@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
diff --git a/c/avcodec_encoder.c b/c/avcodec_encoder.c
index f3d8d0d..1e3fbb9 100644
--- a/c/avcodec_encoder.c
+++ b/c/avcodec_encoder.c
@@ -20,6 +20,7 @@
#include "../config.h"
#include <stdio.h>
+#include <string.h>
#include "main.h"
#include "sourceclient.h"
@@ -283,7 +284,7 @@ static AVCodec *aac_codec()
if ((codec = avcodec_find_encoder_by_name(*name)))
return codec;
- return avcodec_find_encoder(CODEC_ID_AAC);
+ return avcodec_find_encoder(AV_CODEC_ID_AAC);
}
static AVCodec *aacplus_codec()
diff --git a/c/avcodecdecode.c b/c/avcodecdecode.c
index e2fbbce..4bc5205 100644
--- a/c/avcodecdecode.c
+++ b/c/avcodecdecode.c
@@ -25,6 +25,10 @@
#include <stdlib.h>
#include <pthread.h>
#include <libavutil/opt.h>
+#ifdef HAVE_LIBAVUTIL_CHANNEL_LAYOUT_H
+#include <libavutil/channel_layout.h>
+#endif
+#include <libavutil/samplefmt.h>
#include "main.h"
#include "xlplayer.h"
#include "avcodecdecode.h"
@@ -80,8 +84,8 @@ static void avcodecdecode_init(struct xlplayer *xlplayer)
av_seek_frame(self->ic, -1, (int64_t)xlplayer->seek_s * AV_TIME_BASE, 0);
switch (self->c->codec_id)
{
- case CODEC_ID_MUSEPACK7: /* add formats here that glitch when seeked */
- case CODEC_ID_MUSEPACK8:
+ case AV_CODEC_ID_MUSEPACK7: /* add formats here that glitch when seeked */
+ case AV_CODEC_ID_MUSEPACK8:
self->drop = 1.6;
fprintf(stderr, "dropping %0.2f seconds of audio\n", self->drop);
default:
@@ -198,7 +202,7 @@ static void avcodecdecode_play(struct xlplayer *xlplayer)
continue;
}
-#ifdef HAVE_SWRESAMPLE
+#if defined (HAVE_SWRESAMPLE) && defined(USE_SWRESAMPLE)
if (!self->swr)
{
int64_t layout;
@@ -229,8 +233,6 @@ static void avcodecdecode_play(struct xlplayer *xlplayer)
av_opt_set_int(self->swr, "out_channel_layout", (self->channels == 2) ? AV_CH_LAYOUT_STEREO : AV_CH_LAYOUT_MONO, 0);
av_opt_set_sample_fmt(self->swr, "in_sample_fmt", self->c->sample_fmt, 0);
av_opt_set_sample_fmt(self->swr, "out_sample_fmt", AV_SAMPLE_FMT_FLT, 0);
- //av_opt_set_int(self->swr, "in_sample_rate", 44100, 0);
- //av_opt_set_int(self->swr, "out_sample_rate", 44100, 0);
if (swr_init(self->swr))
{
@@ -385,7 +387,7 @@ static void avcodecdecode_play(struct xlplayer *xlplayer)
return;
}
-#endif /* HAVE_SWRESAMPLE */
+#endif /* defined (HAVE_SWRESAMPLE) && defined(USE_SWRESAMPLE) */
if (self->resample)
{
@@ -474,7 +476,7 @@ int avcodecdecode_reg(struct xlplayer *xlplayer)
pthread_mutex_unlock(&g.avc_mutex);
self->c = self->ic->streams[self->stream]->codec;
-#ifndef HAVE_SWRESAMPLE
+#ifndef USE_SWRESAMPLE
self->c->request_sample_fmt = AV_SAMPLE_FMT_FLT;
self->c->request_channel_layout = AV_CH_LAYOUT_STEREO_DOWNMIX;
#endif
diff --git a/c/encoder.c b/c/encoder.c
index f5b98b4..0472c5f 100644
--- a/c/encoder.c
+++ b/c/encoder.c
@@ -19,6 +19,7 @@
#include "../config.h"
#include "gnusource.h"
+#include <math.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/c/mixer.c b/c/mixer.c
index e645f30..ba5e549 100644
--- a/c/mixer.c
+++ b/c/mixer.c
@@ -1076,7 +1076,7 @@ static struct mixer {
int fadeout_f;
int flush_left, flush_right, flush_jingles, flush_interlude;
int new_left_pause, new_right_pause, new_inter_pause;
- char *artist, *title, *album, *replaygain;
+ char *artist, *title, *album, *replaygain, *rgloudness;
double length;
int use_dsp;
char midi_output[MIDI_QUEUE_SIZE];
@@ -1420,9 +1420,9 @@ int mixer_main()
if (!strcmp(action, "ogginforequest"))
{
- if (oggdecode_get_metainfo(oggpathname, &s.artist, &s.title, &s.album, &s.length, &s.replaygain))
+ if (oggdecode_get_metainfo(oggpathname, &s.artist, &s.title, &s.album, &s.length, &s.replaygain, &s.rgloudness))
{
- fprintf(g.out, "OIR:ARTIST=%s\nOIR:TITLE=%s\nOIR:ALBUM=%s\nOIR:LENGTH=%f\nOIR:REPLAYGAIN_TRACK_GAIN=%s\nOIR:end\n", s.artist, s.title, s.album, s.length, s.replaygain);
+ fprintf(g.out, "OIR:ARTIST=%s\nOIR:TITLE=%s\nOIR:ALBUM=%s\nOIR:LENGTH=%f\nOIR:REPLAYGAIN_TRACK_GAIN=%s\nOIR:REPLAYGAIN_REFERENCE_LOUDNESS=%s\nOIR:end\n", s.artist, s.title, s.album, s.length, s.replaygain, s.rgloudness);
fflush(g.out);
}
else
diff --git a/c/oggdec.c b/c/oggdec.c
index 1fdb4ff..1c1cfe2 100644
--- a/c/oggdec.c
+++ b/c/oggdec.c
@@ -152,6 +152,8 @@ static unsigned vorbis_get_samplerate(struct oggdec_vars *self) /* attempt to g
}
obtain_tag_info("replaygain_track_gain", &self->replaygain[self->ix], FALSE);
+ obtain_tag_info("replaygain_reference_loudness", &self->rgloudness[self->ix], FALSE);
+
}
else
{
@@ -349,6 +351,7 @@ static void oggflac_metadata_callback(const FLAC__StreamDecoder *decoder, const
copy_tag("album=", &self->album[self->ix], TRUE);
}
copy_tag("replaygain_track_gain=", &self->replaygain[self->ix], FALSE);
+ copy_tag("replaygain_reference_loudness=", &self->rgloudness[self->ix], FALSE);
}
else
fprintf(stderr, "oggflac_metadata_callback: unhandled FLAC metadata type\n");
@@ -744,6 +747,8 @@ static off_t oggscan_eos(struct oggdec_vars *self, off_t offset, off_t offset_en
self->album[self->n_streams - 1] = strdup("");
self->replaygain = realloc(self->replaygain, self->n_streams * sizeof (char *));
self->replaygain[self->n_streams - 1] = strdup("");
+ self->rgloudness = realloc(self->rgloudness, self->n_streams * sizeof (char *));
+ self->rgloudness[self->n_streams - 1] = strdup("");
self->streamtype = realloc(self->streamtype, self->n_streams * sizeof (enum streamtype_t));
self->start_time = realloc(self->start_time, self->n_streams * sizeof (double));
self->duration = realloc(self->duration, self->n_streams * sizeof (double));
@@ -1210,7 +1215,7 @@ int oggdecode_reg(struct xlplayer *xlplayer)
}
}
-int oggdecode_get_metainfo(char *pathname, char **artist, char **title, char **album, double *length, char **replaygain)
+int oggdecode_get_metainfo(char *pathname, char **artist, char **title, char **album, double *length, char **replaygain, char **rgloudness)
{
struct oggdec_vars *self;
int has_pbtime;
@@ -1231,7 +1236,8 @@ int oggdecode_get_metainfo(char *pathname, char **artist, char **title, char **a
*title = realloc(*title, 1);
*album = realloc(*album, 1);
*replaygain = realloc(*replaygain, 1);
- *artist[0] = *title[0] = *album[0] = *replaygain[0] = '\0';
+ *rgloudness = realloc(*rgloudness, 1);
+ *artist[0] = *title[0] = *album[0] = *replaygain[0] = *rgloudness[0] = '\0';
}
else
{
@@ -1282,6 +1288,18 @@ int oggdecode_get_metainfo(char *pathname, char **artist, char **title, char **a
*replaygain = realloc(*replaygain, 1);
*replaygain[0] = '\0';
}
+
+ if (self->rgloudness[0])
+ {
+ if (*rgloudness)
+ free(*rgloudness);
+ *rgloudness = strdup(self->rgloudness[0]);
+ }
+ else
+ {
+ *rgloudness = realloc(*rgloudness, 1);
+ *rgloudness[0] = '\0';
+ }
}
}
diff --git a/c/oggdec.h b/c/oggdec.h
index d8c875e..2ace495 100644
--- a/c/oggdec.h
+++ b/c/oggdec.h
@@ -53,6 +53,7 @@ struct oggdec_vars
char **title;
char **album;
char **replaygain; /* specifically replaygain_track_gain */
+ char **rgloudness; /* specifically replaygain_reference_loudness */
enum streamtype_t *streamtype; /* indicate which type ie vorbis, flac */
double *start_time; /* the time when each stream starts */
double *duration; /* playback time */
@@ -63,7 +64,7 @@ struct oggdec_vars
};
int oggdecode_reg(struct xlplayer *xlplayer);
-int oggdecode_get_metainfo(char *pathname, char **artist, char **title, char **album, double *length, char **replaygain);
+int oggdecode_get_metainfo(char *pathname, char **artist, char **title, char **album, double *length, char **replaygain, char **rgloudness);
int oggdec_get_next_packet(struct oggdec_vars *self);
void oggdecode_dynamic_dispatcher(struct xlplayer *xlplayer);
void oggdecode_playnext(struct xlplayer *xlplayer);
diff --git a/config.guess b/config.guess
index 8b26ecf..8a5d3f4 100755
--- a/config.guess
+++ b/config.guess
@@ -1,8 +1,8 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2013 Free Software Foundation, Inc.
+# Copyright 1992-2015 Free Software Foundation, Inc.
-timestamp='2013-11-29'
+timestamp='2015-03-04'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -24,12 +24,12 @@ timestamp='2013-11-29'
# program. This Exception is an additional permission under section 7
# of the GNU General Public License, version 3 ("GPLv3").
#
-# Originally written by Per Bothner.
+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
#
# You can get the latest version of this script from:
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
#
-# Please send patches with a ChangeLog entry to config-patches at gnu.org.
+# Please send patches to <config-patches at gnu.org>.
me=`echo "$0" | sed -e 's,.*/,,'`
@@ -50,7 +50,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright 1992-2015 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -149,7 +149,7 @@ Linux|GNU|GNU/*)
LIBC=gnu
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
;;
esac
@@ -168,20 +168,27 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# Note: NetBSD doesn't particularly care about the vendor
# portion of the name. We always set it to "unknown".
sysctl="sysctl -n hw.machine_arch"
- UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
- /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+ UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
+ /sbin/$sysctl 2>/dev/null || \
+ /usr/sbin/$sysctl 2>/dev/null || \
+ echo unknown)`
case "${UNAME_MACHINE_ARCH}" in
armeb) machine=armeb-unknown ;;
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
sh5el) machine=sh5le-unknown ;;
+ earmv*)
+ arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
+ endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
+ machine=${arch}${endian}-unknown
+ ;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
# to ELF recently, or will in the future.
case "${UNAME_MACHINE_ARCH}" in
- arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+ arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ELF__
@@ -197,6 +204,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
os=netbsd
;;
esac
+ # Determine ABI tags.
+ case "${UNAME_MACHINE_ARCH}" in
+ earm*)
+ expr='s/^earmv[0-9]/-eabi/;s/eb$//'
+ abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
+ ;;
+ esac
# The OS release
# Debian GNU/NetBSD machines have a different userland, and
# thus, need a distinct triplet. However, they do not need
@@ -213,7 +227,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
# contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- echo "${machine}-${os}${release}"
+ echo "${machine}-${os}${release}${abi}"
exit ;;
*:Bitrig:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
@@ -579,8 +593,9 @@ EOF
else
IBM_ARCH=powerpc
fi
- if [ -x /usr/bin/oslevel ] ; then
- IBM_REV=`/usr/bin/oslevel`
+ if [ -x /usr/bin/lslpp ] ; then
+ IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+ awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
else
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
@@ -826,7 +841,7 @@ EOF
*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
- i*:MSYS*:*)
+ *:MSYS*:*)
echo ${UNAME_MACHINE}-pc-msys
exit ;;
i*:windows32*:*)
@@ -932,6 +947,9 @@ EOF
crisv32:Linux:*:*)
echo ${UNAME_MACHINE}-axis-linux-${LIBC}
exit ;;
+ e2k:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
frv:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
@@ -969,10 +987,10 @@ EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
;;
- or1k:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ openrisc*:Linux:*:*)
+ echo or1k-unknown-linux-${LIBC}
exit ;;
- or32:Linux:*:*)
+ or32:Linux:*:* | or1k*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
padre:Linux:*:*)
@@ -1382,154 +1400,6 @@ EOF
exit ;;
esac
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
- /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
- I don't know.... */
- printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
- printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
- "4"
-#else
- ""
-#endif
- ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
- printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
- printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
- int version;
- version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
- if (version < 4)
- printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
- else
- printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
- exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
- printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
- printf ("ns32k-encore-mach\n"); exit (0);
-#else
- printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
- printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
- printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
- printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
- struct utsname un;
-
- uname(&un);
-
- if (strncmp(un.version, "V2", 2) == 0) {
- printf ("i386-sequent-ptx2\n"); exit (0);
- }
- if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
- printf ("i386-sequent-ptx1\n"); exit (0);
- }
- printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-# include <sys/param.h>
-# if defined (BSD)
-# if BSD == 43
- printf ("vax-dec-bsd4.3\n"); exit (0);
-# else
-# if BSD == 199006
- printf ("vax-dec-bsd4.3reno\n"); exit (0);
-# else
- printf ("vax-dec-bsd\n"); exit (0);
-# endif
-# endif
-# else
- printf ("vax-dec-bsd\n"); exit (0);
-# endif
-# else
- printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
- printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
- exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
- { echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
- case `getsysinfo -f cpu_type` in
- c1*)
- echo c1-convex-bsd
- exit ;;
- c2*)
- if getsysinfo -f scalar_acc
- then echo c32-convex-bsd
- else echo c2-convex-bsd
- fi
- exit ;;
- c34*)
- echo c34-convex-bsd
- exit ;;
- c38*)
- echo c38-convex-bsd
- exit ;;
- c4*)
- echo c4-convex-bsd
- exit ;;
- esac
-fi
-
cat >&2 <<EOF
$0: unable to guess system type
diff --git a/config.h.in b/config.h.in
index 9b171ef..48c0b99 100644
--- a/config.h.in
+++ b/config.h.in
@@ -67,6 +67,9 @@
/* Define to 1 if you have the <lame/lame.h> header file. */
#undef HAVE_LAME_LAME_H
+/* Define to 1 if you have the <libavutil/channel_layout.h> header file. */
+#undef HAVE_LIBAVUTIL_CHANNEL_LAYOUT_H
+
/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
to 0 otherwise. */
#undef HAVE_MALLOC
@@ -134,8 +137,7 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
- */
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
#undef LT_OBJDIR
/* Define to 1 if your C compiler doesn't accept -c and -o together. */
@@ -171,6 +173,9 @@
/* Set if GNU extensions need to be replicated */
#undef USE_BSD_COMPAT
+/* Set if libswresample allows format conversion */
+#undef USE_SWRESAMPLE
+
/* Version number of package */
#undef VERSION
diff --git a/config.sub b/config.sub
index 4ffb084..430106a 100755
--- a/config.sub
+++ b/config.sub
@@ -1,8 +1,8 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright 1992-2013 Free Software Foundation, Inc.
+# Copyright 1992-2015 Free Software Foundation, Inc.
-timestamp='2013-10-01'
+timestamp='2015-03-08'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@ timestamp='2013-10-01'
# of the GNU General Public License, version 3 ("GPLv3").
-# Please send patches with a ChangeLog entry to config-patches at gnu.org.
+# Please send patches to <config-patches at gnu.org>.
#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
@@ -68,7 +68,7 @@ Report bugs and patches to <config-patches at gnu.org>."
version="\
GNU config.sub ($timestamp)
-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright 1992-2015 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -117,7 +117,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
- knetbsd*-gnu* | netbsd*-gnu* | \
+ knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
kopensolaris*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
@@ -259,8 +259,8 @@ case $basic_machine in
| bfin \
| c4x | c8051 | clipper \
| d10v | d30v | dlx | dsp16xx | dvp \
- | epiphany \
- | fido | fr30 | frv \
+ | e2k | epiphany \
+ | fido | fr30 | frv | ft32 \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| hexagon \
| i370 | i860 | i960 | ia64 \
@@ -283,8 +283,10 @@ case $basic_machine in
| mips64vr5900 | mips64vr5900el \
| mipsisa32 | mipsisa32el \
| mipsisa32r2 | mipsisa32r2el \
+ | mipsisa32r6 | mipsisa32r6el \
| mipsisa64 | mipsisa64el \
| mipsisa64r2 | mipsisa64r2el \
+ | mipsisa64r6 | mipsisa64r6el \
| mipsisa64sb1 | mipsisa64sb1el \
| mipsisa64sr71k | mipsisa64sr71kel \
| mipsr5900 | mipsr5900el \
@@ -296,11 +298,11 @@ case $basic_machine in
| nds32 | nds32le | nds32be \
| nios | nios2 | nios2eb | nios2el \
| ns16k | ns32k \
- | open8 \
- | or1k | or32 \
+ | open8 | or1k | or1knd | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
+ | riscv32 | riscv64 \
| rl78 | rx \
| score \
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
@@ -311,6 +313,7 @@ case $basic_machine in
| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
| ubicom32 \
| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+ | visium \
| we32k \
| x86 | xc16x | xstormy16 | xtensa \
| z8k | z80)
@@ -325,6 +328,9 @@ case $basic_machine in
c6x)
basic_machine=tic6x-unknown
;;
+ leon|leon[3-9])
+ basic_machine=sparc-$basic_machine
+ ;;
m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
basic_machine=$basic_machine-unknown
os=-none
@@ -375,7 +381,7 @@ case $basic_machine in
| c[123]* | c30-* | [cjt]90-* | c4x-* \
| c8051-* | clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
- | elxsi-* \
+ | e2k-* | elxsi-* \
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
@@ -402,8 +408,10 @@ case $basic_machine in
| mips64vr5900-* | mips64vr5900el-* \
| mipsisa32-* | mipsisa32el-* \
| mipsisa32r2-* | mipsisa32r2el-* \
+ | mipsisa32r6-* | mipsisa32r6el-* \
| mipsisa64-* | mipsisa64el-* \
| mipsisa64r2-* | mipsisa64r2el-* \
+ | mipsisa64r6-* | mipsisa64r6el-* \
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
| mipsr5900-* | mipsr5900el-* \
@@ -415,6 +423,7 @@ case $basic_machine in
| nios-* | nios2-* | nios2eb-* | nios2el-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| open8-* \
+ | or1k*-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
@@ -432,6 +441,7 @@ case $basic_machine in
| ubicom32-* \
| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
| vax-* \
+ | visium-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* \
| xstormy16-* | xtensa*-* \
@@ -508,6 +518,9 @@ case $basic_machine in
basic_machine=i386-pc
os=-aros
;;
+ asmjs)
+ basic_machine=asmjs-unknown
+ ;;
aux)
basic_machine=m68k-apple
os=-aux
@@ -769,6 +782,9 @@ case $basic_machine in
basic_machine=m68k-isi
os=-sysv
;;
+ leon-*|leon[3-9]-*)
+ basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
+ ;;
m68knommu)
basic_machine=m68k-unknown
os=-linux
@@ -842,6 +858,10 @@ case $basic_machine in
basic_machine=powerpc-unknown
os=-morphos
;;
+ moxiebox)
+ basic_machine=moxie-unknown
+ os=-moxiebox
+ ;;
msdos)
basic_machine=i386-pc
os=-msdos
@@ -1374,7 +1394,7 @@ case $os in
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
| -sym* | -kopensolaris* | -plan9* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- | -aos* | -aros* \
+ | -aos* | -aros* | -cloudabi* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
@@ -1387,14 +1407,14 @@ case $os in
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
| -linux-newlib* | -linux-musl* | -linux-uclibc* \
- | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -irx* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1612,9 +1632,6 @@ case $basic_machine in
mips*-*)
os=-elf
;;
- or1k-*)
- os=-elf
- ;;
or32-*)
os=-coff
;;
diff --git a/configure b/configure
index 25f5999..955e0d3 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for idjc 0.8.14.
+# Generated by GNU Autoconf 2.69 for idjc 0.8.15.
#
# Report bugs to <http://idjc.sourceforge.net>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='idjc'
PACKAGE_TARNAME='idjc'
-PACKAGE_VERSION='0.8.14'
-PACKAGE_STRING='idjc 0.8.14'
+PACKAGE_VERSION='0.8.15'
+PACKAGE_STRING='idjc 0.8.15'
PACKAGE_BUGREPORT='http://idjc.sourceforge.net'
PACKAGE_URL=''
@@ -677,6 +677,9 @@ HAVE_AVFORMAT
LIBAVCODEC_LIBS
LIBAVCODEC_CFLAGS
HAVE_AVCODEC
+GIT_VERSION_CONTROL_FALSE
+GIT_VERSION_CONTROL_TRUE
+GIT_PROG_EXISTS
GLIB_LIBS
GLIB_CFLAGS
LIBSNDFILE_LIBS
@@ -710,6 +713,7 @@ MSGFMT
GETTEXT_MACRO_VERSION
USE_NLS
CPP
+LT_SYS_LIBRARY_PATH
OTOOL64
OTOOL
LIPO
@@ -845,6 +849,7 @@ enable_static
enable_shared
with_pic
enable_fast_install
+with_aix_soname
enable_dependency_tracking
with_gnu_ld
with_sysroot
@@ -870,6 +875,7 @@ CFLAGS
LDFLAGS
LIBS
CPPFLAGS
+LT_SYS_LIBRARY_PATH
CPP
PKG_CONFIG
PKG_CONFIG_PATH
@@ -1448,7 +1454,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures idjc 0.8.14 to adapt to many kinds of systems.
+\`configure' configures idjc 0.8.15 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1519,7 +1525,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of idjc 0.8.14:";;
+ short | recursive ) echo "Configuration of idjc 0.8.15:";;
esac
cat <<\_ACEOF
@@ -1553,9 +1559,12 @@ Optional Packages:
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
both]
+ --with-aix-soname=aix|svr4|both
+ shared library versioning (aka "SONAME") variant to
+ provide on AIX, [default=aix].
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
- --with-sysroot=DIR Search for dependent libraries within DIR
- (or the compiler's sysroot if not specified).
+ --with-sysroot[=DIR] Search for dependent libraries within DIR (or the
+ compiler's sysroot if not specified).
--with-gnu-ld assume the C compiler uses GNU ld default=no
--with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
--without-libiconv-prefix don't search for libiconv in includedir and libdir
@@ -1571,6 +1580,8 @@ Some influential environment variables:
LIBS libraries to pass to the linker, e.g. -l<library>
CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
+ LT_SYS_LIBRARY_PATH
+ User-defined run-time library search path.
CPP C preprocessor
PKG_CONFIG path to pkg-config utility
PKG_CONFIG_PATH
@@ -1706,7 +1717,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-idjc configure 0.8.14
+idjc configure 0.8.15
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2129,7 +2140,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by idjc $as_me 0.8.14, which was
+It was created by idjc $as_me 0.8.15, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2478,7 +2489,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-COPYRIGHT_YEAR=2013
+COPYRIGHT_YEAR=2015
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -3107,7 +3118,7 @@ fi
# Define the identity of the package.
PACKAGE='idjc'
- VERSION='0.8.14'
+ VERSION='0.8.15'
cat >>confdefs.h <<_ACEOF
@@ -3437,8 +3448,8 @@ esac
-macro_version='2.4.2'
-macro_revision='1.3337'
+macro_version='2.4.6'
+macro_revision='2.4.6'
@@ -3452,7 +3463,7 @@ macro_revision='1.3337'
-ltmain="$ac_aux_dir/ltmain.sh"
+ltmain=$ac_aux_dir/ltmain.sh
# Backslashify metacharacters that are still active within
# double-quoted strings.
@@ -3501,7 +3512,7 @@ func_echo_all ()
$ECHO ""
}
-case "$ECHO" in
+case $ECHO in
printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
$as_echo "printf" >&6; } ;;
print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
@@ -4804,19 +4815,19 @@ test -z "$GREP" && GREP=grep
# Check whether --with-gnu-ld was given.
if test "${with_gnu_ld+set}" = set; then :
- withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+ withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
else
with_gnu_ld=no
fi
ac_prog=ld
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
# Check if gcc -print-prog-name=ld gives a path.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
+ # gcc leaves a trailing carriage return, which upsets mingw
ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
*)
ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
@@ -4830,7 +4841,7 @@ $as_echo_n "checking for ld used by $CC... " >&6; }
while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
done
- test -z "$LD" && LD="$ac_prog"
+ test -z "$LD" && LD=$ac_prog
;;
"")
# If it fails, then pretend we aren't using GCC.
@@ -4841,7 +4852,7 @@ $as_echo_n "checking for ld used by $CC... " >&6; }
with_gnu_ld=unknown
;;
esac
-elif test "$with_gnu_ld" = yes; then
+elif test yes = "$with_gnu_ld"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
$as_echo_n "checking for GNU ld... " >&6; }
else
@@ -4852,32 +4863,32 @@ if ${lt_cv_path_LD+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
for ac_dir in $PATH; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
- lt_cv_path_LD="$ac_dir/$ac_prog"
+ lt_cv_path_LD=$ac_dir/$ac_prog
# Check to see if the program is GNU ld. I'd rather use --version,
# but apparently some variants of GNU ld only accept -v.
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
- test "$with_gnu_ld" != no && break
+ test no != "$with_gnu_ld" && break
;;
*)
- test "$with_gnu_ld" != yes && break
+ test yes != "$with_gnu_ld" && break
;;
esac
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
else
- lt_cv_path_LD="$LD" # Let the user override the test with a path.
+ lt_cv_path_LD=$LD # Let the user override the test with a path.
fi
fi
-LD="$lt_cv_path_LD"
+LD=$lt_cv_path_LD
if test -n "$LD"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
$as_echo "$LD" >&6; }
@@ -4920,33 +4931,38 @@ if ${lt_cv_path_NM+:} false; then :
else
if test -n "$NM"; then
# Let the user override the test.
- lt_cv_path_NM="$NM"
+ lt_cv_path_NM=$NM
else
- lt_nm_to_check="${ac_tool_prefix}nm"
+ lt_nm_to_check=${ac_tool_prefix}nm
if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
lt_nm_to_check="$lt_nm_to_check nm"
fi
for lt_tmp_nm in $lt_nm_to_check; do
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
- tmp_nm="$ac_dir/$lt_tmp_nm"
- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+ tmp_nm=$ac_dir/$lt_tmp_nm
+ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
# Check to see if the nm accepts a BSD-compat flag.
- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+ # Adding the 'sed 1q' prevents false positives on HP-UX, which says:
# nm: unknown option "B" ignored
# Tru64's nm complains that /dev/null is an invalid object file
- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
- */dev/null* | *'Invalid file or object type'*)
+ # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+ case $build_os in
+ mingw*) lt_bad_file=conftest.nm/nofile ;;
+ *) lt_bad_file=/dev/null ;;
+ esac
+ case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+ *$lt_bad_file* | *'Invalid file or object type'*)
lt_cv_path_NM="$tmp_nm -B"
- break
+ break 2
;;
*)
case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
*/dev/null*)
lt_cv_path_NM="$tmp_nm -p"
- break
+ break 2
;;
*)
lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
@@ -4957,15 +4973,15 @@ else
esac
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
done
: ${lt_cv_path_NM=no}
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
$as_echo "$lt_cv_path_NM" >&6; }
-if test "$lt_cv_path_NM" != "no"; then
- NM="$lt_cv_path_NM"
+if test no != "$lt_cv_path_NM"; then
+ NM=$lt_cv_path_NM
else
# Didn't find any BSD compatible name lister, look for dumpbin.
if test -n "$DUMPBIN"; then :
@@ -5071,9 +5087,9 @@ esac
fi
fi
- case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+ case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
*COFF*)
- DUMPBIN="$DUMPBIN -symbols"
+ DUMPBIN="$DUMPBIN -symbols -headers"
;;
*)
DUMPBIN=:
@@ -5081,8 +5097,8 @@ fi
esac
fi
- if test "$DUMPBIN" != ":"; then
- NM="$DUMPBIN"
+ if test : != "$DUMPBIN"; then
+ NM=$DUMPBIN
fi
fi
test -z "$NM" && NM=nm
@@ -5133,7 +5149,7 @@ if ${lt_cv_sys_max_cmd_len+:} false; then :
$as_echo_n "(cached) " >&6
else
i=0
- teststring="ABCD"
+ teststring=ABCD
case $build_os in
msdosdjgpp*)
@@ -5173,7 +5189,7 @@ else
lt_cv_sys_max_cmd_len=8192;
;;
- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+ bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
# This has been around since 386BSD, at least. Likely further.
if test -x /sbin/sysctl; then
lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -5223,22 +5239,23 @@ else
;;
*)
lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
- if test -n "$lt_cv_sys_max_cmd_len"; then
+ if test -n "$lt_cv_sys_max_cmd_len" && \
+ test undefined != "$lt_cv_sys_max_cmd_len"; then
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
else
# Make teststring a little bigger before we do anything with it.
# a 1K string should be a reasonable start.
- for i in 1 2 3 4 5 6 7 8 ; do
+ for i in 1 2 3 4 5 6 7 8; do
teststring=$teststring$teststring
done
SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
- while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
+ while { test X`env echo "$teststring$teststring" 2>/dev/null` \
= "X$teststring$teststring"; } >/dev/null 2>&1 &&
- test $i != 17 # 1/2 MB should be enough
+ test 17 != "$i" # 1/2 MB should be enough
do
i=`expr $i + 1`
teststring=$teststring$teststring
@@ -5256,7 +5273,7 @@ else
fi
-if test -n $lt_cv_sys_max_cmd_len ; then
+if test -n "$lt_cv_sys_max_cmd_len"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
else
@@ -5274,30 +5291,6 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
: ${MV="mv -f"}
: ${RM="rm -f"}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
-$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
- test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
- = c,a/b,b/c, \
- && eval 'test $(( 1 + 1 )) -eq 2 \
- && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
- && xsi_shell=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
-$as_echo "$xsi_shell" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
-$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
- >/dev/null 2>&1 \
- && lt_shell_append=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
-$as_echo "$lt_shell_append" >&6; }
-
-
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
lt_unset=unset
else
@@ -5420,13 +5413,13 @@ esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
case $host_os in
cygwin* | mingw* | pw32* | cegcc*)
- if test "$GCC" != yes; then
+ if test yes != "$GCC"; then
reload_cmds=false
fi
;;
darwin*)
- if test "$GCC" = yes; then
- reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+ if test yes = "$GCC"; then
+ reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
else
reload_cmds='$LD$reload_flag -o $output$reload_objs'
fi
@@ -5554,13 +5547,13 @@ lt_cv_deplibs_check_method='unknown'
# Need to set the preceding variable on all platforms that support
# interlibrary dependencies.
# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
+# 'unknown' -- same as none, but documents that we really don't know.
# 'pass_all' -- all dependencies passed with no checks.
# 'test_compile' -- check by making test program.
# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
+# that responds to the $file_magic_cmd with a given extended regex.
+# If you have 'file' or equivalent on your system and you're not sure
+# whether 'pass_all' will *always* work, you probably want this one.
case $host_os in
aix[4-9]*)
@@ -5587,8 +5580,7 @@ mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
# func_win32_libid shell function, so use a weaker test based on 'objdump',
# unless we find 'file', for example because we are cross-compiling.
- # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
- if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+ if ( file / ) >/dev/null 2>&1; then
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
lt_cv_file_magic_cmd='func_win32_libid'
else
@@ -5624,10 +5616,6 @@ freebsd* | dragonfly*)
fi
;;
-gnu*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
haiku*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -5666,7 +5654,7 @@ irix5* | irix6* | nonstopux*)
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -5688,8 +5676,8 @@ newos6*)
lt_cv_deplibs_check_method=pass_all
;;
-openbsd*)
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+openbsd* | bitrig*)
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
else
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
@@ -5742,6 +5730,9 @@ sysv4 | sysv4.3*)
tpf*)
lt_cv_deplibs_check_method=pass_all
;;
+os2*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
esac
fi
@@ -5899,8 +5890,8 @@ else
case $host_os in
cygwin* | mingw* | pw32* | cegcc*)
- # two different shell functions defined in ltmain.sh
- # decide which to use based on capabilities of $DLLTOOL
+ # two different shell functions defined in ltmain.sh;
+ # decide which one to use based on capabilities of $DLLTOOL
case `$DLLTOOL --help 2>&1` in
*--identify-strict*)
lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
@@ -5912,7 +5903,7 @@ cygwin* | mingw* | pw32* | cegcc*)
;;
*)
# fallback: assume linklib IS sharedlib
- lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+ lt_cv_sharedlib_from_linklib_cmd=$ECHO
;;
esac
@@ -6067,7 +6058,7 @@ if ac_fn_c_try_compile "$LINENO"; then :
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
- if test "$ac_status" -eq 0; then
+ if test 0 -eq "$ac_status"; then
# Ensure the archiver fails upon bogus file names.
rm -f conftest.$ac_objext libconftest.a
{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
@@ -6075,7 +6066,7 @@ if ac_fn_c_try_compile "$LINENO"; then :
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
- if test "$ac_status" -ne 0; then
+ if test 0 -ne "$ac_status"; then
lt_cv_ar_at_file=@
fi
fi
@@ -6088,7 +6079,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
$as_echo "$lt_cv_ar_at_file" >&6; }
-if test "x$lt_cv_ar_at_file" = xno; then
+if test no = "$lt_cv_ar_at_file"; then
archiver_list_spec=
else
archiver_list_spec=$lt_cv_ar_at_file
@@ -6305,7 +6296,7 @@ old_postuninstall_cmds=
if test -n "$RANLIB"; then
case $host_os in
- openbsd*)
+ bitrig* | openbsd*)
old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
;;
*)
@@ -6395,7 +6386,7 @@ cygwin* | mingw* | pw32* | cegcc*)
symcode='[ABCDGISTW]'
;;
hpux*)
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
symcode='[ABCDEGRST]'
fi
;;
@@ -6428,14 +6419,44 @@ case `$NM -V 2>&1` in
symcode='[ABCDGIRSTW]' ;;
esac
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+ # Gets list of data symbols to import.
+ lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
+ # Adjust the below global symbol transforms to fixup imported variables.
+ lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
+ lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'"
+ lt_c_name_lib_hook="\
+ -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\
+ -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'"
+else
+ # Disable hooks by default.
+ lt_cv_sys_global_symbol_to_import=
+ lt_cdecl_hook=
+ lt_c_name_hook=
+ lt_c_name_lib_hook=
+fi
+
# Transform an extracted symbol line into a proper C declaration.
# Some systems (esp. on ia64) link data and code symbols differently,
# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+lt_cv_sys_global_symbol_to_cdecl="sed -n"\
+$lt_cdecl_hook\
+" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
+$lt_c_name_hook\
+" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'"
+
+# Transform an extracted symbol line into symbol name with lib prefix and
+# symbol address.
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+$lt_c_name_lib_hook\
+" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'"
# Handle CRLF in mingw tool chain
opt_cr=
@@ -6453,21 +6474,24 @@ for ac_symprfx in "" "_"; do
# Write the raw and C identifiers.
if test "$lt_cv_nm_interface" = "MS dumpbin"; then
- # Fake it for dumpbin and say T for any non-static function
- # and D for any global variable.
+ # Fake it for dumpbin and say T for any non-static function,
+ # D for any global variable and I for any imported variable.
# Also find C++ and __fastcall symbols from MSVC++,
# which start with @ or ?.
lt_cv_sys_global_symbol_pipe="$AWK '"\
" {last_section=section; section=\$ 3};"\
" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
+" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
+" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
" \$ 0!~/External *\|/{next};"\
" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
" {if(hide[section]) next};"\
-" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-" s[1]~/^[@?]/{print s[1], s[1]; next};"\
-" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
+" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
+" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
+" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
" ' prfx=^$ac_symprfx"
else
lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
@@ -6515,11 +6539,11 @@ _LT_EOF
if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
cat <<_LT_EOF > conftest.$ac_ext
/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
relocations are performed -- see ld's documentation on pseudo-relocs. */
# define LT_DLSYM_CONST
-#elif defined(__osf__)
+#elif defined __osf__
/* This system does not cope well with relocations in const data. */
# define LT_DLSYM_CONST
#else
@@ -6545,7 +6569,7 @@ lt__PROGRAM__LTX_preloaded_symbols[] =
{
{ "@PROGRAM@", (void *) 0 },
_LT_EOF
- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+ $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
cat <<\_LT_EOF >> conftest.$ac_ext
{0, (void *) 0}
};
@@ -6565,13 +6589,13 @@ _LT_EOF
mv conftest.$ac_objext conftstm.$ac_objext
lt_globsym_save_LIBS=$LIBS
lt_globsym_save_CFLAGS=$CFLAGS
- LIBS="conftstm.$ac_objext"
+ LIBS=conftstm.$ac_objext
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
(eval $ac_link) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && test -s conftest${ac_exeext}; then
+ test $ac_status = 0; } && test -s conftest$ac_exeext; then
pipe_works=yes
fi
LIBS=$lt_globsym_save_LIBS
@@ -6592,7 +6616,7 @@ _LT_EOF
rm -rf conftest* conftst*
# Do not use the global_symbol_pipe unless it works.
- if test "$pipe_works" = yes; then
+ if test yes = "$pipe_works"; then
break
else
lt_cv_sys_global_symbol_pipe=
@@ -6645,6 +6669,16 @@ fi
+
+
+
+
+
+
+
+
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
$as_echo_n "checking for sysroot... " >&6; }
@@ -6657,9 +6691,9 @@ fi
lt_sysroot=
-case ${with_sysroot} in #(
+case $with_sysroot in #(
yes)
- if test "$GCC" = yes; then
+ if test yes = "$GCC"; then
lt_sysroot=`$CC --print-sysroot 2>/dev/null`
fi
;; #(
@@ -6669,8 +6703,8 @@ case ${with_sysroot} in #(
no|'')
;; #(
*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
-$as_echo "${with_sysroot}" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
+$as_echo "$with_sysroot" >&6; }
as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
;;
esac
@@ -6682,18 +6716,99 @@ $as_echo "${lt_sysroot:-no}" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
+$as_echo_n "checking for a working dd... " >&6; }
+if ${ac_cv_path_lt_DD+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+: ${lt_DD:=$DD}
+if test -z "$lt_DD"; then
+ ac_path_lt_DD_found=false
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in dd; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext"
+ as_fn_executable_p "$ac_path_lt_DD" || continue
+if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+ cmp -s conftest.i conftest.out \
+ && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+fi
+ $ac_path_lt_DD_found && break 3
+ done
+ done
+ done
+IFS=$as_save_IFS
+ if test -z "$ac_cv_path_lt_DD"; then
+ :
+ fi
+else
+ ac_cv_path_lt_DD=$lt_DD
+fi
+
+rm -f conftest.i conftest2.i conftest.out
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
+$as_echo "$ac_cv_path_lt_DD" >&6; }
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
+$as_echo_n "checking how to truncate binary pipes... " >&6; }
+if ${lt_cv_truncate_bin+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+lt_cv_truncate_bin=
+if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+ cmp -s conftest.i conftest.out \
+ && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+fi
+rm -f conftest.i conftest2.i conftest.out
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
+$as_echo "$lt_cv_truncate_bin" >&6; }
+
+
+
+
+
+
+
+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+ for cc_temp in $*""; do
+ case $cc_temp in
+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+ \-*) ;;
+ *) break;;
+ esac
+ done
+ func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+
# Check whether --enable-libtool-lock was given.
if test "${enable_libtool_lock+set}" = set; then :
enableval=$enable_libtool_lock;
fi
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+test no = "$enable_libtool_lock" || enable_libtool_lock=yes
# Some flags need to be propagated to the compiler or linker for good
# libtool support.
case $host in
ia64-*-hpux*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set mode
+ # options accordingly.
echo 'int i;' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
@@ -6702,24 +6817,25 @@ ia64-*-hpux*)
test $ac_status = 0; }; then
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
- HPUX_IA64_MODE="32"
+ HPUX_IA64_MODE=32
;;
*ELF-64*)
- HPUX_IA64_MODE="64"
+ HPUX_IA64_MODE=64
;;
esac
fi
rm -rf conftest*
;;
*-*-irix6*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
echo '#line '$LINENO' "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- if test "$lt_cv_prog_gnu_ld" = yes; then
+ if test yes = "$lt_cv_prog_gnu_ld"; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
LD="${LD-ld} -melf32bsmip"
@@ -6748,9 +6864,50 @@ ia64-*-hpux*)
rm -rf conftest*
;;
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+mips64*-*linux*)
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
+ echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ emul=elf
+ case `/usr/bin/file conftest.$ac_objext` in
+ *32-bit*)
+ emul="${emul}32"
+ ;;
+ *64-bit*)
+ emul="${emul}64"
+ ;;
+ esac
+ case `/usr/bin/file conftest.$ac_objext` in
+ *MSB*)
+ emul="${emul}btsmip"
+ ;;
+ *LSB*)
+ emul="${emul}ltsmip"
+ ;;
+ esac
+ case `/usr/bin/file conftest.$ac_objext` in
+ *N32*)
+ emul="${emul}n32"
+ ;;
+ esac
+ LD="${LD-ld} -m $emul"
+ fi
+ rm -rf conftest*
+ ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly. Note that the listed cases only cover the
+ # situations where additional linker options are needed (such as when
+ # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+ # vice versa); the common cases where no linker options are needed do
+ # not appear in the list.
echo 'int i;' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
@@ -6764,9 +6921,19 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
LD="${LD-ld} -m elf_i386_fbsd"
;;
x86_64-*linux*)
- LD="${LD-ld} -m elf_i386"
+ case `/usr/bin/file conftest.o` in
+ *x86-64*)
+ LD="${LD-ld} -m elf32_x86_64"
+ ;;
+ *)
+ LD="${LD-ld} -m elf_i386"
+ ;;
+ esac
+ ;;
+ powerpc64le-*linux*)
+ LD="${LD-ld} -m elf32lppclinux"
;;
- ppc64-*linux*|powerpc64-*linux*)
+ powerpc64-*linux*)
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
@@ -6785,7 +6952,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
- ppc*-*linux*|powerpc*-*linux*)
+ powerpcle-*linux*)
+ LD="${LD-ld} -m elf64lppc"
+ ;;
+ powerpc-*linux*)
LD="${LD-ld} -m elf64ppc"
;;
s390*-*linux*|s390*-*tpf*)
@@ -6803,7 +6973,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
*-*-sco3.2v5*)
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
- SAVE_CFLAGS="$CFLAGS"
+ SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -belf"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
@@ -6843,13 +7013,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
$as_echo "$lt_cv_cc_needs_belf" >&6; }
- if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+ if test yes != "$lt_cv_cc_needs_belf"; then
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
- CFLAGS="$SAVE_CFLAGS"
+ CFLAGS=$SAVE_CFLAGS
fi
;;
*-*solaris*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
echo 'int i;' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
@@ -6861,7 +7032,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
case $lt_cv_prog_gnu_ld in
yes*)
case $host in
- i?86-*-solaris*)
+ i?86-*-solaris*|x86_64-*-solaris*)
LD="${LD-ld} -m elf_x86_64"
;;
sparc*-*-solaris*)
@@ -6870,7 +7041,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
esac
# GNU ld 2.21 introduced _sol2 emulations. Use them if available.
if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
- LD="${LD-ld}_sol2"
+ LD=${LD-ld}_sol2
fi
;;
*)
@@ -6886,7 +7057,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
;;
esac
-need_locks="$enable_libtool_lock"
+need_locks=$enable_libtool_lock
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
@@ -6997,7 +7168,7 @@ else
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
$as_echo "$lt_cv_path_mainfest_tool" >&6; }
-if test "x$lt_cv_path_mainfest_tool" != xyes; then
+if test yes != "$lt_cv_path_mainfest_tool"; then
MANIFEST_TOOL=:
fi
@@ -7500,7 +7671,7 @@ if ${lt_cv_apple_cc_single_mod+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
- if test -z "${LT_MULTI_MODULE}"; then
+ if test -z "$LT_MULTI_MODULE"; then
# By default we will add the -single_module flag. You can override
# by either setting the environment variable LT_MULTI_MODULE
# non-empty at configure time, or by adding -multi_module to the
@@ -7518,7 +7689,7 @@ else
cat conftest.err >&5
# Otherwise, if the output was created with a 0 exit code from
# the compiler, it worked.
- elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+ elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
lt_cv_apple_cc_single_mod=yes
else
cat conftest.err >&5
@@ -7557,7 +7728,7 @@ else
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS=$save_LDFLAGS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
@@ -7586,7 +7757,7 @@ _LT_EOF
_lt_result=$?
if test -s conftest.err && $GREP force_load conftest.err; then
cat conftest.err >&5
- elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+ elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
lt_cv_ld_force_load=yes
else
cat conftest.err >&5
@@ -7599,32 +7770,32 @@ fi
$as_echo "$lt_cv_ld_force_load" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+ _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
darwin1.*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
darwin*) # darwin 5.x on
# if running on 10.5 or later, the deployment target defaults
# to the OS version, if on x86, and 10.4, the deployment
# target defaults to 10.4. Don't you love it?
case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
10.0,*86*-darwin8*|10.0,*-darwin[91]*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
- 10.[012]*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+ 10.[012][,.]*)
+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
10.*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
esac
;;
esac
- if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+ if test yes = "$lt_cv_apple_cc_single_mod"; then
_lt_dar_single_mod='$single_module'
fi
- if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
- _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+ if test yes = "$lt_cv_ld_exported_symbols_list"; then
+ _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
else
- _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
fi
- if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+ if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
_lt_dsymutil='~$DSYMUTIL $lib || :'
else
_lt_dsymutil=
@@ -7632,6 +7803,41 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
;;
esac
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+# string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+# string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+# string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+# "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+# VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+ case x$2 in
+ x)
+ ;;
+ *:)
+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+ ;;
+ x:*)
+ eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+ ;;
+ *::*)
+ eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+ eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+ ;;
+ *)
+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+ ;;
+ esac
+}
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -7926,14 +8132,14 @@ if test "${enable_static+set}" = set; then :
*)
enable_static=no
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_static=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac
else
@@ -7964,14 +8170,14 @@ if test "${enable_shared+set}" = set; then :
*)
enable_shared=no
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_shared=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac
else
@@ -7996,14 +8202,14 @@ if test "${with_pic+set}" = set; then :
*)
pic_mode=default
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for lt_pkg in $withval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$lt_pkg" = "X$lt_p"; then
pic_mode=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac
else
@@ -8011,8 +8217,6 @@ else
fi
-test -z "$pic_mode" && pic_mode=default
-
@@ -8028,14 +8232,14 @@ if test "${enable_fast_install+set}" = set; then :
*)
enable_fast_install=no
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_fast_install=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac
else
@@ -8049,11 +8253,63 @@ fi
+ shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[5-9]*,yes)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+$as_echo_n "checking which variant of shared library versioning to provide... " >&6; }
+
+# Check whether --with-aix-soname was given.
+if test "${with_aix_soname+set}" = set; then :
+ withval=$with_aix_soname; case $withval in
+ aix|svr4|both)
+ ;;
+ *)
+ as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
+ ;;
+ esac
+ lt_cv_with_aix_soname=$with_aix_soname
+else
+ if ${lt_cv_with_aix_soname+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_with_aix_soname=aix
+fi
+
+ with_aix_soname=$lt_cv_with_aix_soname
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
+$as_echo "$with_aix_soname" >&6; }
+ if test aix != "$with_aix_soname"; then
+ # For the AIX way of multilib, we name the shared archive member
+ # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+ # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+ # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+ # the AIX toolchain works better with OBJECT_MODE set (default 32).
+ if test 64 = "${OBJECT_MODE-32}"; then
+ shared_archive_member_spec=shr_64
+ else
+ shared_archive_member_spec=shr
+ fi
+ fi
+ ;;
+*)
+ with_aix_soname=aix
+ ;;
+esac
+
+
+
+
+
+
+
# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
+LIBTOOL_DEPS=$ltmain
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -8102,7 +8358,7 @@ test -z "$LN_S" && LN_S="ln -s"
-if test -n "${ZSH_VERSION+set}" ; then
+if test -n "${ZSH_VERSION+set}"; then
setopt NO_GLOB_SUBST
fi
@@ -8141,7 +8397,7 @@ aix3*)
# AIX sometimes has problems with the GCC collect2 program. For some
# reason, if we set the COLLECT_NAMES environment variable, the problems
# vanish in a puff of smoke.
- if test "X${COLLECT_NAMES+set}" != Xset; then
+ if test set != "${COLLECT_NAMES+set}"; then
COLLECT_NAMES=
export COLLECT_NAMES
fi
@@ -8152,14 +8408,14 @@ esac
ofile=libtool
can_build_shared=yes
-# All known linkers require a `.a' archive for static linking (except MSVC,
+# All known linkers require a '.a' archive for static linking (except MSVC,
# which needs '.lib').
libext=a
-with_gnu_ld="$lt_cv_prog_gnu_ld"
+with_gnu_ld=$lt_cv_prog_gnu_ld
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
+old_CC=$CC
+old_CFLAGS=$CFLAGS
# Set sane defaults for various variables
test -z "$CC" && CC=cc
@@ -8168,15 +8424,8 @@ test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
test -z "$LD" && LD=ld
test -z "$ac_objext" && ac_objext=o
-for cc_temp in $compiler""; do
- case $cc_temp in
- compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
- distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
- \-*) ;;
- *) break;;
- esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+func_cc_basename $compiler
+cc_basename=$func_cc_basename_result
# Only perform the check for file, if the check method requires it
@@ -8191,22 +8440,22 @@ if ${lt_cv_path_MAGIC_CMD+:} false; then :
else
case $MAGIC_CMD in
[\\/*] | ?:[\\/]*)
- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+ lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
;;
*)
- lt_save_MAGIC_CMD="$MAGIC_CMD"
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_MAGIC_CMD=$MAGIC_CMD
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
for ac_dir in $ac_dummy; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/${ac_tool_prefix}file; then
- lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
+ if test -f "$ac_dir/${ac_tool_prefix}file"; then
+ lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file"
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ MAGIC_CMD=$lt_cv_path_MAGIC_CMD
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
:
@@ -8229,13 +8478,13 @@ _LT_EOF
break
fi
done
- IFS="$lt_save_ifs"
- MAGIC_CMD="$lt_save_MAGIC_CMD"
+ IFS=$lt_save_ifs
+ MAGIC_CMD=$lt_save_MAGIC_CMD
;;
esac
fi
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
if test -n "$MAGIC_CMD"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
$as_echo "$MAGIC_CMD" >&6; }
@@ -8257,22 +8506,22 @@ if ${lt_cv_path_MAGIC_CMD+:} false; then :
else
case $MAGIC_CMD in
[\\/*] | ?:[\\/]*)
- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+ lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
;;
*)
- lt_save_MAGIC_CMD="$MAGIC_CMD"
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_MAGIC_CMD=$MAGIC_CMD
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
for ac_dir in $ac_dummy; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/file; then
- lt_cv_path_MAGIC_CMD="$ac_dir/file"
+ if test -f "$ac_dir/file"; then
+ lt_cv_path_MAGIC_CMD=$ac_dir/"file"
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ MAGIC_CMD=$lt_cv_path_MAGIC_CMD
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
:
@@ -8295,13 +8544,13 @@ _LT_EOF
break
fi
done
- IFS="$lt_save_ifs"
- MAGIC_CMD="$lt_save_MAGIC_CMD"
+ IFS=$lt_save_ifs
+ MAGIC_CMD=$lt_save_MAGIC_CMD
;;
esac
fi
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
if test -n "$MAGIC_CMD"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
$as_echo "$MAGIC_CMD" >&6; }
@@ -8322,7 +8571,7 @@ esac
# Use C for the default configuration in the libtool script
-lt_save_CC="$CC"
+lt_save_CC=$CC
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -8384,7 +8633,7 @@ if test -n "$compiler"; then
lt_prog_compiler_no_builtin_flag=
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
case $cc_basename in
nvcc*)
lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
@@ -8400,7 +8649,7 @@ else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="-fno-rtti -fno-exceptions"
+ lt_compiler_flag="-fno-rtti -fno-exceptions" ## exclude from sc_useless_quotes_in_assignment
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
# Note that $ac_compile itself does not contain backslashes and begins
@@ -8430,7 +8679,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
else
:
@@ -8448,17 +8697,18 @@ lt_prog_compiler_pic=
lt_prog_compiler_static=
- if test "$GCC" = yes; then
+ if test yes = "$GCC"; then
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_static='-static'
case $host_os in
aix*)
# All AIX code is PIC.
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
lt_prog_compiler_static='-Bstatic'
fi
+ lt_prog_compiler_pic='-fPIC'
;;
amigaos*)
@@ -8469,8 +8719,8 @@ lt_prog_compiler_static=
;;
m68k)
# FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
+ # adding the '-m68020' flag to GCC prevents building anything better,
+ # like '-m68040'.
lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
;;
esac
@@ -8486,6 +8736,11 @@ lt_prog_compiler_static=
# Although the cygwin gcc ignores -fPIC, still need this for old-style
# (--disable-auto-import) libraries
lt_prog_compiler_pic='-DDLL_EXPORT'
+ case $host_os in
+ os2*)
+ lt_prog_compiler_static='$wl-static'
+ ;;
+ esac
;;
darwin* | rhapsody*)
@@ -8556,7 +8811,7 @@ lt_prog_compiler_static=
case $host_os in
aix*)
lt_prog_compiler_wl='-Wl,'
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
lt_prog_compiler_static='-Bstatic'
else
@@ -8564,10 +8819,29 @@ lt_prog_compiler_static=
fi
;;
+ darwin* | rhapsody*)
+ # PIC is the default on this platform
+ # Common symbols not allowed in MH_DYLIB files
+ lt_prog_compiler_pic='-fno-common'
+ case $cc_basename in
+ nagfor*)
+ # NAG Fortran compiler
+ lt_prog_compiler_wl='-Wl,-Wl,,'
+ lt_prog_compiler_pic='-PIC'
+ lt_prog_compiler_static='-Bstatic'
+ ;;
+ esac
+ ;;
+
mingw* | cygwin* | pw32* | os2* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic='-DDLL_EXPORT'
+ case $host_os in
+ os2*)
+ lt_prog_compiler_static='$wl-static'
+ ;;
+ esac
;;
hpux9* | hpux10* | hpux11*)
@@ -8583,7 +8857,7 @@ lt_prog_compiler_static=
;;
esac
# Is there a better lt_prog_compiler_static that works with the bundled CC?
- lt_prog_compiler_static='${wl}-a ${wl}archive'
+ lt_prog_compiler_static='$wl-a ${wl}archive'
;;
irix5* | irix6* | nonstopux*)
@@ -8592,9 +8866,9 @@ lt_prog_compiler_static=
lt_prog_compiler_static='-non_shared'
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
- # old Intel for x86_64 which still supported -KPIC.
+ # old Intel for x86_64, which still supported -KPIC.
ecc*)
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-KPIC'
@@ -8619,6 +8893,12 @@ lt_prog_compiler_static=
lt_prog_compiler_pic='-PIC'
lt_prog_compiler_static='-Bstatic'
;;
+ tcc*)
+ # Fabrice Bellard et al's Tiny C Compiler
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-fPIC'
+ lt_prog_compiler_static='-static'
+ ;;
pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
@@ -8716,7 +8996,7 @@ lt_prog_compiler_static=
;;
sysv4*MP*)
- if test -d /usr/nec ;then
+ if test -d /usr/nec; then
lt_prog_compiler_pic='-Kconform_pic'
lt_prog_compiler_static='-Bstatic'
fi
@@ -8745,7 +9025,7 @@ lt_prog_compiler_static=
fi
case $host_os in
- # For platforms which do not support PIC, -DPIC is meaningless:
+ # For platforms that do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
;;
@@ -8777,7 +9057,7 @@ else
lt_cv_prog_compiler_pic_works=no
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
+ lt_compiler_flag="$lt_prog_compiler_pic -DPIC" ## exclude from sc_useless_quotes_in_assignment
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
# Note that $ac_compile itself does not contain backslashes and begins
@@ -8807,7 +9087,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
-if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
+if test yes = "$lt_cv_prog_compiler_pic_works"; then
case $lt_prog_compiler_pic in
"" | " "*) ;;
*) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
@@ -8839,7 +9119,7 @@ if ${lt_cv_prog_compiler_static_works+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
- save_LDFLAGS="$LDFLAGS"
+ save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -8858,13 +9138,13 @@ else
fi
fi
$RM -r conftest*
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS=$save_LDFLAGS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
-if test x"$lt_cv_prog_compiler_static_works" = xyes; then
+if test yes = "$lt_cv_prog_compiler_static_works"; then
:
else
lt_prog_compiler_static=
@@ -8984,8 +9264,8 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
+hard_links=nottested
+if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then
# do not overwrite the value of need_locks provided by the user
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
$as_echo_n "checking if we can lock with hard links... " >&6; }
@@ -8997,9 +9277,9 @@ $as_echo_n "checking if we can lock with hard links... " >&6; }
ln conftest.a conftest.b 2>/dev/null && hard_links=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
$as_echo "$hard_links" >&6; }
- if test "$hard_links" = no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+ if test no = "$hard_links"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
need_locks=warn
fi
else
@@ -9042,9 +9322,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
# included in the symbol list
include_expsyms=
# exclude_expsyms can be an extended regexp of symbols to exclude
- # it will be wrapped by ` (' and `)$', so one must not match beginning or
- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
- # as well as any symbol that contains `d'.
+ # it will be wrapped by ' (' and ')$', so one must not match beginning or
+ # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
+ # as well as any symbol that contains 'd'.
exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
# platforms (ab)use it in PIC code, but their linkers get confused if
@@ -9059,7 +9339,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
# FIXME: the MSVC++ port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
- if test "$GCC" != yes; then
+ if test yes != "$GCC"; then
with_gnu_ld=no
fi
;;
@@ -9067,7 +9347,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
# we just hope/assume this is gcc and not c89 (= MSVC++)
with_gnu_ld=yes
;;
- openbsd*)
+ openbsd* | bitrig*)
with_gnu_ld=no
;;
esac
@@ -9077,7 +9357,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
# On some targets, GNU ld is compatible enough with the native linker
# that we're better off using the native interface for both.
lt_use_gnu_ld_interface=no
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
case $host_os in
aix*)
# The AIX port of GNU ld has always aspired to compatibility
@@ -9099,24 +9379,24 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
esac
fi
- if test "$lt_use_gnu_ld_interface" = yes; then
+ if test yes = "$lt_use_gnu_ld_interface"; then
# If archive_cmds runs LD, not CC, wlarc should be empty
- wlarc='${wl}'
+ wlarc='$wl'
# Set some defaults for GNU ld with shared library support. These
# are reset later if shared libraries are not supported. Putting them
# here allows them to be overridden if necessary.
runpath_var=LD_RUN_PATH
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
- export_dynamic_flag_spec='${wl}--export-dynamic'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+ export_dynamic_flag_spec='$wl--export-dynamic'
# ancient GNU ld didn't support --whole-archive et. al.
if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
- whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
else
whole_archive_flag_spec=
fi
supports_anon_versioning=no
- case `$LD -v 2>&1` in
+ case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
*GNU\ gold*) supports_anon_versioning=yes ;;
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
@@ -9129,7 +9409,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
case $host_os in
aix[3-9]*)
# On AIX/PPC, the GNU linker is very broken
- if test "$host_cpu" != ia64; then
+ if test ia64 != "$host_cpu"; then
ld_shlibs=no
cat <<_LT_EOF 1>&2
@@ -9148,7 +9428,7 @@ _LT_EOF
case $host_cpu in
powerpc)
# see comment about AmigaOS4 .so support
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
archive_expsym_cmds=''
;;
m68k)
@@ -9164,7 +9444,7 @@ _LT_EOF
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
- archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
else
ld_shlibs=no
fi
@@ -9174,7 +9454,7 @@ _LT_EOF
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
- export_dynamic_flag_spec='${wl}--export-all-symbols'
+ export_dynamic_flag_spec='$wl--export-all-symbols'
allow_undefined_flag=unsupported
always_export_symbols=no
enable_shared_with_static_runtimes=yes
@@ -9182,61 +9462,89 @@ _LT_EOF
exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is; otherwise, prepend...
- archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- cp $export_symbols $output_objdir/$soname.def;
- else
- echo EXPORTS > $output_objdir/$soname.def;
- cat $export_symbols >> $output_objdir/$soname.def;
- fi~
- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ # If the export-symbols file already is a .def file, use it as
+ # is; otherwise, prepend EXPORTS...
+ archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then
+ cp $export_symbols $output_objdir/$soname.def;
+ else
+ echo EXPORTS > $output_objdir/$soname.def;
+ cat $export_symbols >> $output_objdir/$soname.def;
+ fi~
+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
else
ld_shlibs=no
fi
;;
haiku*)
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
link_all_deplibs=yes
;;
+ os2*)
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ allow_undefined_flag=unsupported
+ shrext_cmds=.dll
+ archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ enable_shared_with_static_runtimes=yes
+ ;;
+
interix[3-9]*)
hardcode_direct=no
hardcode_shlibpath_var=no
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
- export_dynamic_flag_spec='${wl}-E'
+ hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+ export_dynamic_flag_spec='$wl-E'
# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
# Instead, shared libraries are loaded at an image base (0x10000000 by
# default) and relocated if they conflict, which is a slow very memory
# consuming and fragmenting process. To avoid this, we pick a random,
# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
# time. Moving up from 0x10000000 also allows more sbrk(2) space.
- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
tmp_diet=no
- if test "$host_os" = linux-dietlibc; then
+ if test linux-dietlibc = "$host_os"; then
case $cc_basename in
diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn)
esac
fi
if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
- && test "$tmp_diet" = no
+ && test no = "$tmp_diet"
then
tmp_addflag=' $pic_flag'
tmp_sharedflag='-shared'
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
tmp_addflag=' $pic_flag'
;;
pgf77* | pgf90* | pgf95* | pgfortran*)
# Portland Group f77 and f90 compilers
- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
@@ -9247,42 +9555,47 @@ _LT_EOF
lf95*) # Lahey Fortran 8.1
whole_archive_flag_spec=
tmp_sharedflag='--shared' ;;
+ nagfor*) # NAGFOR 5.3
+ tmp_sharedflag='-Wl,-shared' ;;
xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
tmp_sharedflag='-qmkshrobj'
tmp_addflag= ;;
nvcc*) # Cuda Compiler Driver 2.2
- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
compiler_needs_object=yes
;;
esac
case `$CC -V 2>&1 | sed 5q` in
*Sun\ C*) # Sun C 5.9
- whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
compiler_needs_object=yes
tmp_sharedflag='-G' ;;
*Sun\ F*) # Sun Fortran 8.3
tmp_sharedflag='-G' ;;
esac
- archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
+ if test yes = "$supports_anon_versioning"; then
archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
fi
case $cc_basename in
+ tcc*)
+ export_dynamic_flag_spec='-rdynamic'
+ ;;
xlf* | bgf* | bgxlf* | mpixlf*)
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
+ if test yes = "$supports_anon_versioning"; then
archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- echo "local: *; };" >> $output_objdir/$libname.ver~
- $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
fi
;;
esac
@@ -9296,8 +9609,8 @@ _LT_EOF
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
else
- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
fi
;;
@@ -9315,8 +9628,8 @@ _LT_EOF
_LT_EOF
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
else
ld_shlibs=no
fi
@@ -9328,7 +9641,7 @@ _LT_EOF
ld_shlibs=no
cat <<_LT_EOF 1>&2
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
*** reliably create shared libraries on SCO systems. Therefore, libtool
*** is disabling shared libraries support. We urge you to upgrade GNU
*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
@@ -9343,9 +9656,9 @@ _LT_EOF
# DT_RUNPATH tag from executables and libraries. But doing so
# requires that you compile everything twice, which is a pain.
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
else
ld_shlibs=no
fi
@@ -9362,15 +9675,15 @@ _LT_EOF
*)
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
else
ld_shlibs=no
fi
;;
esac
- if test "$ld_shlibs" = no; then
+ if test no = "$ld_shlibs"; then
runpath_var=
hardcode_libdir_flag_spec=
export_dynamic_flag_spec=
@@ -9386,7 +9699,7 @@ _LT_EOF
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L=yes
- if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+ if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct=unsupported
@@ -9394,34 +9707,57 @@ _LT_EOF
;;
aix[4-9]*)
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
aix_use_runtimelinking=no
exp_sym_flag='-Bexport'
- no_entry_flag=""
+ no_entry_flag=
else
# If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- # Also, AIX nm treats weak defined symbols like other global
- # defined symbols, whereas GNU nm marks them as "W".
+ # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+ # Without the "-l" option, or with the "-B" option, AIX nm treats
+ # weak defined symbols like other global defined symbols, whereas
+ # GNU nm marks them as "W".
+ # While the 'weak' keyword is ignored in the Export File, we need
+ # it in the Import File for the 'aix-soname' feature, so we have
+ # to replace the "-B" option with "-P" for AIX nm.
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
else
- export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
fi
aix_use_runtimelinking=no
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
+ # have runtime linking enabled, and use it for executables.
+ # For shared libraries, we enable/disable runtime linking
+ # depending on the kind of the shared library created -
+ # when "with_aix_soname,aix_use_runtimelinking" is:
+ # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
+ # "aix,yes" lib.so shared, rtl:yes, for executables
+ # lib.a static archive
+ # "both,no" lib.so.V(shr.o) shared, rtl:yes
+ # lib.a(lib.so.V) shared, rtl:no, for executables
+ # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a(lib.so.V) shared, rtl:no
+ # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a static archive
case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
for ld_flag in $LDFLAGS; do
- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
aix_use_runtimelinking=yes
break
fi
done
+ if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+ # With aix-soname=svr4, we create the lib.so.V shared archives only,
+ # so we don't have lib.a shared libs to link our executables.
+ # We have to force runtime linking in this case.
+ aix_use_runtimelinking=yes
+ LDFLAGS="$LDFLAGS -Wl,-brtl"
+ fi
;;
esac
@@ -9440,13 +9776,21 @@ _LT_EOF
hardcode_direct_absolute=yes
hardcode_libdir_separator=':'
link_all_deplibs=yes
- file_list_spec='${wl}-f,'
+ file_list_spec='$wl-f,'
+ case $with_aix_soname,$aix_use_runtimelinking in
+ aix,*) ;; # traditional, no import file
+ svr4,* | *,yes) # use import file
+ # The Import File defines what to hardcode.
+ hardcode_direct=no
+ hardcode_direct_absolute=no
+ ;;
+ esac
- if test "$GCC" = yes; then
+ if test yes = "$GCC"; then
case $host_os in aix4.[012]|aix4.[012].*)
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
- collect2name=`${CC} -print-prog-name=collect2`
+ collect2name=`$CC -print-prog-name=collect2`
if test -f "$collect2name" &&
strings "$collect2name" | $GREP resolve_lib_name >/dev/null
then
@@ -9465,35 +9809,42 @@ _LT_EOF
;;
esac
shared_flag='-shared'
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag="$shared_flag "'${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag="$shared_flag "'$wl-G'
fi
+ # Need to ensure runtime linking is disabled for the traditional
+ # shared library, or the linker may eventually find shared libraries
+ # /with/ Import File - we do not want to mix them.
+ shared_flag_aix='-shared'
+ shared_flag_svr4='-shared $wl-G'
else
# not using gcc
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag='$wl-G'
else
- shared_flag='${wl}-bM:SRE'
+ shared_flag='$wl-bM:SRE'
fi
+ shared_flag_aix='$wl-bM:SRE'
+ shared_flag_svr4='$wl-G'
fi
fi
- export_dynamic_flag_spec='${wl}-bexpall'
+ export_dynamic_flag_spec='$wl-bexpall'
# It seems that -bexpall does not export symbols beginning with
# underscore (_), so it is better to generate a list of symbols to export.
always_export_symbols=yes
- if test "$aix_use_runtimelinking" = yes; then
+ if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
- if test "${lt_cv_aix_libpath+set}" = set; then
+ if test set = "${lt_cv_aix_libpath+set}"; then
aix_libpath=$lt_cv_aix_libpath
else
if ${lt_cv_aix_libpath_+:} false; then :
@@ -9528,7 +9879,7 @@ fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$lt_cv_aix_libpath_"; then
- lt_cv_aix_libpath_="/usr/lib:/lib"
+ lt_cv_aix_libpath_=/usr/lib:/lib
fi
fi
@@ -9536,17 +9887,17 @@ fi
aix_libpath=$lt_cv_aix_libpath_
fi
- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
- archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
+ archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
else
- if test "$host_cpu" = ia64; then
- hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+ if test ia64 = "$host_cpu"; then
+ hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib'
allow_undefined_flag="-z nodefs"
- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an
# empty executable.
- if test "${lt_cv_aix_libpath+set}" = set; then
+ if test set = "${lt_cv_aix_libpath+set}"; then
aix_libpath=$lt_cv_aix_libpath
else
if ${lt_cv_aix_libpath_+:} false; then :
@@ -9581,7 +9932,7 @@ fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$lt_cv_aix_libpath_"; then
- lt_cv_aix_libpath_="/usr/lib:/lib"
+ lt_cv_aix_libpath_=/usr/lib:/lib
fi
fi
@@ -9589,21 +9940,33 @@ fi
aix_libpath=$lt_cv_aix_libpath_
fi
- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+ hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
# Warning - without using the other run time loading flags,
# -berok will link without error, but may produce a broken library.
- no_undefined_flag=' ${wl}-bernotok'
- allow_undefined_flag=' ${wl}-berok'
- if test "$with_gnu_ld" = yes; then
+ no_undefined_flag=' $wl-bernotok'
+ allow_undefined_flag=' $wl-berok'
+ if test yes = "$with_gnu_ld"; then
# We only use this code for GNU lds that support --whole-archive.
- whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive'
else
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec='$convenience'
fi
archive_cmds_need_lc=yes
- # This is similar to how AIX traditionally builds its shared libraries.
- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+ # -brtl affects multiple linker settings, -berok does not and is overridden later
+ compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
+ if test svr4 != "$with_aix_soname"; then
+ # This is similar to how AIX traditionally builds its shared libraries.
+ archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+ fi
+ if test aix != "$with_aix_soname"; then
+ archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+ else
+ # used by -dlpreopen to get the symbols
+ archive_expsym_cmds="$archive_expsym_cmds"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
+ fi
+ archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d'
fi
fi
;;
@@ -9612,7 +9975,7 @@ fi
case $host_cpu in
powerpc)
# see comment about AmigaOS4 .so support
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
archive_expsym_cmds=''
;;
m68k)
@@ -9642,16 +10005,17 @@ fi
# Tell ltmain to make .lib files, not .a files.
libext=lib
# Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
+ shrext_cmds=.dll
# FIXME: Setting linknames here is a bad hack.
- archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
- archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
- else
- sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
- fi~
- $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
- linknames='
+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+ archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then
+ cp "$export_symbols" "$output_objdir/$soname.def";
+ echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+ else
+ $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+ fi~
+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+ linknames='
# The linker will not automatically build a static lib if we build a DLL.
# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
enable_shared_with_static_runtimes=yes
@@ -9660,18 +10024,18 @@ fi
# Don't use ranlib
old_postinstall_cmds='chmod 644 $oldlib'
postlink_cmds='lt_outputfile="@OUTPUT@"~
- lt_tool_outputfile="@TOOL_OUTPUT@"~
- case $lt_outputfile in
- *.exe|*.EXE) ;;
- *)
- lt_outputfile="$lt_outputfile.exe"
- lt_tool_outputfile="$lt_tool_outputfile.exe"
- ;;
- esac~
- if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
- $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
- $RM "$lt_outputfile.manifest";
- fi'
+ lt_tool_outputfile="@TOOL_OUTPUT@"~
+ case $lt_outputfile in
+ *.exe|*.EXE) ;;
+ *)
+ lt_outputfile=$lt_outputfile.exe
+ lt_tool_outputfile=$lt_tool_outputfile.exe
+ ;;
+ esac~
+ if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+ $RM "$lt_outputfile.manifest";
+ fi'
;;
*)
# Assume MSVC wrapper
@@ -9680,7 +10044,7 @@ fi
# Tell ltmain to make .lib files, not .a files.
libext=lib
# Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
+ shrext_cmds=.dll
# FIXME: Setting linknames here is a bad hack.
archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
# The linker will automatically build a .lib file if we build a DLL.
@@ -9699,24 +10063,24 @@ fi
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
- if test "$lt_cv_ld_force_load" = "yes"; then
- whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+ if test yes = "$lt_cv_ld_force_load"; then
+ whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
else
whole_archive_flag_spec=''
fi
link_all_deplibs=yes
- allow_undefined_flag="$_lt_dar_allow_undefined"
+ allow_undefined_flag=$_lt_dar_allow_undefined
case $cc_basename in
- ifort*) _lt_dar_can_shared=yes ;;
+ ifort*|nagfor*) _lt_dar_can_shared=yes ;;
*) _lt_dar_can_shared=$GCC ;;
esac
- if test "$_lt_dar_can_shared" = "yes"; then
+ if test yes = "$_lt_dar_can_shared"; then
output_verbose_link_cmd=func_echo_all
- archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
- module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
- module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+ archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+ module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
else
ld_shlibs=no
@@ -9758,33 +10122,33 @@ fi
;;
hpux9*)
- if test "$GCC" = yes; then
- archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ if test yes = "$GCC"; then
+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
else
- archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
fi
- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ hardcode_libdir_flag_spec='$wl+b $wl$libdir'
hardcode_libdir_separator=:
hardcode_direct=yes
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
hardcode_minus_L=yes
- export_dynamic_flag_spec='${wl}-E'
+ export_dynamic_flag_spec='$wl-E'
;;
hpux10*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
- archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes,no = "$GCC,$with_gnu_ld"; then
+ archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
else
archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
fi
- if test "$with_gnu_ld" = no; then
- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ if test no = "$with_gnu_ld"; then
+ hardcode_libdir_flag_spec='$wl+b $wl$libdir'
hardcode_libdir_separator=:
hardcode_direct=yes
hardcode_direct_absolute=yes
- export_dynamic_flag_spec='${wl}-E'
+ export_dynamic_flag_spec='$wl-E'
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
hardcode_minus_L=yes
@@ -9792,25 +10156,25 @@ fi
;;
hpux11*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+ if test yes,no = "$GCC,$with_gnu_ld"; then
case $host_cpu in
hppa*64*)
- archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
ia64*)
- archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
else
case $host_cpu in
hppa*64*)
- archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
ia64*)
- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
@@ -9822,7 +10186,7 @@ if ${lt_cv_prog_compiler__b+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler__b=no
- save_LDFLAGS="$LDFLAGS"
+ save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS -b"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -9841,14 +10205,14 @@ else
fi
fi
$RM -r conftest*
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS=$save_LDFLAGS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
$as_echo "$lt_cv_prog_compiler__b" >&6; }
-if test x"$lt_cv_prog_compiler__b" = xyes; then
- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+if test yes = "$lt_cv_prog_compiler__b"; then
+ archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
else
archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
fi
@@ -9856,8 +10220,8 @@ fi
;;
esac
fi
- if test "$with_gnu_ld" = no; then
- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ if test no = "$with_gnu_ld"; then
+ hardcode_libdir_flag_spec='$wl+b $wl$libdir'
hardcode_libdir_separator=:
case $host_cpu in
@@ -9868,7 +10232,7 @@ fi
*)
hardcode_direct=yes
hardcode_direct_absolute=yes
- export_dynamic_flag_spec='${wl}-E'
+ export_dynamic_flag_spec='$wl-E'
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
@@ -9879,8 +10243,8 @@ fi
;;
irix5* | irix6* | nonstopux*)
- if test "$GCC" = yes; then
- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ if test yes = "$GCC"; then
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
# Try to use the -exported_symbol ld option, if it does not
# work, assume that -exports_file does not work either and
# implicitly export all symbols.
@@ -9890,8 +10254,8 @@ $as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >
if ${lt_cv_irix_exported_symbol+:} false; then :
$as_echo_n "(cached) " >&6
else
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+ save_LDFLAGS=$LDFLAGS
+ LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int foo (void) { return 0; }
@@ -9903,24 +10267,34 @@ else
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS=$save_LDFLAGS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
$as_echo "$lt_cv_irix_exported_symbol" >&6; }
- if test "$lt_cv_irix_exported_symbol" = yes; then
- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+ if test yes = "$lt_cv_irix_exported_symbol"; then
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
fi
else
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
fi
archive_cmds_need_lc='no'
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
hardcode_libdir_separator=:
inherit_rpath=yes
link_all_deplibs=yes
;;
+ linux*)
+ case $cc_basename in
+ tcc*)
+ # Fabrice Bellard et al's Tiny C Compiler
+ ld_shlibs=yes
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ ;;
+
netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
@@ -9935,7 +10309,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
newsos6)
archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
hardcode_direct=yes
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
hardcode_libdir_separator=:
hardcode_shlibpath_var=no
;;
@@ -9943,27 +10317,19 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
*nto* | *qnx*)
;;
- openbsd*)
+ openbsd* | bitrig*)
if test -f /usr/libexec/ld.so; then
hardcode_direct=yes
hardcode_shlibpath_var=no
hardcode_direct_absolute=yes
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
- export_dynamic_flag_spec='${wl}-E'
+ archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+ hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+ export_dynamic_flag_spec='$wl-E'
else
- case $host_os in
- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='-R$libdir'
- ;;
- *)
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
- ;;
- esac
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec='$wl-rpath,$libdir'
fi
else
ld_shlibs=no
@@ -9974,33 +10340,53 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
- archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
- old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+ shrext_cmds=.dll
+ archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ enable_shared_with_static_runtimes=yes
;;
osf3*)
- if test "$GCC" = yes; then
- allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ if test yes = "$GCC"; then
+ allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+ archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
else
allow_undefined_flag=' -expect_unresolved \*'
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
fi
archive_cmds_need_lc='no'
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
hardcode_libdir_separator=:
;;
osf4* | osf5*) # as osf3* with the addition of -msym flag
- if test "$GCC" = yes; then
- allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ if test yes = "$GCC"; then
+ allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+ archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
else
allow_undefined_flag=' -expect_unresolved \*'
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+ $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
@@ -10011,24 +10397,24 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
solaris*)
no_undefined_flag=' -z defs'
- if test "$GCC" = yes; then
- wlarc='${wl}'
- archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes = "$GCC"; then
+ wlarc='$wl'
+ archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
else
case `$CC -V 2>&1` in
*"Compilers 5.0"*)
wlarc=''
- archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+ $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
;;
*)
- wlarc='${wl}'
- archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ wlarc='$wl'
+ archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
;;
esac
fi
@@ -10038,11 +10424,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
# The compiler driver will combine and reorder linker options,
- # but understands `-z linker_flag'. GCC discards it without `$wl',
+ # but understands '-z linker_flag'. GCC discards it without '$wl',
# but is careful enough not to reorder.
# Supported since Solaris 2.6 (maybe 2.5.1?)
- if test "$GCC" = yes; then
- whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ if test yes = "$GCC"; then
+ whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
else
whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
fi
@@ -10052,10 +10438,10 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
;;
sunos4*)
- if test "x$host_vendor" = xsequent; then
+ if test sequent = "$host_vendor"; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
- archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
@@ -10104,43 +10490,43 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
;;
sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
- no_undefined_flag='${wl}-z,text'
+ no_undefined_flag='$wl-z,text'
archive_cmds_need_lc=no
hardcode_shlibpath_var=no
runpath_var='LD_RUN_PATH'
- if test "$GCC" = yes; then
- archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes = "$GCC"; then
+ archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
else
- archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
fi
;;
sysv5* | sco3.2v5* | sco5v6*)
- # Note: We can NOT use -z defs as we might desire, because we do not
+ # Note: We CANNOT use -z defs as we might desire, because we do not
# link with -lc, and that would cause any symbols used from libc to
# always be unresolved, which means just about no library would
# ever link correctly. If we're not using GNU ld we use -z text
# though, which does catch some bad symbols but isn't as heavy-handed
# as -z defs.
- no_undefined_flag='${wl}-z,text'
- allow_undefined_flag='${wl}-z,nodefs'
+ no_undefined_flag='$wl-z,text'
+ allow_undefined_flag='$wl-z,nodefs'
archive_cmds_need_lc=no
hardcode_shlibpath_var=no
- hardcode_libdir_flag_spec='${wl}-R,$libdir'
+ hardcode_libdir_flag_spec='$wl-R,$libdir'
hardcode_libdir_separator=':'
link_all_deplibs=yes
- export_dynamic_flag_spec='${wl}-Bexport'
+ export_dynamic_flag_spec='$wl-Bexport'
runpath_var='LD_RUN_PATH'
- if test "$GCC" = yes; then
- archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes = "$GCC"; then
+ archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
else
- archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
fi
;;
@@ -10155,10 +10541,10 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
;;
esac
- if test x$host_vendor = xsni; then
+ if test sni = "$host_vendor"; then
case $host in
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
- export_dynamic_flag_spec='${wl}-Blargedynsym'
+ export_dynamic_flag_spec='$wl-Blargedynsym'
;;
esac
fi
@@ -10166,7 +10552,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
$as_echo "$ld_shlibs" >&6; }
-test "$ld_shlibs" = no && can_build_shared=no
+test no = "$ld_shlibs" && can_build_shared=no
with_gnu_ld=$with_gnu_ld
@@ -10192,7 +10578,7 @@ x|xyes)
# Assume -lc should be added
archive_cmds_need_lc=yes
- if test "$enable_shared" = yes && test "$GCC" = yes; then
+ if test yes,yes = "$GCC,$enable_shared"; then
case $archive_cmds in
*'~'*)
# FIXME: we may have to deal with multi-command sequences.
@@ -10407,14 +10793,14 @@ esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
$as_echo_n "checking dynamic linker characteristics... " >&6; }
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
case $host_os in
- darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
- *) lt_awk_arg="/^libraries:/" ;;
+ darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
+ *) lt_awk_arg='/^libraries:/' ;;
esac
case $host_os in
- mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
- *) lt_sed_strip_eq="s,=/,/,g" ;;
+ mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;;
+ *) lt_sed_strip_eq='s|=/|/|g' ;;
esac
lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
case $lt_search_path_spec in
@@ -10430,28 +10816,35 @@ if test "$GCC" = yes; then
;;
esac
# Ok, now we have the path, separated by spaces, we can step through it
- # and add multilib dir if necessary.
+ # and add multilib dir if necessary...
lt_tmp_lt_search_path_spec=
- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ # ...but if some path component already ends with the multilib dir we assume
+ # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+ case "$lt_multi_os_dir; $lt_search_path_spec " in
+ "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+ lt_multi_os_dir=
+ ;;
+ esac
for lt_sys_path in $lt_search_path_spec; do
- if test -d "$lt_sys_path/$lt_multi_os_dir"; then
- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
- else
+ if test -d "$lt_sys_path$lt_multi_os_dir"; then
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
+ elif test -n "$lt_multi_os_dir"; then
test -d "$lt_sys_path" && \
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
fi
done
lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-BEGIN {RS=" "; FS="/|\n";} {
- lt_foo="";
- lt_count=0;
+BEGIN {RS = " "; FS = "/|\n";} {
+ lt_foo = "";
+ lt_count = 0;
for (lt_i = NF; lt_i > 0; lt_i--) {
if ($lt_i != "" && $lt_i != ".") {
if ($lt_i == "..") {
lt_count++;
} else {
if (lt_count == 0) {
- lt_foo="/" $lt_i lt_foo;
+ lt_foo = "/" $lt_i lt_foo;
} else {
lt_count--;
}
@@ -10465,7 +10858,7 @@ BEGIN {RS=" "; FS="/|\n";} {
# for these hosts.
case $host_os in
mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
- $SED 's,/\([A-Za-z]:\),\1,g'` ;;
+ $SED 's|/\([A-Za-z]:\)|\1|g'` ;;
esac
sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
else
@@ -10474,7 +10867,7 @@ fi
library_names_spec=
libname_spec='lib$name'
soname_spec=
-shrext_cmds=".so"
+shrext_cmds=.so
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
@@ -10491,14 +10884,16 @@ hardcode_into_libs=no
# flags to be left without arguments
need_version=unknown
+
+
case $host_os in
aix3*)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
shlibpath_var=LIBPATH
# AIX 3 has no versioning support, so we append a major version to the name.
- soname_spec='${libname}${release}${shared_ext}$major'
+ soname_spec='$libname$release$shared_ext$major'
;;
aix[4-9]*)
@@ -10506,41 +10901,91 @@ aix[4-9]*)
need_lib_prefix=no
need_version=no
hardcode_into_libs=yes
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 supports IA64
- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
else
# With GCC up to 2.95.x, collect2 would create an import file
# for dependence libraries. The import file would start with
- # the line `#! .'. This would cause the generated library to
- # depend on `.', always an invalid library. This was fixed in
+ # the line '#! .'. This would cause the generated library to
+ # depend on '.', always an invalid library. This was fixed in
# development snapshots of GCC prior to 3.0.
case $host_os in
aix4 | aix4.[01] | aix4.[01].*)
if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
echo ' yes '
- echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+ echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
:
else
can_build_shared=no
fi
;;
esac
- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+ # Using Import Files as archive members, it is possible to support
+ # filename-based versioning of shared library archives on AIX. While
+ # this would work for both with and without runtime linking, it will
+ # prevent static linking of such archives. So we do filename-based
+ # shared library versioning with .so extension only, which is used
+ # when both runtime linking and shared linking is enabled.
+ # Unfortunately, runtime linking may impact performance, so we do
+ # not want this to be the default eventually. Also, we use the
+ # versioned .so libs for executables only if there is the -brtl
+ # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+ # To allow for filename-based versioning support, we need to create
+ # libNAME.so.V as an archive file, containing:
+ # *) an Import File, referring to the versioned filename of the
+ # archive as well as the shared archive member, telling the
+ # bitwidth (32 or 64) of that shared object, and providing the
+ # list of exported symbols of that shared object, eventually
+ # decorated with the 'weak' keyword
+ # *) the shared object with the F_LOADONLY flag set, to really avoid
+ # it being seen by the linker.
+ # At run time we better use the real file rather than another symlink,
+ # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+ case $with_aix_soname,$aix_use_runtimelinking in
+ # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
# soname into executable. Probably we can add versioning support to
# collect2, so additional links can be useful in future.
- if test "$aix_use_runtimelinking" = yes; then
+ aix,yes) # traditional libtool
+ dynamic_linker='AIX unversionable lib.so'
# If using run time linking (on AIX 4.2 or later) use lib<name>.so
# instead of lib<name>.a to let people know that these are not
# typical AIX shared libraries.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- else
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ ;;
+ aix,no) # traditional AIX only
+ dynamic_linker='AIX lib.a(lib.so.V)'
# We preserve .a as extension for shared libraries through AIX4.2
# and later when we are not doing run time linking.
- library_names_spec='${libname}${release}.a $libname.a'
- soname_spec='${libname}${release}${shared_ext}$major'
- fi
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ ;;
+ svr4,*) # full svr4 only
+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,yes) # both, prefer svr4
+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # unpreferred sharedlib libNAME.a needs extra handling
+ postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+ postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,no) # both, prefer aix
+ dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+ postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+ postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+ ;;
+ esac
shlibpath_var=LIBPATH
fi
;;
@@ -10550,18 +10995,18 @@ amigaos*)
powerpc)
# Since July 2007 AmigaOS4 officially supports .so libraries.
# When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
;;
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
;;
esac
;;
beos*)
- library_names_spec='${libname}${shared_ext}'
+ library_names_spec='$libname$shared_ext'
dynamic_linker="$host_os ld.so"
shlibpath_var=LIBRARY_PATH
;;
@@ -10569,8 +11014,8 @@ beos*)
bsdi[45]*)
version_type=linux # correct to gnu/linux during the next big refactor
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
@@ -10582,7 +11027,7 @@ bsdi[45]*)
cygwin* | mingw* | pw32* | cegcc*)
version_type=windows
- shrext_cmds=".dll"
+ shrext_cmds=.dll
need_version=no
need_lib_prefix=no
@@ -10591,8 +11036,8 @@ cygwin* | mingw* | pw32* | cegcc*)
# gcc
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
$install_prog $dir/$dlname \$dldir/$dlname~
@@ -10608,17 +11053,17 @@ cygwin* | mingw* | pw32* | cegcc*)
case $host_os in
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
- soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
;;
esac
dynamic_linker='Win32 ld.exe'
@@ -10627,8 +11072,8 @@ cygwin* | mingw* | pw32* | cegcc*)
*,cl*)
# Native MSVC
libname_spec='$name'
- soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- library_names_spec='${libname}.dll.lib'
+ soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+ library_names_spec='$libname.dll.lib'
case $build_os in
mingw*)
@@ -10655,7 +11100,7 @@ cygwin* | mingw* | pw32* | cegcc*)
sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
;;
*)
- sys_lib_search_path_spec="$LIB"
+ sys_lib_search_path_spec=$LIB
if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
# It is most probably a Windows format PATH.
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
@@ -10668,8 +11113,8 @@ cygwin* | mingw* | pw32* | cegcc*)
esac
# DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
$install_prog $dir/$dlname \$dldir/$dlname'
@@ -10682,7 +11127,7 @@ cygwin* | mingw* | pw32* | cegcc*)
*)
# Assume MSVC wrapper
- library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+ library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
dynamic_linker='Win32 ld.exe'
;;
esac
@@ -10695,8 +11140,8 @@ darwin* | rhapsody*)
version_type=darwin
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
- soname_spec='${libname}${release}${major}$shared_ext'
+ library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+ soname_spec='$libname$release$major$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -10709,8 +11154,8 @@ dgux*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -10735,12 +11180,13 @@ freebsd* | dragonfly*)
case $version_type in
freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
need_version=no
need_lib_prefix=no
;;
freebsd-*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
need_version=yes
;;
linux)
@@ -10771,26 +11217,15 @@ freebsd* | dragonfly*)
esac
;;
-gnu*)
- version_type=linux # correct to gnu/linux during the next big refactor
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-
haiku*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
dynamic_linker="$host_os runtime_loader"
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LIBRARY_PATH
- shlibpath_overrides_runpath=yes
+ shlibpath_overrides_runpath=no
sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
hardcode_into_libs=yes
;;
@@ -10808,14 +11243,15 @@ hpux9* | hpux10* | hpux11*)
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- if test "X$HPUX_IA64_MODE" = X32; then
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
+ if test 32 = "$HPUX_IA64_MODE"; then
sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+ sys_lib_dlsearch_path_spec=/usr/lib/hpux32
else
sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+ sys_lib_dlsearch_path_spec=/usr/lib/hpux64
fi
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
shrext_cmds='.sl'
@@ -10823,8 +11259,8 @@ hpux9* | hpux10* | hpux11*)
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
@@ -10833,8 +11269,8 @@ hpux9* | hpux10* | hpux11*)
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
;;
esac
# HP-UX runs *really* slowly unless shared libraries are mode 555, ...
@@ -10847,8 +11283,8 @@ interix[3-9]*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -10859,7 +11295,7 @@ irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
*)
- if test "$lt_cv_prog_gnu_ld" = yes; then
+ if test yes = "$lt_cv_prog_gnu_ld"; then
version_type=linux # correct to gnu/linux during the next big refactor
else
version_type=irix
@@ -10867,8 +11303,8 @@ irix5* | irix6* | nonstopux*)
esac
need_lib_prefix=no
need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+ soname_spec='$libname$release$shared_ext$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
case $host_os in
irix5* | nonstopux*)
libsuff= shlibsuff=
@@ -10887,8 +11323,8 @@ irix5* | irix6* | nonstopux*)
esac
shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
shlibpath_overrides_runpath=no
- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+ sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+ sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
hardcode_into_libs=yes
;;
@@ -10897,13 +11333,33 @@ linux*oldld* | linux*aout* | linux*coff*)
dynamic_linker=no
;;
+linux*android*)
+ version_type=none # Android doesn't support versioned libraries.
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='$libname$release$shared_ext'
+ soname_spec='$libname$release$shared_ext'
+ finish_cmds=
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+
+ # This implies no fast_install, which is unacceptable.
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
+ dynamic_linker='Android linker'
+ # Don't embed -rpath directories since the linker doesn't support them.
+ hardcode_libdir_flag_spec='-L$libdir'
+ ;;
+
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -10947,7 +11403,12 @@ fi
# before this can be enabled.
hardcode_into_libs=yes
- # Append ld.so.conf contents to the search path
+ # Ideally, we could use ldconfig to report *all* directores which are
+ # searched for libraries, however this is still not possible. Aside from not
+ # being certain /sbin/ldconfig is available, command
+ # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+ # even though it is searched at run-time. Try to do the best guess by
+ # appending ld.so.conf contents (and includes) to the search path.
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
@@ -10967,12 +11428,12 @@ netbsd*)
need_lib_prefix=no
need_version=no
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
dynamic_linker='NetBSD ld.elf_so'
fi
shlibpath_var=LD_LIBRARY_PATH
@@ -10982,7 +11443,7 @@ netbsd*)
newsos6)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
;;
@@ -10991,58 +11452,68 @@ newsos6)
version_type=qnx
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
dynamic_linker='ldqnx.so'
;;
-openbsd*)
+openbsd* | bitrig*)
version_type=sunos
- sys_lib_dlsearch_path_spec="/usr/lib"
+ sys_lib_dlsearch_path_spec=/usr/lib
need_lib_prefix=no
- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
- case $host_os in
- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
- *) need_version=no ;;
- esac
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- case $host_os in
- openbsd2.[89] | openbsd2.[89].*)
- shlibpath_overrides_runpath=no
- ;;
- *)
- shlibpath_overrides_runpath=yes
- ;;
- esac
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+ need_version=no
else
- shlibpath_overrides_runpath=yes
+ need_version=yes
fi
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
;;
os2*)
libname_spec='$name'
- shrext_cmds=".dll"
+ version_type=windows
+ shrext_cmds=.dll
+ need_version=no
need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
+ # OS/2 can only load a DLL with a base name of 8 characters or less.
+ soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+ v=$($ECHO $release$versuffix | tr -d .-);
+ n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+ $ECHO $n$v`$shared_ext'
+ library_names_spec='${libname}_dll.$libext'
dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
+ shlibpath_var=BEGINLIBPATH
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+ $install_prog $dir/$dlname \$dldir/$dlname~
+ chmod a+x \$dldir/$dlname~
+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+ fi'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $RM \$dlpath'
;;
osf3* | osf4* | osf5*)
version_type=osf
need_lib_prefix=no
need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='$libname$release$shared_ext$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
rdos*)
@@ -11053,8 +11524,8 @@ solaris*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
@@ -11064,11 +11535,11 @@ solaris*)
sunos4*)
version_type=sunos
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
need_lib_prefix=no
fi
need_version=yes
@@ -11076,8 +11547,8 @@ sunos4*)
sysv4 | sysv4.3*)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
case $host_vendor in
sni)
@@ -11098,24 +11569,24 @@ sysv4 | sysv4.3*)
;;
sysv4*MP*)
- if test -d /usr/nec ;then
+ if test -d /usr/nec; then
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
- soname_spec='$libname${shared_ext}.$major'
+ library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+ soname_spec='$libname$shared_ext.$major'
shlibpath_var=LD_LIBRARY_PATH
fi
;;
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- version_type=freebsd-elf
+ version_type=sco
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
else
sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
@@ -11133,7 +11604,7 @@ tpf*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -11141,8 +11612,8 @@ tpf*)
uts4*)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -11152,20 +11623,35 @@ uts4*)
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
$as_echo "$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
+test no = "$dynamic_linker" && can_build_shared=no
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+ sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
- sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+ sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
fi
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+
+
+
+
+
@@ -11262,15 +11748,15 @@ $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" ||
test -n "$runpath_var" ||
- test "X$hardcode_automatic" = "Xyes" ; then
+ test yes = "$hardcode_automatic"; then
# We can hardcode non-existent directories.
- if test "$hardcode_direct" != no &&
+ if test no != "$hardcode_direct" &&
# If the only mechanism to avoid hardcoding is shlibpath_var, we
# have to relink, otherwise we might link with an installed library
# when we should be linking with a yet-to-be-installed one
- ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
- test "$hardcode_minus_L" != no; then
+ ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" &&
+ test no != "$hardcode_minus_L"; then
# Linking always hardcodes the temporary library directory.
hardcode_action=relink
else
@@ -11285,12 +11771,12 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
$as_echo "$hardcode_action" >&6; }
-if test "$hardcode_action" = relink ||
- test "$inherit_rpath" = yes; then
+if test relink = "$hardcode_action" ||
+ test yes = "$inherit_rpath"; then
# Fast installation is not supported
enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
+elif test yes = "$shlibpath_overrides_runpath" ||
+ test no = "$enable_shared"; then
# Fast installation is not necessary
enable_fast_install=needless
fi
@@ -11300,7 +11786,7 @@ fi
- if test "x$enable_dlopen" != xyes; then
+ if test yes != "$enable_dlopen"; then
enable_dlopen=unknown
enable_dlopen_self=unknown
enable_dlopen_self_static=unknown
@@ -11310,23 +11796,23 @@ else
case $host_os in
beos*)
- lt_cv_dlopen="load_add_on"
+ lt_cv_dlopen=load_add_on
lt_cv_dlopen_libs=
lt_cv_dlopen_self=yes
;;
mingw* | pw32* | cegcc*)
- lt_cv_dlopen="LoadLibrary"
+ lt_cv_dlopen=LoadLibrary
lt_cv_dlopen_libs=
;;
cygwin*)
- lt_cv_dlopen="dlopen"
+ lt_cv_dlopen=dlopen
lt_cv_dlopen_libs=
;;
darwin*)
- # if libdl is installed we need to link against it
+ # if libdl is installed we need to link against it
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
$as_echo_n "checking for dlopen in -ldl... " >&6; }
if ${ac_cv_lib_dl_dlopen+:} false; then :
@@ -11364,10 +11850,10 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
else
- lt_cv_dlopen="dyld"
+ lt_cv_dlopen=dyld
lt_cv_dlopen_libs=
lt_cv_dlopen_self=yes
@@ -11375,10 +11861,18 @@ fi
;;
+ tpf*)
+ # Don't try to run any link tests for TPF. We know it's impossible
+ # because TPF is a cross-compiler, and we know how we open DSOs.
+ lt_cv_dlopen=dlopen
+ lt_cv_dlopen_libs=
+ lt_cv_dlopen_self=no
+ ;;
+
*)
ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
if test "x$ac_cv_func_shl_load" = xyes; then :
- lt_cv_dlopen="shl_load"
+ lt_cv_dlopen=shl_load
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
$as_echo_n "checking for shl_load in -ldld... " >&6; }
@@ -11417,11 +11911,11 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+ lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
else
ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
if test "x$ac_cv_func_dlopen" = xyes; then :
- lt_cv_dlopen="dlopen"
+ lt_cv_dlopen=dlopen
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
$as_echo_n "checking for dlopen in -ldl... " >&6; }
@@ -11460,7 +11954,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
$as_echo_n "checking for dlopen in -lsvld... " >&6; }
@@ -11499,7 +11993,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+ lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
$as_echo_n "checking for dld_link in -ldld... " >&6; }
@@ -11538,7 +12032,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+ lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
fi
@@ -11559,21 +12053,21 @@ fi
;;
esac
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
- else
+ if test no = "$lt_cv_dlopen"; then
enable_dlopen=no
+ else
+ enable_dlopen=yes
fi
case $lt_cv_dlopen in
dlopen)
- save_CPPFLAGS="$CPPFLAGS"
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+ save_CPPFLAGS=$CPPFLAGS
+ test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
- save_LDFLAGS="$LDFLAGS"
+ save_LDFLAGS=$LDFLAGS
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
- save_LIBS="$LIBS"
+ save_LIBS=$LIBS
LIBS="$lt_cv_dlopen_libs $LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
@@ -11581,7 +12075,7 @@ $as_echo_n "checking whether a program can dlopen itself... " >&6; }
if ${lt_cv_dlopen_self+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then :
+ if test yes = "$cross_compiling"; then :
lt_cv_dlopen_self=cross
else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
@@ -11628,9 +12122,9 @@ else
# endif
#endif
-/* When -fvisbility=hidden is used, assume the code has been annotated
+/* When -fvisibility=hidden is used, assume the code has been annotated
correspondingly for the symbols needed. */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
int fnord () __attribute__((visibility("default")));
#endif
@@ -11660,7 +12154,7 @@ _LT_EOF
(eval $ac_link) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+ test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
@@ -11680,14 +12174,14 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
$as_echo "$lt_cv_dlopen_self" >&6; }
- if test "x$lt_cv_dlopen_self" = xyes; then
+ if test yes = "$lt_cv_dlopen_self"; then
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
if ${lt_cv_dlopen_self_static+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then :
+ if test yes = "$cross_compiling"; then :
lt_cv_dlopen_self_static=cross
else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
@@ -11734,9 +12228,9 @@ else
# endif
#endif
-/* When -fvisbility=hidden is used, assume the code has been annotated
+/* When -fvisibility=hidden is used, assume the code has been annotated
correspondingly for the symbols needed. */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
int fnord () __attribute__((visibility("default")));
#endif
@@ -11766,7 +12260,7 @@ _LT_EOF
(eval $ac_link) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+ test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
@@ -11787,9 +12281,9 @@ fi
$as_echo "$lt_cv_dlopen_self_static" >&6; }
fi
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
+ CPPFLAGS=$save_CPPFLAGS
+ LDFLAGS=$save_LDFLAGS
+ LIBS=$save_LIBS
;;
esac
@@ -11833,7 +12327,7 @@ else
# FIXME - insert some real tests, host_os isn't really good enough
case $host_os in
darwin*)
- if test -n "$STRIP" ; then
+ if test -n "$STRIP"; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -11861,7 +12355,7 @@ fi
- # Report which library types will actually be built
+ # Report what library types will actually be built
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
$as_echo_n "checking if libtool supports shared libraries... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
@@ -11869,13 +12363,13 @@ $as_echo "$can_build_shared" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
$as_echo_n "checking whether to build shared libraries... " >&6; }
- test "$can_build_shared" = "no" && enable_shared=no
+ test no = "$can_build_shared" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
case $host_os in
aix3*)
- test "$enable_shared" = yes && enable_static=no
+ test yes = "$enable_shared" && enable_static=no
if test -n "$RANLIB"; then
archive_cmds="$archive_cmds~\$RANLIB \$lib"
postinstall_cmds='$RANLIB $lib'
@@ -11883,8 +12377,12 @@ $as_echo_n "checking whether to build shared libraries... " >&6; }
;;
aix[4-9]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
+ if test ia64 != "$host_cpu"; then
+ case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+ yes,aix,yes) ;; # shared object as lib.so file only
+ yes,svr4,*) ;; # shared object as lib.so archive member only
+ yes,*) enable_static=no ;; # shared object in lib.a archive as well
+ esac
fi
;;
esac
@@ -11894,7 +12392,7 @@ $as_echo "$enable_shared" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
$as_echo_n "checking whether to build static libraries... " >&6; }
# Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
+ test yes = "$enable_shared" || enable_static=yes
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
$as_echo "$enable_static" >&6; }
@@ -11908,7 +12406,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-CC="$lt_save_CC"
+CC=$lt_save_CC
@@ -14760,6 +15258,68 @@ $as_echo "yes" >&6; }
fi
+# Determine if git is installed and a repository is present in source root dir.
+# Extract the first word of "git", so it can be a program name with args.
+set dummy git; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_GIT_PROG_EXISTS+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$GIT_PROG_EXISTS"; then
+ ac_cv_prog_GIT_PROG_EXISTS="$GIT_PROG_EXISTS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_GIT_PROG_EXISTS="yes"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_prog_GIT_PROG_EXISTS" && ac_cv_prog_GIT_PROG_EXISTS="no"
+fi
+fi
+GIT_PROG_EXISTS=$ac_cv_prog_GIT_PROG_EXISTS
+if test -n "$GIT_PROG_EXISTS"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GIT_PROG_EXISTS" >&5
+$as_echo "$GIT_PROG_EXISTS" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+if test ${GIT_PROG_EXISTS} = "yes" ; then
+ # Determine if a repository exists right here in the build directory.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for git repository in source tree root" >&5
+$as_echo_n "checking for git repository in source tree root... " >&6; }
+ if test $(git rev-parse --git-dir) = ".git" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ git_repo = 1
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ fi
+fi
+ if test x$git_repo = x; then
+ GIT_VERSION_CONTROL_TRUE=
+ GIT_VERSION_CONTROL_FALSE='#'
+else
+ GIT_VERSION_CONTROL_TRUE='#'
+ GIT_VERSION_CONTROL_FALSE=
+fi
+
+
+
# Check whether --enable-libav was given.
if test "${enable_libav+set}" = set; then :
enableval=$enable_libav; makelibav=$enableval
@@ -15186,6 +15746,49 @@ else
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for av_opt_set_sample_fmt in -lavutil" >&5
+$as_echo_n "checking for av_opt_set_sample_fmt in -lavutil... " >&6; }
+if ${ac_cv_lib_avutil_av_opt_set_sample_fmt+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lavutil $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char av_opt_set_sample_fmt ();
+int
+main ()
+{
+return av_opt_set_sample_fmt ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_avutil_av_opt_set_sample_fmt=yes
+else
+ ac_cv_lib_avutil_av_opt_set_sample_fmt=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avutil_av_opt_set_sample_fmt" >&5
+$as_echo "$ac_cv_lib_avutil_av_opt_set_sample_fmt" >&6; }
+if test "x$ac_cv_lib_avutil_av_opt_set_sample_fmt" = xyes; then :
+
+$as_echo "#define USE_SWRESAMPLE 1" >>confdefs.h
+
+fi
+
+
# Check whether --enable-speex was given.
if test "${enable_speex+set}" = set; then :
enableval=$enable_speex; makespeex=$enableval
@@ -15559,12 +16162,13 @@ else
fi
-for ac_header in mpg123.h
+for ac_header in mpg123.h libavutil/channel_layout.h
do :
- ac_fn_c_check_header_mongrel "$LINENO" "mpg123.h" "ac_cv_header_mpg123_h" "$ac_includes_default"
-if test "x$ac_cv_header_mpg123_h" = xyes; then :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
-#define HAVE_MPG123_H 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
@@ -15880,7 +16484,45 @@ else
fi
-if test $makeopus != "no" ; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ogg_stream_flush_fill in -logg" >&5
+$as_echo_n "checking for ogg_stream_flush_fill in -logg... " >&6; }
+if ${ac_cv_lib_ogg_ogg_stream_flush_fill+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-logg $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char ogg_stream_flush_fill ();
+int
+main ()
+{
+return ogg_stream_flush_fill ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_ogg_ogg_stream_flush_fill=yes
+else
+ ac_cv_lib_ogg_ogg_stream_flush_fill=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ogg_ogg_stream_flush_fill" >&5
+$as_echo "$ac_cv_lib_ogg_ogg_stream_flush_fill" >&6; }
+if test "x$ac_cv_lib_ogg_ogg_stream_flush_fill" = xyes; then :
+
+ if test $makeopus != "no" ; then
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPUS" >&5
@@ -15943,24 +16585,24 @@ fi
HAVE_OPUS=0
,
- if test $makeopus = "yes" ; then
- as_fn_error $? "libopus not detected but specifically requested in configure options" "$LINENO" 5
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: IDJC will be built without opus playback or streaming support" >&5
+ if test $makeopus = "yes" ; then
+ as_fn_error $? "libopus not detected but specifically requested in configure options" "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: IDJC will be built without opus playback or streaming support" >&5
$as_echo "$as_me: WARNING: IDJC will be built without opus playback or streaming support" >&2;}
- fi
+ fi
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
HAVE_OPUS=0
,
- if test $makeopus = "yes" ; then
- as_fn_error $? "libopus not detected but specifically requested in configure options" "$LINENO" 5
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: IDJC will be built without opus playback or streaming support" >&5
+ if test $makeopus = "yes" ; then
+ as_fn_error $? "libopus not detected but specifically requested in configure options" "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: IDJC will be built without opus playback or streaming support" >&5
$as_echo "$as_me: WARNING: IDJC will be built without opus playback or streaming support" >&2;}
- fi
+ fi
else
OPUS_CFLAGS=$pkg_cv_OPUS_CFLAGS
OPUS_LIBS=$pkg_cv_OPUS_LIBS
@@ -15970,14 +16612,27 @@ $as_echo "yes" >&6; }
$as_echo "#define HAVE_OPUS 1" >>confdefs.h
- HAVE_OPUS=1
+ HAVE_OPUS=1
fi
+ else
+ HAVE_OPUS=0
+
+ fi
+
else
- HAVE_OPUS=0
+
+ if test $makeopus = "yes" ; then
+ as_fn_error $? "specifically requested opus support requires newer libogg" "$LINENO" 5
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: opus streaming requires newer libogg" >&5
+$as_echo "$as_me: WARNING: opus streaming requires newer libogg" >&2;}
+ HAVE_OPUS=0
+
fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
if ${ac_cv_lib_pthread_pthread_create+:} false; then :
@@ -16017,7 +16672,7 @@ $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
:
else
- as_fn_error $? "\"libpthread not detected\"" "$LINENO" 5
+ as_fn_error $? "libpthread not detected" "$LINENO" 5
fi
@@ -16072,7 +16727,7 @@ if test "x$ac_cv_lib_m_sqrt__pow" = xyes; then :
LIBM="-lm"
else
- as_fn_error $? "\"math library is missing critical function\"" "$LINENO" 5
+ as_fn_error $? "math library is missing critical function" "$LINENO" 5
fi
fi
@@ -16202,7 +16857,7 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
_ACEOF
:
else
- as_fn_error $? "\"Critical header file missing\"" "$LINENO" 5
+ as_fn_error $? "Critical header file missing" "$LINENO" 5
fi
done
@@ -16466,7 +17121,7 @@ if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
_ACEOF
:
else
- as_fn_error $? "\"Critical function missing\"" "$LINENO" 5
+ as_fn_error $? "Critical function missing" "$LINENO" 5
fi
done
@@ -16667,7 +17322,7 @@ DYLIB_EXT=${ext}
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ext}" >&5
$as_echo "${ext}" >&6; }
-ac_config_files="$ac_config_files Makefile po/Makefile.in c/Makefile python/Makefile python/prelims/Makefile artwork/Makefile man/Makefile man/fr/Makefile doc/Makefile python/__init__.py.in idjc.in idjc.desktop.in"
+ac_config_files="$ac_config_files Makefile po/Makefile.in c/Makefile python/Makefile python/prelims/Makefile artwork/Makefile man/Makefile man/fr/Makefile doc/Makefile python/__init__.py.in idjc.in idjc.desktop.in idjc.appdata.xml.in"
cat >confcache <<\_ACEOF
@@ -16802,6 +17457,10 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${GIT_VERSION_CONTROL_TRUE}" && test -z "${GIT_VERSION_CONTROL_FALSE}"; then
+ as_fn_error $? "conditional \"GIT_VERSION_CONTROL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
: "${CONFIG_STATUS=./config.status}"
ac_write_fail=0
@@ -17199,7 +17858,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by idjc $as_me 0.8.14, which was
+This file was extended by idjc $as_me 0.8.15, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17265,7 +17924,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-idjc config.status 0.8.14
+idjc config.status 0.8.15
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -17400,6 +18059,7 @@ enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`'
SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
@@ -17449,10 +18109,13 @@ compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`'
lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
+lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`'
nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
+lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`'
objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
@@ -17517,7 +18180,8 @@ finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
-sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
+configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`'
+configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`'
hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
@@ -17568,9 +18232,12 @@ CFLAGS \
compiler \
lt_cv_sys_global_symbol_pipe \
lt_cv_sys_global_symbol_to_cdecl \
+lt_cv_sys_global_symbol_to_import \
lt_cv_sys_global_symbol_to_c_name_address \
lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
+lt_cv_nm_interface \
nm_file_list_spec \
+lt_cv_truncate_bin \
lt_prog_compiler_no_builtin_flag \
lt_prog_compiler_pic \
lt_prog_compiler_wl \
@@ -17605,7 +18272,7 @@ old_striplib \
striplib; do
case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[\\\\\\\`\\"\\\$]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -17632,10 +18299,11 @@ postinstall_cmds \
postuninstall_cmds \
finish_cmds \
sys_lib_search_path_spec \
-sys_lib_dlsearch_path_spec; do
+configure_time_dlsearch_path \
+configure_time_lt_sys_library_path; do
case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[\\\\\\\`\\"\\\$]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -17644,19 +18312,16 @@ sys_lib_dlsearch_path_spec; do
done
ac_aux_dir='$ac_aux_dir'
-xsi_shell='$xsi_shell'
-lt_shell_append='$lt_shell_append'
-# See if we are running on zsh, and set the options which allow our
+# See if we are running on zsh, and set the options that allow our
# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
+if test -n "\${ZSH_VERSION+set}"; then
setopt NO_GLOB_SUBST
fi
PACKAGE='$PACKAGE'
VERSION='$VERSION'
- TIMESTAMP='$TIMESTAMP'
RM='$RM'
ofile='$ofile'
@@ -17694,6 +18359,7 @@ do
"python/__init__.py.in") CONFIG_FILES="$CONFIG_FILES python/__init__.py.in" ;;
"idjc.in") CONFIG_FILES="$CONFIG_FILES idjc.in" ;;
"idjc.desktop.in") CONFIG_FILES="$CONFIG_FILES idjc.desktop.in" ;;
+ "idjc.appdata.xml.in") CONFIG_FILES="$CONFIG_FILES idjc.appdata.xml.in" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
@@ -18384,55 +19050,53 @@ $as_echo X"$file" |
;;
"libtool":C)
- # See if we are running on zsh, and set the options which allow our
+ # See if we are running on zsh, and set the options that allow our
# commands through without removal of \ escapes.
- if test -n "${ZSH_VERSION+set}" ; then
+ if test -n "${ZSH_VERSION+set}"; then
setopt NO_GLOB_SUBST
fi
- cfgfile="${ofile}T"
+ cfgfile=${ofile}T
trap "$RM \"$cfgfile\"; exit 1" 1 2 15
$RM "$cfgfile"
cat <<_LT_EOF >> "$cfgfile"
#! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Generated automatically by $as_me ($PACKAGE) $VERSION
# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit, 1996
+
+# Copyright (C) 2014 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions. There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of of the License, or
+# (at your option) any later version.
#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# Written by Gordon Matzigkeit, 1996
-#
-# This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program or library that is built
+# using GNU Libtool, you may include this file under the same
+# distribution terms that you use for the rest of that program.
#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# GNU Libtool is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING. If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# The names of the tagged configurations supported by this script.
-available_tags=""
+available_tags=''
+
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
# ### BEGIN LIBTOOL CONFIG
@@ -18452,6 +19116,9 @@ pic_mode=$pic_mode
# Whether or not to optimize for fast installation.
fast_install=$enable_fast_install
+# Shared archive member basename,for filename based shared library versioning on AIX.
+shared_archive_member_spec=$shared_archive_member_spec
+
# Shell to use when invoking shell scripts.
SHELL=$lt_SHELL
@@ -18569,18 +19236,27 @@ global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
# Transform the output of nm in a proper C declaration.
global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+# Transform the output of nm into a list of symbols to manually relocate.
+global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import
+
# Transform the output of nm in a C name address pair.
global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
# Transform the output of nm in a C name address pair when lib prefix is needed.
global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
+# The name lister interface.
+nm_interface=$lt_lt_cv_nm_interface
+
# Specify filename containing input files for \$NM.
nm_file_list_spec=$lt_nm_file_list_spec
-# The root where to search for dependent libraries,and in which our libraries should be installed.
+# The root where to search for dependent libraries,and where our libraries should be installed.
lt_sysroot=$lt_sysroot
+# Command to truncate a binary pipe.
+lt_truncate_bin=$lt_lt_cv_truncate_bin
+
# The name of the directory that contains temporary libtool files.
objdir=$objdir
@@ -18671,8 +19347,11 @@ hardcode_into_libs=$hardcode_into_libs
# Compile-time system search path for libraries.
sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-# Run-time system search path for libraries.
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+# Detected run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path
+
+# Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
+configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path
# Whether dlopen is supported.
dlopen_support=$enable_dlopen
@@ -18765,13 +19444,13 @@ hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
# Whether we need a single "-rpath" flag with a separated argument.
hardcode_libdir_separator=$lt_hardcode_libdir_separator
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
# DIR into the resulting binary.
hardcode_direct=$hardcode_direct
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
# DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# "absolute",i.e impossible to change by setting \$shlibpath_var if the
# library is relocated.
hardcode_direct_absolute=$hardcode_direct_absolute
@@ -18823,13 +19502,72 @@ hardcode_action=$hardcode_action
_LT_EOF
+ cat <<'_LT_EOF' >> "$cfgfile"
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+# string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+# string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+# string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+# "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+# VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+ case x$2 in
+ x)
+ ;;
+ *:)
+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+ ;;
+ x:*)
+ eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+ ;;
+ *::*)
+ eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+ eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+ ;;
+ *)
+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+ ;;
+ esac
+}
+
+
+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+ for cc_temp in $*""; do
+ case $cc_temp in
+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+ \-*) ;;
+ *) break;;
+ esac
+ done
+ func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+
+
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_EOF
+
case $host_os in
aix3*)
cat <<\_LT_EOF >> "$cfgfile"
# AIX sometimes has problems with the GCC collect2 program. For some
# reason, if we set the COLLECT_NAMES environment variable, the problems
# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
+if test set != "${COLLECT_NAMES+set}"; then
COLLECT_NAMES=
export COLLECT_NAMES
fi
@@ -18838,7 +19576,7 @@ _LT_EOF
esac
-ltmain="$ac_aux_dir/ltmain.sh"
+ltmain=$ac_aux_dir/ltmain.sh
# We use sed instead of cat because bash on DJGPP gets confused if
@@ -18848,165 +19586,6 @@ ltmain="$ac_aux_dir/ltmain.sh"
sed '$q' "$ltmain" >> "$cfgfile" \
|| (rm -f "$cfgfile"; exit 1)
- if test x"$xsi_shell" = xyes; then
- sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
-func_dirname ()\
-{\
-\ case ${1} in\
-\ */*) func_dirname_result="${1%/*}${2}" ;;\
-\ * ) func_dirname_result="${3}" ;;\
-\ esac\
-} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_basename ()$/,/^} # func_basename /c\
-func_basename ()\
-{\
-\ func_basename_result="${1##*/}"\
-} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
-func_dirname_and_basename ()\
-{\
-\ case ${1} in\
-\ */*) func_dirname_result="${1%/*}${2}" ;;\
-\ * ) func_dirname_result="${3}" ;;\
-\ esac\
-\ func_basename_result="${1##*/}"\
-} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
-func_stripname ()\
-{\
-\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
-\ # positional parameters, so assign one to ordinary parameter first.\
-\ func_stripname_result=${3}\
-\ func_stripname_result=${func_stripname_result#"${1}"}\
-\ func_stripname_result=${func_stripname_result%"${2}"}\
-} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
-func_split_long_opt ()\
-{\
-\ func_split_long_opt_name=${1%%=*}\
-\ func_split_long_opt_arg=${1#*=}\
-} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
-func_split_short_opt ()\
-{\
-\ func_split_short_opt_arg=${1#??}\
-\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
-} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
-func_lo2o ()\
-{\
-\ case ${1} in\
-\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
-\ *) func_lo2o_result=${1} ;;\
-\ esac\
-} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_xform ()$/,/^} # func_xform /c\
-func_xform ()\
-{\
- func_xform_result=${1%.*}.lo\
-} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_arith ()$/,/^} # func_arith /c\
-func_arith ()\
-{\
- func_arith_result=$(( $* ))\
-} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_len ()$/,/^} # func_len /c\
-func_len ()\
-{\
- func_len_result=${#1}\
-} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-fi
-
-if test x"$lt_shell_append" = xyes; then
- sed -e '/^func_append ()$/,/^} # func_append /c\
-func_append ()\
-{\
- eval "${1}+=\\${2}"\
-} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
-func_append_quoted ()\
-{\
-\ func_quote_for_eval "${2}"\
-\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
-} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- # Save a `func_append' function call where possible by direct use of '+='
- sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- test 0 -eq $? || _lt_function_replace_fail=:
-else
- # Save a `func_append' function call even when '+=' is not available
- sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- test 0 -eq $? || _lt_function_replace_fail=:
-fi
-
-if test x"$_lt_function_replace_fail" = x":"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
-$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
-fi
-
-
mv -f "$cfgfile" "$ofile" ||
(rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
chmod +x "$ofile"
diff --git a/configure.ac b/configure.ac
index f5ab546..3002a13 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,9 +2,9 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([idjc], [0.8.14],
+AC_INIT([idjc], [0.8.15],
[http://idjc.sourceforge.net])
-AC_SUBST(COPYRIGHT_YEAR, [2013])
+AC_SUBST(COPYRIGHT_YEAR, [2015])
AC_CANONICAL_SYSTEM
AC_CONFIG_SRCDIR([config.h.in])
AM_INIT_AUTOMAKE
@@ -35,6 +35,21 @@ PKG_CHECK_MODULES([LIBSAMPLERATE], [samplerate])
PKG_CHECK_MODULES([LIBSNDFILE], [sndfile])
PKG_CHECK_MODULES([GLIB], [glib-2.0])
+# Determine if git is installed and a repository is present in source root dir.
+AC_CHECK_PROG([GIT_PROG_EXISTS], [git], [yes], [no])
+if test ${GIT_PROG_EXISTS} = "yes" ; then
+ # Determine if a repository exists right here in the build directory.
+ AC_MSG_CHECKING([for git repository in source tree root])
+ if test $(git rev-parse --git-dir) = ".git" ; then
+ AC_MSG_RESULT([yes])
+ git_repo = 1
+ else
+ AC_MSG_RESULT([no])
+ fi
+fi
+AM_CONDITIONAL([GIT_VERSION_CONTROL], [test x$git_repo = x])
+
+
AC_ARG_ENABLE([libav],
AC_HELP_STRING([--disable-libav],[remove capability to decode m4a/wma/avi files]),[makelibav=$enableval],[makelibav="maybe"])
@@ -90,6 +105,8 @@ else
AC_SUBST(HAVE_SWRESAMPLE, 0)
fi
+AC_CHECK_LIB([avutil], [av_opt_set_sample_fmt], AC_DEFINE(USE_SWRESAMPLE, 1, [Set if libswresample allows format conversion]))
+
AC_ARG_ENABLE([speex],
AC_HELP_STRING([--disable-speex],[remove the capability to play/stream speex]),
[makespeex=$enableval],[makespeex="maybe"])
@@ -150,7 +167,7 @@ else
AC_SUBST([HAVE_OGGFLAC],[0])
fi
-AC_CHECK_HEADERS([mpg123.h])
+AC_CHECK_HEADERS([mpg123.h libavutil/channel_layout.h])
AC_ARG_ENABLE(mpg123,
AC_HELP_STRING([--disable-mpg123],[remove capability to play mp3 format]),[makempg123=$enableval],[makempg123="maybe"])
@@ -216,31 +233,40 @@ AC_ARG_ENABLE([opus],
AC_HELP_STRING([--disable-opus],[remove capability to play/stream in opus format]),
[makeopus=$enableval],[makeopus="maybe"])
-if test $makeopus != "no" ; then
- PKG_CHECK_MODULES([OPUS], [opus],
- [
- AC_DEFINE(HAVE_OPUS, 1, [Set if libopus was found])
- AC_SUBST(HAVE_OPUS, 1)],
- [AC_SUBST(HAVE_OPUS, 0),
-
- if test $makeopus = "yes" ; then
- AC_MSG_ERROR([libopus not detected but specifically requested in configure options])
- else
- AC_MSG_WARN([IDJC will be built without opus playback or streaming support])
- fi])
-else
- AC_SUBST([HAVE_OPUS],[0])
-fi
-
-AC_CHECK_LIB([pthread], [pthread_create], :, AC_MSG_ERROR("libpthread not detected"))
+AC_CHECK_LIB([ogg], [ogg_stream_flush_fill],[
+ if test $makeopus != "no" ; then
+ PKG_CHECK_MODULES([OPUS], [opus],
+ [
+ AC_DEFINE(HAVE_OPUS, 1, [Set if libopus was found])
+ AC_SUBST(HAVE_OPUS, 1)],
+ [AC_SUBST(HAVE_OPUS, 0),
+
+ if test $makeopus = "yes" ; then
+ AC_MSG_ERROR([libopus not detected but specifically requested in configure options])
+ else
+ AC_MSG_WARN([IDJC will be built without opus playback or streaming support])
+ fi])
+ else
+ AC_SUBST([HAVE_OPUS], 0)
+ fi
+ ],
+ [
+ if test $makeopus = "yes" ; then
+ AC_MSG_ERROR([specifically requested opus support requires newer libogg])
+ fi
+ AC_MSG_WARN([opus streaming requires newer libogg])
+ AC_SUBST([HAVE_OPUS], 0)]
+ )
+
+AC_CHECK_LIB([pthread], [pthread_create], :, AC_MSG_ERROR([libpthread not detected]))
# Conditionally include libm. Some standard libraries could have inbuilt math stuff.
AC_CHECK_FUNCS([sqrt pow], :, [AC_CHECK_LIB([m], [sqrt, pow], AC_SUBST(LIBM, "-lm"),
- AC_MSG_ERROR("math library is missing critical function"))])
+ AC_MSG_ERROR([math library is missing critical function]))])
# Checks for header files.
AC_HEADER_STDC
-AC_CHECK_HEADERS([fcntl.h jack/jack.h jack/transport.h pthread.h], :, AC_MSG_ERROR("Critical header file missing"))
+AC_CHECK_HEADERS([fcntl.h jack/jack.h jack/transport.h pthread.h], :, AC_MSG_ERROR([Critical header file missing]))
# Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
@@ -251,7 +277,7 @@ AC_TYPE_SIZE_T
# Checks for library functions.
AC_FUNC_MALLOC
AC_TYPE_SIGNAL
-AC_CHECK_FUNCS([memset strchr], :, AC_MSG_ERROR("Critical function missing"))
+AC_CHECK_FUNCS([memset strchr], :, AC_MSG_ERROR([Critical function missing]))
AC_CHECK_FUNCS([getline strndup canonicalize_file_name], :,
[AC_DEFINE([USE_BSD_COMPAT],[1],
[Set if GNU extensions need to be replicated])])
@@ -287,6 +313,7 @@ AC_CONFIG_FILES([Makefile
doc/Makefile
python/__init__.py.in
idjc.in
- idjc.desktop.in])
+ idjc.desktop.in
+ idjc.appdata.xml.in])
AC_OUTPUT
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 0f8ad1f..576d3ce 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -149,6 +149,7 @@ EXEEXT = @EXEEXT@
EXT = @EXT@
FGREP = @FGREP@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GIT_PROG_EXISTS = @GIT_PROG_EXISTS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
GMSGFMT = @GMSGFMT@
@@ -206,6 +207,7 @@ LN_S = @LN_S@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
diff --git a/doc/code_idjcmon.html b/doc/code_idjcmon.html
index 2847507..783d27c 100644
--- a/doc/code_idjcmon.html
+++ b/doc/code_idjcmon.html
@@ -130,6 +130,12 @@ def frozen_handler(monitor, profile, pid, frozen):
print "IDJC '%s' with process ID %d is %s" % (
profile, pid, ("no longer frozen", "frozen")[frozen])
+def effect_started_handler(monitor, title, pathname, player):
+ print "Effect player %d is playing %s" % (player, title)
+
+def effect_stopped_handler(monitor, player):
+ print "Effect player %d has stopped" % player
+
try:
profile = sys.argv[1]
except IndexError:
@@ -141,6 +147,8 @@ monitor.connect("quit", quit_handler)
monitor.connect("streamstate-changed", streamstate_handler)
monitor.connect("metadata-changed", metadata_handler)
monitor.connect("frozen", frozen_handler)
+monitor.connect("effect-started", effect_started_handler)
+monitor.connect("effect-stopped", effect_stopped_handler)
gobject.MainLoop().run()
</pre>
diff --git a/doc/install_build.html b/doc/install_build.html
index 1d6dff8..5edab86 100644
--- a/doc/install_build.html
+++ b/doc/install_build.html
@@ -145,25 +145,25 @@ which you typically want the library development packages whose names carry the
<td><a href="http://www.gtk.org/download.html">GLib2</a></td><td>2.0.0+</td><td>Required</td>
</tr>
<tr>
- <td><a href="http://www.mpg123.de/">mpg123</a></td><td>1.13+</td><td>Required—provides support for mp2/mp3 playback</td>
+ <td><a href="http://www.mpg123.de/">mpg123</a></td><td>1.13+</td><td>Recommended—for mp2/mp3 playback</td>
</tr>
<tr>
- <td><a href="http://www.twolame.org/">TwoLAME</a></td><td>0.3+</td><td>Required—provides support for streaming/recording in the mp2 format</td>
+ <td><a href="http://www.twolame.org/">TwoLAME</a></td><td>0.3+</td><td>Recommended—for streaming/recording in the mp2 format</td>
</tr>
<tr>
- <td><a href="http://lame.sourceforge.net/">Lame</a></td><td>3.97+</td><td>Recommended—provides support for streaming/recording in the mp3 format</td>
+ <td><a href="http://lame.sourceforge.net/">Lame</a></td><td>3.97+</td><td>Recommended—for streaming/recording in the mp3 format</td>
</tr>
<tr>
- <td><a href="http://www.ffmpeg.org/">FFmpeg's libav…</a></td><td>0.10/0.8+</td><td>Recommended—provides support for mp4/m4a, ape, mpc, aac(+)</td>
+ <td><a href="http://www.ffmpeg.org/">FFmpeg's libav…</a></td><td>0.10/0.8+</td><td>Recommended—for mp4/m4a, ape, mpc, aac(+)</td>
</tr>
<tr>
- <td><a href="http://flac.sourceforge.net/">FLAC</a></td><td>1.1.3+</td><td>Recommended—provides support for FLAC playback, recording, and streaming</td>
+ <td><a href="http://flac.sourceforge.net/">FLAC</a></td><td>1.1.3+</td><td>Recommended—for FLAC playback, recording, and streaming</td>
</tr>
<tr>
- <td><a href="http://www.speex.org/">Speex</a></td><td>1.2rc1+</td><td>Recommended—provides support for Speex playback and streaming</td>
+ <td><a href="http://www.speex.org/">Speex</a></td><td>1.2rc1+</td><td>Recommended—for Speex playback and streaming</td>
</tr>
<tr>
- <td><a href="http://www.opus-codec.org/">Opus</a></td><td>1.0+</td><td>Recommended—provides support for Opus playback and streaming</td>
+ <td><a href="http://www.opus-codec.org/">Opus</a></td><td>1.0+</td><td>Recommended—for Opus playback and streaming</td>
</tr>
</table>
<p>For Ubuntu users, this command should be enough to satisfy nearly all of the above.</p>
diff --git a/doc/jingles-window.png b/doc/jingles-window.png
index cf6ab70..367c9d6 100644
Binary files a/doc/jingles-window.png and b/doc/jingles-window.png differ
diff --git a/doc/main-window.png b/doc/main-window.png
index 4d7e0ec..7d5513d 100644
Binary files a/doc/main-window.png and b/doc/main-window.png differ
diff --git a/doc/output-window.png b/doc/output-window.png
index 12c5288..79af685 100644
Binary files a/doc/output-window.png and b/doc/output-window.png differ
diff --git a/doc/prefs-bindings.png b/doc/prefs-bindings.png
index 83f62b0..6e4b387 100644
Binary files a/doc/prefs-bindings.png and b/doc/prefs-bindings.png differ
diff --git a/doc/prefs-channels.png b/doc/prefs-channels.png
index bcf6851..61badec 100644
Binary files a/doc/prefs-channels.png and b/doc/prefs-channels.png differ
diff --git a/doc/prefs-general.png b/doc/prefs-general.png
index 08d4135..7c8543a 100644
Binary files a/doc/prefs-general.png and b/doc/prefs-general.png differ
diff --git a/doc/prefs-jack-ports.png b/doc/prefs-jack-ports.png
index d441f32..4c51118 100644
Binary files a/doc/prefs-jack-ports.png and b/doc/prefs-jack-ports.png differ
diff --git a/doc/tutorials_icecast.html b/doc/tutorials_icecast.html
index ae9a599..61262aa 100644
--- a/doc/tutorials_icecast.html
+++ b/doc/tutorials_icecast.html
@@ -321,9 +321,9 @@ inadequate write permissions and try again. Leave Icecast running for the time b
<h4>Configuring IDJC</h4>
-<p>Start the Jack sound server as follows.</p>
+<p>Start the JACK sound server as follows.</p>
<pre>$ jackd -d dummy -r 44100</pre>
-<p>This is done so that any media player, even one that does not support Jack Audio Connection Kit can be
+<p>This is done so that any media player, even one that does not support JACK Audio Connection Kit can be
used for playing the stream on this machine.</p>
<p>Run IDJC and click the Output button in the bottom left hand corner. Click Configuration so the
@@ -335,8 +335,7 @@ can be what you like but choose /listen, login name needs to be source and the p
password, which is <span style="color:red;" title="Obviously a server exposed to the Internet should never
be configured to use its default password">hackme</span>. Click Ok to add the server to the list.</p>
-<p>Click Format. Select the Sample rate drop down box and choose 44100. Select MP3 and the top drop down box.
-Choose 128, Quality 5, and Joint Stereo. </p>
+<p>Click Format. Select MPEG and click the right arrow repeatedly until all the option boxes appear.</p>
<p>Click Individual Controls so the controls section is visible and click the button that says
localhost:8000/listen.</p>
@@ -349,7 +348,7 @@ localhost:8000/listen.</p>
playlist. Click play. Make sure the crossfader is set all the way to the left. Make sure Stream is on and DJ is off.
You should be able to see the Str Peak meter is active.</p>
-<p>If you can't hear anything right now it's because DJ is off and/or you are running a dummy Jack soundcard,
+<p>If you can't hear anything right now it's because DJ is off and/or you are running a dummy JACK soundcard,
which is what you want for the sake of this test.</p>
<h4>Join the stream as a listener</h4>
diff --git a/doc/tutorials_jack_ports_demystified.html b/doc/tutorials_jack_ports_demystified.html
index 45b339d..bd3d4de 100644
--- a/doc/tutorials_jack_ports_demystified.html
+++ b/doc/tutorials_jack_ports_demystified.html
@@ -152,7 +152,7 @@ The audio routing of IDJC to the soundcard happens via JACK ports.</p>
<tr>
<td><p>Misc</p></td>
<td><p>The MIDI port can be connected to ports of MIDI devices to use them to control IDJC.</p>
- <p>The DJ alarm port produces and audible tone when playlists are about to end.</p>
+ <p>The DJ alarm port produces an audible tone when playlists are about to end.</p>
</td>
</tr>
</table>
diff --git a/doc/tutorials_shoutcast.html b/doc/tutorials_shoutcast.html
index 13f64f3..fa8649c 100644
--- a/doc/tutorials_shoutcast.html
+++ b/doc/tutorials_shoutcast.html
@@ -107,46 +107,41 @@ to take that burden, for a price.</p>
<p>Shoutcast may not be available in your Linux distribution. Not really a problem since it's available
as a presumably statically linked binary from <a href="http://www.shoutcast.com">http://www.shoutcast.com</a>.
-It's important that you avoid version 2 because IDJC does not support it yet.
</p>
<h4>Setting up Shoutcast</h4>
-<p>Okay, so having downloaded the version of Shoutcast that's right for your platform and extracted it from
-the archive there should be two files called sc_serv and sc_serv.conf. The first is the server and the
-second is its configuration file. There is also a README.TXT which contains some recommended reading.</p>
-
-<p>Let's run this and see what success looks like.</p>
-
-<pre>$ ./sc_serv sc_serv.conf
-*******************************************************************************
-** SHOUTcast Distributed Network Audio Server
-** Copyright (C) 1998-2004 Nullsoft, Inc. All Rights Reserved.
-** Use "sc_serv filename.ini" to specify an ini file.
-*******************************************************************************
-
-Event log:
-<10/05/10 at 07:09:16> [SHOUTcast] DNAS/Linux v1.9.8 (Feb 28 2007) starting up...
-<10/05/10 at 07:09:16> [main] pid: 5755
-<10/05/10 at 07:09:16> [main] loaded config from sc_serv.conf
-<10/05/10 at 07:09:16> [main] initializing (usermax:32 portbase:8000)...
-<10/05/10 at 07:09:16> [main] No ban file found (sc_serv.ban)
-<10/05/10 at 07:09:16> [main] No rip file found (sc_serv.rip)
-<10/05/10 at 07:09:16> [main] opening source socket
-<10/05/10 at 07:09:16> [main] source thread starting
-<10/05/10 at 07:09:16> [main] opening client socket
-<10/05/10 at 07:09:16> [source] listening for connection on port 8001
-<10/05/10 at 07:09:16> [main] Client Stream thread [0] starting
-<10/05/10 at 07:09:16> [main] client main thread starting</pre>
+<p>Having downloaded the version of Shoutcast that's right for your platform and extracted it from
+the archive you should locate the Shoutcast executable called sc_serv. This needs to be run with a suitable
+confirguration file. There are some examples of these in the source tree as well as a configuration builder.
+For the sake of simplicity a minimalist configuration will be used for this demonstration.
+</p>
+
+<p>Let's use a basic configuration file that we shall call sc_serv.conf which allows IDJC and listener clients to
+connect to/from localhost merely for test purposes and contains the following text:</p>
+<pre>
+logfile=logs/sc_serv.log
+w3clog=logs/sc_w3c.log
+banfile=control/sc_serv.ban
+ripfile=control/sc_serv.rip
+password=changeme
+adminpassword=protected
+</pre>
+
+<p>Let's run this with the following command.</p>
+
+<pre>$ ./sc_serv sc_serv.conf</pre>
+
+<p>Assuming you were not dumped back to a console prompt the server is now running.</p>
<h4>Configuring IDJC</h4>
-<p>Start the Jack sound server as follows.</p>
+<p>Start the JACK sound server as follows.</p>
<pre>$ jackd -d dummy -r 44100</pre>
-<p>This is done so that any media player, even one that does not support Jack Audio Connection Kit can be
+<p>This is done so that any media player, even one that does not support JACK Audio Connection Kit can be
used for playing the stream on this machine.</p>
-<p>Run IDJC and click the Output button in the bottom left hand corner. Click Configuration so the
+<p>Run IDJC open the Output window from the View menu. Click Configuration so the
configuration section is visible.</p>
<p>Click Connection, then New.</p>
@@ -154,8 +149,7 @@ configuration section is visible.</p>
will be the default password, which is <span style="color:red;" title="Obviously a server exposed to the Internet
should never be configured to use its default password">changeme</span>. Click Ok to add the server to the list.</p>
-<p>Click Format. Select the Sample rate drop down box and choose 44100. Select MP3 and the top drop down box.
-Choose 128, Quality 5, and Joint Stereo. </p>
+<p>Click Format. Select MPEG and click the right arrow repeatedly until all the option boxes appear.</p>
<p>Click Individual Controls so the controls section is visible and click the button that says
localhost:8000/listen.</p>
@@ -168,7 +162,7 @@ localhost:8000/listen.</p>
playlist. Click play. Make sure the crossfader is set all the way to the left. Make sure Stream is on and DJ is off.
You should be able to see the Str Peak meter is active.</p>
-<p>If you can't hear anything right now it's because DJ is off and/or you are running a dummy Jack soundcard,
+<p>If you can't hear anything right now it's because DJ is off and/or you are running a dummy JACK soundcard,
which is what you want for the sake of this test.</p>
<h4>Join the stream as a listener</h4>
diff --git a/doc/tutorials_voip.html b/doc/tutorials_voip.html
index 174a492..8e51cf6 100644
--- a/doc/tutorials_voip.html
+++ b/doc/tutorials_voip.html
@@ -145,11 +145,9 @@ however after doing so there may still be reason 2 to contend with.</p>
<a href="http://packages.debian.org/squeeze/libasound2-plugins">binary</a>. This is intended
as a replacement for the current <i>alsa-plugins</i> package so remove the old version first.</p>
-<h4>Skype configuration</h4>
-
-<p>Launch Skype and Hit <i>Ctrl + O</i>. Choose <i>Sound Devices</i> and for each of the
-<i>Sound In</i>, <i>Sound Out</i>, and <i>Ringing</i> options, select <i>idjcvoip</i> then
-click <i>Apply</i>. Leave the configuration window open for the next step.</p>
+<h4>Skype/Pulseaudio configuration</h4>
+<p>Lots of messing about ever since Skype forced the use of Pulseaudio. Official JACK documentation <a href="http://jackaudio.org/faq/pulseaudio_and_jack.html
+">here</a>. Once you have Pulseaudio ports in JACK they will require connection to the IDJC VoIP JACK ports.</p>
<h4>Testing</h4>
diff --git a/idjc.appdata.xml.in.in b/idjc.appdata.xml.in.in
new file mode 100644
index 0000000..498f3e2
--- /dev/null
+++ b/idjc.appdata.xml.in.in
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright @COPYRIGHT_YEAR@ Stephen Fairchild <s-fairchild at users.sourceforge.net> -->
+<application>
+ <id type="desktop">@PACKAGE_NAME at .desktop</id>
+ <metadata_license>CC0-1.0</metadata_license>
+ <project_license>GPL-2.0+ and GFDL-1.3</project_license>
+ <name>Internet DJ Console</name>
+ <summary>Be a DJ on the Internet</summary>
+ <description>
+ <p>
+ A powerful yet easy to use source-client for people interested in streaming
+ live radio shows over the Internet using Shoutcast or Icecast servers.
+ </p>
+ <p>
+ Up to 9 simultaneous streams. 12 mono or 6 stereo general purpose audio inputs.
+ 3 media players. An effects rack. The audio routing flexibility of Jack Audio Connection Kit.
+ IRC announcements. Ampache music database support.
+ </p>
+ </description>
+ <screenshots>
+ <screenshot type="default" width="1088" height="612">http://idjc.sourceforge.net/appdata_screenshot.png</screenshot>
+ </screenshots>
+ <url type="homepage">http://idjc.sourceforge.net</url>
+ <updatecontact>http://sourceforge.net/api/file/index/project-id/135773/mtime/desc/limit/20/rss</updatecontact>
+</application>
diff --git a/ltmain.sh b/ltmain.sh
index 63ae69d..0f0a2da 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -1,9 +1,12 @@
+#! /bin/sh
+## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
+## by inline-source v2014-01-03.01
-# libtool (GNU libtool) 2.4.2
+# libtool (GNU libtool) 2.4.6
+# Provide generalized library-building support services.
# Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1996-2015 Free Software Foundation, Inc.
# This is free software; see the source for copying conditions. There is NO
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -23,881 +26,2112 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING. If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html,
-# or obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Usage: $progname [OPTION]... [MODE-ARG]...
-#
-# Provide generalized library-building support services.
-#
-# --config show all configuration variables
-# --debug enable verbose shell tracing
-# -n, --dry-run display commands without modifying any files
-# --features display basic configuration information and exit
-# --mode=MODE use operation mode MODE
-# --preserve-dup-deps don't remove duplicate dependency libraries
-# --quiet, --silent don't print informational messages
-# --no-quiet, --no-silent
-# print informational messages (default)
-# --no-warn don't display warning messages
-# --tag=TAG use configuration variables from tag TAG
-# -v, --verbose print more informational messages than default
-# --no-verbose don't print the extra informational messages
-# --version print version information
-# -h, --help, --help-all print short, long, or detailed help message
-#
-# MODE must be one of the following:
-#
-# clean remove files from the build directory
-# compile compile a source file into a libtool object
-# execute automatically set library path, then run a program
-# finish complete the installation of libtool libraries
-# install install libraries or executables
-# link create a library or an executable
-# uninstall remove libraries from an installed directory
-#
-# MODE-ARGS vary depending on the MODE. When passed as first option,
-# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
-# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
-#
-# When reporting a bug, please describe a test case to reproduce it and
-# include the following information:
-#
-# host-triplet: $host
-# shell: $SHELL
-# compiler: $LTCC
-# compiler flags: $LTCFLAGS
-# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.4.2
-# automake: $automake_version
-# autoconf: $autoconf_version
-#
-# Report bugs to <bug-libtool at gnu.org>.
-# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
-# General help using GNU software: <http://www.gnu.org/gethelp/>.
PROGRAM=libtool
PACKAGE=libtool
-VERSION=2.4.2
-TIMESTAMP=""
-package_revision=1.3337
+VERSION=2.4.6
+package_revision=2.4.6
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# Run './libtool --help' for help with using this script from the
+# command line.
+
+
+## ------------------------------- ##
+## User overridable command paths. ##
+## ------------------------------- ##
+
+# After configure completes, it has a better idea of some of the
+# shell tools we need than the defaults used by the functions shared
+# with bootstrap, so set those here where they can still be over-
+# ridden by the user, but otherwise take precedence.
+
+: ${AUTOCONF="autoconf"}
+: ${AUTOMAKE="automake"}
+
+
+## -------------------------- ##
+## Source external libraries. ##
+## -------------------------- ##
+
+# Much of our low-level functionality needs to be sourced from external
+# libraries, which are installed to $pkgauxdir.
+
+# Set a version string for this script.
+scriptversion=2015-01-20.17; # UTC
+
+# General shell script boiler plate, and helper functions.
+# Written by Gary V. Vaughan, 2004
+
+# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions. There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# As a special exception to the GNU General Public License, if you distribute
+# this file as part of a program or library that is built using GNU Libtool,
+# you may include this file under the same distribution terms that you use
+# for the rest of that program.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Please report bugs or propose patches to gary at gnu.org.
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# Evaluate this file near the top of your script to gain access to
+# the functions and variables defined here:
+#
+# . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh
+#
+# If you need to override any of the default environment variable
+# settings, do that before evaluating this file.
+
+
+## -------------------- ##
+## Shell normalisation. ##
+## -------------------- ##
+
+# Some shells need a little help to be as Bourne compatible as possible.
+# Before doing anything else, make sure all that help has been provided!
+
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+ case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac
fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
- eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
-}
-# NLS nuisances: We save the old values to restore during execute mode.
-lt_user_locale=
-lt_safe_locale=
-for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+# NLS nuisances: We save the old values in case they are required later.
+_G_user_locale=
+_G_safe_locale=
+for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
do
- eval "if test \"\${$lt_var+set}\" = set; then
- save_$lt_var=\$$lt_var
- $lt_var=C
- export $lt_var
- lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
- lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
+ eval "if test set = \"\${$_G_var+set}\"; then
+ save_$_G_var=\$$_G_var
+ $_G_var=C
+ export $_G_var
+ _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\"
+ _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\"
fi"
done
-LC_ALL=C
-LANGUAGE=C
-export LANGUAGE LC_ALL
-$lt_unset CDPATH
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+# Make sure IFS has a sensible default
+sp=' '
+nl='
+'
+IFS="$sp $nl"
+
+# There are apparently some retarded systems that use ';' as a PATH separator!
+if test "${PATH_SEPARATOR+set}" != set; then
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+ PATH_SEPARATOR=';'
+ }
+fi
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
+## ------------------------- ##
+## Locate command utilities. ##
+## ------------------------- ##
+
+
+# func_executable_p FILE
+# ----------------------
+# Check that FILE is an executable regular file.
+func_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+}
+
+
+# func_path_progs PROGS_LIST CHECK_FUNC [PATH]
+# --------------------------------------------
+# Search for either a program that responds to --version with output
+# containing "GNU", or else returned by CHECK_FUNC otherwise, by
+# trying all the directories in PATH with each of the elements of
+# PROGS_LIST.
+#
+# CHECK_FUNC should accept the path to a candidate program, and
+# set $func_check_prog_result if it truncates its output less than
+# $_G_path_prog_max characters.
+func_path_progs ()
+{
+ _G_progs_list=$1
+ _G_check_func=$2
+ _G_PATH=${3-"$PATH"}
+
+ _G_path_prog_max=0
+ _G_path_prog_found=false
+ _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:}
+ for _G_dir in $_G_PATH; do
+ IFS=$_G_save_IFS
+ test -z "$_G_dir" && _G_dir=.
+ for _G_prog_name in $_G_progs_list; do
+ for _exeext in '' .EXE; do
+ _G_path_prog=$_G_dir/$_G_prog_name$_exeext
+ func_executable_p "$_G_path_prog" || continue
+ case `"$_G_path_prog" --version 2>&1` in
+ *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;;
+ *) $_G_check_func $_G_path_prog
+ func_path_progs_result=$func_check_prog_result
+ ;;
+ esac
+ $_G_path_prog_found && break 3
+ done
+ done
+ done
+ IFS=$_G_save_IFS
+ test -z "$func_path_progs_result" && {
+ echo "no acceptable sed could be found in \$PATH" >&2
+ exit 1
+ }
+}
+
+
+# We want to be able to use the functions in this file before configure
+# has figured out where the best binaries are kept, which means we have
+# to search for them ourselves - except when the results are already set
+# where we skip the searches.
+
+# Unless the user overrides by setting SED, search the path for either GNU
+# sed, or the sed that truncates its output the least.
+test -z "$SED" && {
+ _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+ for _G_i in 1 2 3 4 5 6 7; do
+ _G_sed_script=$_G_sed_script$nl$_G_sed_script
+ done
+ echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed
+ _G_sed_script=
+
+ func_check_prog_sed ()
+ {
+ _G_path_prog=$1
+
+ _G_count=0
+ printf 0123456789 >conftest.in
+ while :
+ do
+ cat conftest.in conftest.in >conftest.tmp
+ mv conftest.tmp conftest.in
+ cp conftest.in conftest.nl
+ echo '' >> conftest.nl
+ "$_G_path_prog" -f conftest.sed <conftest.nl >conftest.out 2>/dev/null || break
+ diff conftest.out conftest.nl >/dev/null 2>&1 || break
+ _G_count=`expr $_G_count + 1`
+ if test "$_G_count" -gt "$_G_path_prog_max"; then
+ # Best one so far, save it but keep looking for a better one
+ func_check_prog_result=$_G_path_prog
+ _G_path_prog_max=$_G_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test 10 -lt "$_G_count" && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out
+ }
+
+ func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin
+ rm -f conftest.sed
+ SED=$func_path_progs_result
+}
+
+
+# Unless the user overrides by setting GREP, search the path for either GNU
+# grep, or the grep that truncates its output the least.
+test -z "$GREP" && {
+ func_check_prog_grep ()
+ {
+ _G_path_prog=$1
+
+ _G_count=0
+ _G_path_prog_max=0
+ printf 0123456789 >conftest.in
+ while :
+ do
+ cat conftest.in conftest.in >conftest.tmp
+ mv conftest.tmp conftest.in
+ cp conftest.in conftest.nl
+ echo 'GREP' >> conftest.nl
+ "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' <conftest.nl >conftest.out 2>/dev/null || break
+ diff conftest.out conftest.nl >/dev/null 2>&1 || break
+ _G_count=`expr $_G_count + 1`
+ if test "$_G_count" -gt "$_G_path_prog_max"; then
+ # Best one so far, save it but keep looking for a better one
+ func_check_prog_result=$_G_path_prog
+ _G_path_prog_max=$_G_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test 10 -lt "$_G_count" && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out
+ }
+
+ func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin
+ GREP=$func_path_progs_result
+}
+
+
+## ------------------------------- ##
+## User overridable command paths. ##
+## ------------------------------- ##
+
+# All uppercase variable names are used for environment variables. These
+# variables can be overridden by the user before calling a script that
+# uses them if a suitable command of that name is not already available
+# in the command search PATH.
: ${CP="cp -f"}
-test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
+: ${ECHO="printf %s\n"}
+: ${EGREP="$GREP -E"}
+: ${FGREP="$GREP -F"}
+: ${LN_S="ln -s"}
: ${MAKE="make"}
: ${MKDIR="mkdir"}
: ${MV="mv -f"}
: ${RM="rm -f"}
: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
-: ${Xsed="$SED -e 1s/^X//"}
-
-# Global variables:
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing.
-EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake.
-
-exit_status=$EXIT_SUCCESS
-
-# Make sure IFS has a sensible default
-lt_nl='
-'
-IFS=" $lt_nl"
-dirname="s,/[^/]*$,,"
-basename="s,^.*/,,"
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
- if test "X$func_dirname_result" = "X${1}"; then
- func_dirname_result="${3}"
- else
- func_dirname_result="$func_dirname_result${2}"
- fi
-} # func_dirname may be replaced by extended shell implementation
+## -------------------- ##
+## Useful sed snippets. ##
+## -------------------- ##
+sed_dirname='s|/[^/]*$||'
+sed_basename='s|^.*/||'
-# func_basename file
-func_basename ()
-{
- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
-} # func_basename may be replaced by extended shell implementation
+# Sed substitution that helps us do robust quoting. It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='s|\([`"$\\]\)|\\\1|g'
+# Same as above, but do not quote variable references.
+sed_double_quote_subst='s/\(["`\\]\)/\\\1/g'
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-# dirname: Compute the dirname of FILE. If nonempty,
-# add APPEND to the result, otherwise set result
-# to NONDIR_REPLACEMENT.
-# value returned in "$func_dirname_result"
-# basename: Compute filename of FILE.
-# value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
- # Extract subdirectory from the argument.
- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
- if test "X$func_dirname_result" = "X${1}"; then
- func_dirname_result="${3}"
- else
- func_dirname_result="$func_dirname_result${2}"
- fi
- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
-} # func_dirname_and_basename may be replaced by extended shell implementation
+# Sed substitution that turns a string into a regex matching for the
+# string literally.
+sed_make_literal_regex='s|[].[^$\\*\/]|\\&|g'
+# Sed substitution that converts a w32 file name or path
+# that contains forward slashes, into one that contains
+# (escaped) backslashes. A very naive implementation.
+sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+
+# Re-'\' parameter expansions in output of sed_double_quote_subst that
+# were '\'-ed in input to the same. If an odd number of '\' preceded a
+# '$' in input to sed_double_quote_subst, that '$' was protected from
+# expansion. Since each input '\' is now two '\'s, look for any number
+# of runs of four '\'s followed by two '\'s and then a '$'. '\' that '$'.
+_G_bs='\\'
+_G_bs2='\\\\'
+_G_bs4='\\\\\\\\'
+_G_dollar='\$'
+sed_double_backslash="\
+ s/$_G_bs4/&\\
+/g
+ s/^$_G_bs2$_G_dollar/$_G_bs&/
+ s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g
+ s/\n//g"
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
- case ${2} in
- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
- esac
-} # func_stripname may be replaced by extended shell implementation
+## ----------------- ##
+## Global variables. ##
+## ----------------- ##
-# These SED scripts presuppose an absolute path with a trailing slash.
-pathcar='s,^/\([^/]*\).*$,\1,'
-pathcdr='s,^/[^/]*,,'
-removedotparts=':dotsl
- s@/\./@/@g
- t dotsl
- s,/\.$,/,'
-collapseslashes='s@/\{1,\}@/@g'
-finalslash='s,/*$,/,'
+# Except for the global variables explicitly listed below, the following
+# functions in the '^func_' namespace, and the '^require_' namespace
+# variables initialised in the 'Resource management' section, sourcing
+# this file will not pollute your global namespace with anything
+# else. There's no portable way to scope variables in Bourne shell
+# though, so actually running these functions will sometimes place
+# results into a variable named after the function, and often use
+# temporary variables in the '^_G_' namespace. If you are careful to
+# avoid using those namespaces casually in your sourcing script, things
+# should continue to work as you expect. And, of course, you can freely
+# overwrite any of the functions or variables defined here before
+# calling anything to customize them.
-# func_normal_abspath PATH
-# Remove doubled-up and trailing slashes, "." path components,
-# and cancel out any ".." path components in PATH after making
-# it an absolute path.
-# value returned in "$func_normal_abspath_result"
-func_normal_abspath ()
-{
- # Start from root dir and reassemble the path.
- func_normal_abspath_result=
- func_normal_abspath_tpath=$1
- func_normal_abspath_altnamespace=
- case $func_normal_abspath_tpath in
- "")
- # Empty path, that just means $cwd.
- func_stripname '' '/' "`pwd`"
- func_normal_abspath_result=$func_stripname_result
- return
- ;;
- # The next three entries are used to spot a run of precisely
- # two leading slashes without using negated character classes;
- # we take advantage of case's first-match behaviour.
- ///*)
- # Unusual form of absolute path, do nothing.
- ;;
- //*)
- # Not necessarily an ordinary path; POSIX reserves leading '//'
- # and for example Cygwin uses it to access remote file shares
- # over CIFS/SMB, so we conserve a leading double slash if found.
- func_normal_abspath_altnamespace=/
- ;;
- /*)
- # Absolute path, do nothing.
- ;;
- *)
- # Relative path, prepend $cwd.
- func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
- ;;
- esac
- # Cancel out all the simple stuff to save iterations. We also want
- # the path to end with a slash for ease of parsing, so make sure
- # there is one (and only one) here.
- func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
- -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
- while :; do
- # Processed it all yet?
- if test "$func_normal_abspath_tpath" = / ; then
- # If we ascended to the root using ".." the result may be empty now.
- if test -z "$func_normal_abspath_result" ; then
- func_normal_abspath_result=/
- fi
- break
- fi
- func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
- -e "$pathcar"`
- func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
- -e "$pathcdr"`
- # Figure out what to do with it
- case $func_normal_abspath_tcomponent in
- "")
- # Trailing empty path component, ignore it.
- ;;
- ..)
- # Parent dir; strip last assembled component from result.
- func_dirname "$func_normal_abspath_result"
- func_normal_abspath_result=$func_dirname_result
- ;;
- *)
- # Actual path component, append it.
- func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
- ;;
- esac
- done
- # Restore leading double-slash if one was found on entry.
- func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
-}
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing.
+EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake.
-# func_relative_path SRCDIR DSTDIR
-# generates a relative path from SRCDIR to DSTDIR, with a trailing
-# slash if non-empty, suitable for immediately appending a filename
-# without needing to append a separator.
-# value returned in "$func_relative_path_result"
-func_relative_path ()
-{
- func_relative_path_result=
- func_normal_abspath "$1"
- func_relative_path_tlibdir=$func_normal_abspath_result
- func_normal_abspath "$2"
- func_relative_path_tbindir=$func_normal_abspath_result
-
- # Ascend the tree starting from libdir
- while :; do
- # check if we have found a prefix of bindir
- case $func_relative_path_tbindir in
- $func_relative_path_tlibdir)
- # found an exact match
- func_relative_path_tcancelled=
- break
- ;;
- $func_relative_path_tlibdir*)
- # found a matching prefix
- func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
- func_relative_path_tcancelled=$func_stripname_result
- if test -z "$func_relative_path_result"; then
- func_relative_path_result=.
- fi
- break
- ;;
- *)
- func_dirname $func_relative_path_tlibdir
- func_relative_path_tlibdir=${func_dirname_result}
- if test "x$func_relative_path_tlibdir" = x ; then
- # Have to descend all the way to the root!
- func_relative_path_result=../$func_relative_path_result
- func_relative_path_tcancelled=$func_relative_path_tbindir
- break
- fi
- func_relative_path_result=../$func_relative_path_result
- ;;
- esac
- done
+# Allow overriding, eg assuming that you follow the convention of
+# putting '$debug_cmd' at the start of all your functions, you can get
+# bash to show function call trace with:
+#
+# debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name
+debug_cmd=${debug_cmd-":"}
+exit_cmd=:
- # Now calculate path; take care to avoid doubling-up slashes.
- func_stripname '' '/' "$func_relative_path_result"
- func_relative_path_result=$func_stripname_result
- func_stripname '/' '/' "$func_relative_path_tcancelled"
- if test "x$func_stripname_result" != x ; then
- func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
- fi
+# By convention, finish your script with:
+#
+# exit $exit_status
+#
+# so that you can set exit_status to non-zero if you want to indicate
+# something went wrong during execution without actually bailing out at
+# the point of failure.
+exit_status=$EXIT_SUCCESS
- # Normalisation. If bindir is libdir, return empty string,
- # else relative path ending with a slash; either way, target
- # file name can be directly appended.
- if test ! -z "$func_relative_path_result"; then
- func_stripname './' '' "$func_relative_path_result/"
- func_relative_path_result=$func_stripname_result
- fi
-}
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath=$0
-# The name of this program:
-func_dirname_and_basename "$progpath"
-progname=$func_basename_result
+# The name of this program.
+progname=`$ECHO "$progpath" |$SED "$sed_basename"`
-# Make sure we have an absolute path for reexecution:
+# Make sure we have an absolute progpath for reexecution:
case $progpath in
[\\/]*|[A-Za-z]:\\*) ;;
*[\\/]*)
- progdir=$func_dirname_result
+ progdir=`$ECHO "$progpath" |$SED "$sed_dirname"`
progdir=`cd "$progdir" && pwd`
- progpath="$progdir/$progname"
+ progpath=$progdir/$progname
;;
*)
- save_IFS="$IFS"
+ _G_IFS=$IFS
IFS=${PATH_SEPARATOR-:}
for progdir in $PATH; do
- IFS="$save_IFS"
+ IFS=$_G_IFS
test -x "$progdir/$progname" && break
done
- IFS="$save_IFS"
+ IFS=$_G_IFS
test -n "$progdir" || progdir=`pwd`
- progpath="$progdir/$progname"
+ progpath=$progdir/$progname
;;
esac
-# Sed substitution that helps us do robust quoting. It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
-# Sed substitution that turns a string into a regex matching for the
-# string literally.
-sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
+## ----------------- ##
+## Standard options. ##
+## ----------------- ##
-# Sed substitution that converts a w32 file name or path
-# which contains forward slashes, into one that contains
-# (escaped) backslashes. A very naive implementation.
-lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-
-# Re-`\' parameter expansions in output of double_quote_subst that were
-# `\'-ed in input to the same. If an odd number of `\' preceded a '$'
-# in input to double_quote_subst, that '$' was protected from expansion.
-# Since each input `\' is now two `\'s, look for any number of runs of
-# four `\'s followed by two `\'s and then a '$'. `\' that '$'.
-bs='\\'
-bs2='\\\\'
-bs4='\\\\\\\\'
-dollar='\$'
-sed_double_backslash="\
- s/$bs4/&\\
-/g
- s/^$bs2$dollar/$bs&/
- s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
- s/\n//g"
+# The following options affect the operation of the functions defined
+# below, and should be set appropriately depending on run-time para-
+# meters passed on the command line.
-# Standard options:
opt_dry_run=false
-opt_help=false
opt_quiet=false
opt_verbose=false
-opt_warning=:
-# func_echo arg...
-# Echo program name prefixed message, along with the current mode
-# name if it has been set yet.
-func_echo ()
-{
- $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
-}
+# Categories 'all' and 'none' are always available. Append any others
+# you will pass as the first argument to func_warning from your own
+# code.
+warning_categories=
-# func_verbose arg...
-# Echo program name prefixed message in verbose mode only.
-func_verbose ()
-{
- $opt_verbose && func_echo ${1+"$@"}
+# By default, display warnings according to 'opt_warning_types'. Set
+# 'warning_func' to ':' to elide all warnings, or func_fatal_error to
+# treat the next displayed warning as a fatal error.
+warning_func=func_warn_and_continue
- # A bug in bash halts the script if the last line of a function
- # fails when set -e is in force, so we need another command to
- # work around that:
- :
-}
+# Set to 'all' to display all warnings, 'none' to suppress all
+# warnings, or a space delimited list of some subset of
+# 'warning_categories' to display only the listed warnings.
+opt_warning_types=all
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
- $ECHO "$*"
-}
-# func_error arg...
-# Echo program name prefixed message to standard error.
-func_error ()
-{
- $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
-}
+## -------------------- ##
+## Resource management. ##
+## -------------------- ##
-# func_warning arg...
-# Echo program name prefixed warning message to standard error.
-func_warning ()
-{
- $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
+# This section contains definitions for functions that each ensure a
+# particular resource (a file, or a non-empty configuration variable for
+# example) is available, and if appropriate to extract default values
+# from pertinent package files. Call them using their associated
+# 'require_*' variable to ensure that they are executed, at most, once.
+#
+# It's entirely deliberate that calling these functions can set
+# variables that don't obey the namespace limitations obeyed by the rest
+# of this file, in order that that they be as useful as possible to
+# callers.
- # bash bug again:
- :
-}
-# func_fatal_error arg...
-# Echo program name prefixed message to standard error, and exit.
-func_fatal_error ()
+# require_term_colors
+# -------------------
+# Allow display of bold text on terminals that support it.
+require_term_colors=func_require_term_colors
+func_require_term_colors ()
{
- func_error ${1+"$@"}
- exit $EXIT_FAILURE
-}
+ $debug_cmd
+
+ test -t 1 && {
+ # COLORTERM and USE_ANSI_COLORS environment variables take
+ # precedence, because most terminfo databases neglect to describe
+ # whether color sequences are supported.
+ test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"}
+
+ if test 1 = "$USE_ANSI_COLORS"; then
+ # Standard ANSI escape sequences
+ tc_reset='[0m'
+ tc_bold='[1m'; tc_standout='[7m'
+ tc_red='[31m'; tc_green='[32m'
+ tc_blue='[34m'; tc_cyan='[36m'
+ else
+ # Otherwise trust the terminfo database after all.
+ test -n "`tput sgr0 2>/dev/null`" && {
+ tc_reset=`tput sgr0`
+ test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold`
+ tc_standout=$tc_bold
+ test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso`
+ test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1`
+ test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2`
+ test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4`
+ test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5`
+ }
+ fi
+ }
-# func_fatal_help arg...
-# Echo program name prefixed message to standard error, followed by
-# a help hint, and exit.
-func_fatal_help ()
-{
- func_error ${1+"$@"}
- func_fatal_error "$help"
+ require_term_colors=:
}
-help="Try \`$progname --help' for more information." ## default
-# func_grep expression filename
+## ----------------- ##
+## Function library. ##
+## ----------------- ##
+
+# This section contains a variety of useful functions to call in your
+# scripts. Take note of the portable wrappers for features provided by
+# some modern shells, which will fall back to slower equivalents on
+# less featureful shells.
+
+
+# func_append VAR VALUE
+# ---------------------
+# Append VALUE onto the existing contents of VAR.
+
+ # We should try to minimise forks, especially on Windows where they are
+ # unreasonably slow, so skip the feature probes when bash or zsh are
+ # being used:
+ if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then
+ : ${_G_HAVE_ARITH_OP="yes"}
+ : ${_G_HAVE_XSI_OPS="yes"}
+ # The += operator was introduced in bash 3.1
+ case $BASH_VERSION in
+ [12].* | 3.0 | 3.0*) ;;
+ *)
+ : ${_G_HAVE_PLUSEQ_OP="yes"}
+ ;;
+ esac
+ fi
+
+ # _G_HAVE_PLUSEQ_OP
+ # Can be empty, in which case the shell is probed, "yes" if += is
+ # useable or anything else if it does not work.
+ test -z "$_G_HAVE_PLUSEQ_OP" \
+ && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \
+ && _G_HAVE_PLUSEQ_OP=yes
+
+if test yes = "$_G_HAVE_PLUSEQ_OP"
+then
+ # This is an XSI compatible shell, allowing a faster implementation...
+ eval 'func_append ()
+ {
+ $debug_cmd
+
+ eval "$1+=\$2"
+ }'
+else
+ # ...otherwise fall back to using expr, which is often a shell builtin.
+ func_append ()
+ {
+ $debug_cmd
+
+ eval "$1=\$$1\$2"
+ }
+fi
+
+
+# func_append_quoted VAR VALUE
+# ----------------------------
+# Quote VALUE and append to the end of shell variable VAR, separated
+# by a space.
+if test yes = "$_G_HAVE_PLUSEQ_OP"; then
+ eval 'func_append_quoted ()
+ {
+ $debug_cmd
+
+ func_quote_for_eval "$2"
+ eval "$1+=\\ \$func_quote_for_eval_result"
+ }'
+else
+ func_append_quoted ()
+ {
+ $debug_cmd
+
+ func_quote_for_eval "$2"
+ eval "$1=\$$1\\ \$func_quote_for_eval_result"
+ }
+fi
+
+
+# func_append_uniq VAR VALUE
+# --------------------------
+# Append unique VALUE onto the existing contents of VAR, assuming
+# entries are delimited by the first character of VALUE. For example:
+#
+# func_append_uniq options " --another-option option-argument"
+#
+# will only append to $options if " --another-option option-argument "
+# is not already present somewhere in $options already (note spaces at
+# each end implied by leading space in second argument).
+func_append_uniq ()
+{
+ $debug_cmd
+
+ eval _G_current_value='`$ECHO $'$1'`'
+ _G_delim=`expr "$2" : '\(.\)'`
+
+ case $_G_delim$_G_current_value$_G_delim in
+ *"$2$_G_delim"*) ;;
+ *) func_append "$@" ;;
+ esac
+}
+
+
+# func_arith TERM...
+# ------------------
+# Set func_arith_result to the result of evaluating TERMs.
+ test -z "$_G_HAVE_ARITH_OP" \
+ && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \
+ && _G_HAVE_ARITH_OP=yes
+
+if test yes = "$_G_HAVE_ARITH_OP"; then
+ eval 'func_arith ()
+ {
+ $debug_cmd
+
+ func_arith_result=$(( $* ))
+ }'
+else
+ func_arith ()
+ {
+ $debug_cmd
+
+ func_arith_result=`expr "$@"`
+ }
+fi
+
+
+# func_basename FILE
+# ------------------
+# Set func_basename_result to FILE with everything up to and including
+# the last / stripped.
+if test yes = "$_G_HAVE_XSI_OPS"; then
+ # If this shell supports suffix pattern removal, then use it to avoid
+ # forking. Hide the definitions single quotes in case the shell chokes
+ # on unsupported syntax...
+ _b='func_basename_result=${1##*/}'
+ _d='case $1 in
+ */*) func_dirname_result=${1%/*}$2 ;;
+ * ) func_dirname_result=$3 ;;
+ esac'
+
+else
+ # ...otherwise fall back to using sed.
+ _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`'
+ _d='func_dirname_result=`$ECHO "$1" |$SED "$sed_dirname"`
+ if test "X$func_dirname_result" = "X$1"; then
+ func_dirname_result=$3
+ else
+ func_append func_dirname_result "$2"
+ fi'
+fi
+
+eval 'func_basename ()
+{
+ $debug_cmd
+
+ '"$_b"'
+}'
+
+
+# func_dirname FILE APPEND NONDIR_REPLACEMENT
+# -------------------------------------------
+# Compute the dirname of FILE. If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+eval 'func_dirname ()
+{
+ $debug_cmd
+
+ '"$_d"'
+}'
+
+
+# func_dirname_and_basename FILE APPEND NONDIR_REPLACEMENT
+# --------------------------------------------------------
+# Perform func_basename and func_dirname in a single function
+# call:
+# dirname: Compute the dirname of FILE. If nonempty,
+# add APPEND to the result, otherwise set result
+# to NONDIR_REPLACEMENT.
+# value returned in "$func_dirname_result"
+# basename: Compute filename of FILE.
+# value retuned in "$func_basename_result"
+# For efficiency, we do not delegate to the functions above but instead
+# duplicate the functionality here.
+eval 'func_dirname_and_basename ()
+{
+ $debug_cmd
+
+ '"$_b"'
+ '"$_d"'
+}'
+
+
+# func_echo ARG...
+# ----------------
+# Echo program name prefixed message.
+func_echo ()
+{
+ $debug_cmd
+
+ _G_message=$*
+
+ func_echo_IFS=$IFS
+ IFS=$nl
+ for _G_line in $_G_message; do
+ IFS=$func_echo_IFS
+ $ECHO "$progname: $_G_line"
+ done
+ IFS=$func_echo_IFS
+}
+
+
+# func_echo_all ARG...
+# --------------------
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+ $ECHO "$*"
+}
+
+
+# func_echo_infix_1 INFIX ARG...
+# ------------------------------
+# Echo program name, followed by INFIX on the first line, with any
+# additional lines not showing INFIX.
+func_echo_infix_1 ()
+{
+ $debug_cmd
+
+ $require_term_colors
+
+ _G_infix=$1; shift
+ _G_indent=$_G_infix
+ _G_prefix="$progname: $_G_infix: "
+ _G_message=$*
+
+ # Strip color escape sequences before counting printable length
+ for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan"
+ do
+ test -n "$_G_tc" && {
+ _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"`
+ _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"`
+ }
+ done
+ _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`" " ## exclude from sc_prohibit_nested_quotes
+
+ func_echo_infix_1_IFS=$IFS
+ IFS=$nl
+ for _G_line in $_G_message; do
+ IFS=$func_echo_infix_1_IFS
+ $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2
+ _G_prefix=$_G_indent
+ done
+ IFS=$func_echo_infix_1_IFS
+}
+
+
+# func_error ARG...
+# -----------------
+# Echo program name prefixed message to standard error.
+func_error ()
+{
+ $debug_cmd
+
+ $require_term_colors
+
+ func_echo_infix_1 " $tc_standout${tc_red}error$tc_reset" "$*" >&2
+}
+
+
+# func_fatal_error ARG...
+# -----------------------
+# Echo program name prefixed message to standard error, and exit.
+func_fatal_error ()
+{
+ $debug_cmd
+
+ func_error "$*"
+ exit $EXIT_FAILURE
+}
+
+
+# func_grep EXPRESSION FILENAME
+# -----------------------------
# Check whether EXPRESSION matches any line of FILENAME, without output.
func_grep ()
{
+ $debug_cmd
+
$GREP "$1" "$2" >/dev/null 2>&1
}
-# func_mkdir_p directory-path
+# func_len STRING
+# ---------------
+# Set func_len_result to the length of STRING. STRING may not
+# start with a hyphen.
+ test -z "$_G_HAVE_XSI_OPS" \
+ && (eval 'x=a/b/c;
+ test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
+ && _G_HAVE_XSI_OPS=yes
+
+if test yes = "$_G_HAVE_XSI_OPS"; then
+ eval 'func_len ()
+ {
+ $debug_cmd
+
+ func_len_result=${#1}
+ }'
+else
+ func_len ()
+ {
+ $debug_cmd
+
+ func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
+ }
+fi
+
+
+# func_mkdir_p DIRECTORY-PATH
+# ---------------------------
# Make sure the entire path to DIRECTORY-PATH is available.
func_mkdir_p ()
{
- my_directory_path="$1"
- my_dir_list=
+ $debug_cmd
- if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
+ _G_directory_path=$1
+ _G_dir_list=
- # Protect directory names starting with `-'
- case $my_directory_path in
- -*) my_directory_path="./$my_directory_path" ;;
+ if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then
+
+ # Protect directory names starting with '-'
+ case $_G_directory_path in
+ -*) _G_directory_path=./$_G_directory_path ;;
esac
# While some portion of DIR does not yet exist...
- while test ! -d "$my_directory_path"; do
+ while test ! -d "$_G_directory_path"; do
# ...make a list in topmost first order. Use a colon delimited
# list incase some portion of path contains whitespace.
- my_dir_list="$my_directory_path:$my_dir_list"
+ _G_dir_list=$_G_directory_path:$_G_dir_list
# If the last portion added has no slash in it, the list is done
- case $my_directory_path in */*) ;; *) break ;; esac
+ case $_G_directory_path in */*) ;; *) break ;; esac
# ...otherwise throw away the child directory and loop
- my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
+ _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"`
done
- my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
+ _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'`
- save_mkdir_p_IFS="$IFS"; IFS=':'
- for my_dir in $my_dir_list; do
- IFS="$save_mkdir_p_IFS"
- # mkdir can fail with a `File exist' error if two processes
+ func_mkdir_p_IFS=$IFS; IFS=:
+ for _G_dir in $_G_dir_list; do
+ IFS=$func_mkdir_p_IFS
+ # mkdir can fail with a 'File exist' error if two processes
# try to create one of the directories concurrently. Don't
# stop in that case!
- $MKDIR "$my_dir" 2>/dev/null || :
+ $MKDIR "$_G_dir" 2>/dev/null || :
done
- IFS="$save_mkdir_p_IFS"
+ IFS=$func_mkdir_p_IFS
# Bail out if we (or some other process) failed to create a directory.
- test -d "$my_directory_path" || \
- func_fatal_error "Failed to create \`$1'"
+ test -d "$_G_directory_path" || \
+ func_fatal_error "Failed to create '$1'"
fi
}
-# func_mktempdir [string]
+# func_mktempdir [BASENAME]
+# -------------------------
# Make a temporary directory that won't clash with other running
# libtool processes, and avoids race conditions if possible. If
-# given, STRING is the basename for that directory.
+# given, BASENAME is the basename for that directory.
func_mktempdir ()
{
- my_template="${TMPDIR-/tmp}/${1-$progname}"
+ $debug_cmd
+
+ _G_template=${TMPDIR-/tmp}/${1-$progname}
- if test "$opt_dry_run" = ":"; then
+ if test : = "$opt_dry_run"; then
# Return a directory name, but don't create it in dry-run mode
- my_tmpdir="${my_template}-$$"
+ _G_tmpdir=$_G_template-$$
else
# If mktemp works, use that first and foremost
- my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
+ _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null`
- if test ! -d "$my_tmpdir"; then
+ if test ! -d "$_G_tmpdir"; then
# Failing that, at least try and use $RANDOM to avoid a race
- my_tmpdir="${my_template}-${RANDOM-0}$$"
+ _G_tmpdir=$_G_template-${RANDOM-0}$$
- save_mktempdir_umask=`umask`
+ func_mktempdir_umask=`umask`
umask 0077
- $MKDIR "$my_tmpdir"
- umask $save_mktempdir_umask
+ $MKDIR "$_G_tmpdir"
+ umask $func_mktempdir_umask
fi
# If we're not in dry-run mode, bomb out on failure
- test -d "$my_tmpdir" || \
- func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
+ test -d "$_G_tmpdir" || \
+ func_fatal_error "cannot create temporary directory '$_G_tmpdir'"
+ fi
+
+ $ECHO "$_G_tmpdir"
+}
+
+
+# func_normal_abspath PATH
+# ------------------------
+# Remove doubled-up and trailing slashes, "." path components,
+# and cancel out any ".." path components in PATH after making
+# it an absolute path.
+func_normal_abspath ()
+{
+ $debug_cmd
+
+ # These SED scripts presuppose an absolute path with a trailing slash.
+ _G_pathcar='s|^/\([^/]*\).*$|\1|'
+ _G_pathcdr='s|^/[^/]*||'
+ _G_removedotparts=':dotsl
+ s|/\./|/|g
+ t dotsl
+ s|/\.$|/|'
+ _G_collapseslashes='s|/\{1,\}|/|g'
+ _G_finalslash='s|/*$|/|'
+
+ # Start from root dir and reassemble the path.
+ func_normal_abspath_result=
+ func_normal_abspath_tpath=$1
+ func_normal_abspath_altnamespace=
+ case $func_normal_abspath_tpath in
+ "")
+ # Empty path, that just means $cwd.
+ func_stripname '' '/' "`pwd`"
+ func_normal_abspath_result=$func_stripname_result
+ return
+ ;;
+ # The next three entries are used to spot a run of precisely
+ # two leading slashes without using negated character classes;
+ # we take advantage of case's first-match behaviour.
+ ///*)
+ # Unusual form of absolute path, do nothing.
+ ;;
+ //*)
+ # Not necessarily an ordinary path; POSIX reserves leading '//'
+ # and for example Cygwin uses it to access remote file shares
+ # over CIFS/SMB, so we conserve a leading double slash if found.
+ func_normal_abspath_altnamespace=/
+ ;;
+ /*)
+ # Absolute path, do nothing.
+ ;;
+ *)
+ # Relative path, prepend $cwd.
+ func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
+ ;;
+ esac
+
+ # Cancel out all the simple stuff to save iterations. We also want
+ # the path to end with a slash for ease of parsing, so make sure
+ # there is one (and only one) here.
+ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+ -e "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_finalslash"`
+ while :; do
+ # Processed it all yet?
+ if test / = "$func_normal_abspath_tpath"; then
+ # If we ascended to the root using ".." the result may be empty now.
+ if test -z "$func_normal_abspath_result"; then
+ func_normal_abspath_result=/
+ fi
+ break
+ fi
+ func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
+ -e "$_G_pathcar"`
+ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+ -e "$_G_pathcdr"`
+ # Figure out what to do with it
+ case $func_normal_abspath_tcomponent in
+ "")
+ # Trailing empty path component, ignore it.
+ ;;
+ ..)
+ # Parent dir; strip last assembled component from result.
+ func_dirname "$func_normal_abspath_result"
+ func_normal_abspath_result=$func_dirname_result
+ ;;
+ *)
+ # Actual path component, append it.
+ func_append func_normal_abspath_result "/$func_normal_abspath_tcomponent"
+ ;;
+ esac
+ done
+ # Restore leading double-slash if one was found on entry.
+ func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
+}
+
+
+# func_notquiet ARG...
+# --------------------
+# Echo program name prefixed message only when not in quiet mode.
+func_notquiet ()
+{
+ $debug_cmd
+
+ $opt_quiet || func_echo ${1+"$@"}
+
+ # A bug in bash halts the script if the last line of a function
+ # fails when set -e is in force, so we need another command to
+ # work around that:
+ :
+}
+
+
+# func_relative_path SRCDIR DSTDIR
+# --------------------------------
+# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR.
+func_relative_path ()
+{
+ $debug_cmd
+
+ func_relative_path_result=
+ func_normal_abspath "$1"
+ func_relative_path_tlibdir=$func_normal_abspath_result
+ func_normal_abspath "$2"
+ func_relative_path_tbindir=$func_normal_abspath_result
+
+ # Ascend the tree starting from libdir
+ while :; do
+ # check if we have found a prefix of bindir
+ case $func_relative_path_tbindir in
+ $func_relative_path_tlibdir)
+ # found an exact match
+ func_relative_path_tcancelled=
+ break
+ ;;
+ $func_relative_path_tlibdir*)
+ # found a matching prefix
+ func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
+ func_relative_path_tcancelled=$func_stripname_result
+ if test -z "$func_relative_path_result"; then
+ func_relative_path_result=.
+ fi
+ break
+ ;;
+ *)
+ func_dirname $func_relative_path_tlibdir
+ func_relative_path_tlibdir=$func_dirname_result
+ if test -z "$func_relative_path_tlibdir"; then
+ # Have to descend all the way to the root!
+ func_relative_path_result=../$func_relative_path_result
+ func_relative_path_tcancelled=$func_relative_path_tbindir
+ break
+ fi
+ func_relative_path_result=../$func_relative_path_result
+ ;;
+ esac
+ done
+
+ # Now calculate path; take care to avoid doubling-up slashes.
+ func_stripname '' '/' "$func_relative_path_result"
+ func_relative_path_result=$func_stripname_result
+ func_stripname '/' '/' "$func_relative_path_tcancelled"
+ if test -n "$func_stripname_result"; then
+ func_append func_relative_path_result "/$func_stripname_result"
+ fi
+
+ # Normalisation. If bindir is libdir, return '.' else relative path.
+ if test -n "$func_relative_path_result"; then
+ func_stripname './' '' "$func_relative_path_result"
+ func_relative_path_result=$func_stripname_result
fi
- $ECHO "$my_tmpdir"
+ test -n "$func_relative_path_result" || func_relative_path_result=.
+
+ :
+}
+
+
+# func_quote_for_eval ARG...
+# --------------------------
+# Aesthetically quote ARGs to be evaled later.
+# This function returns two values:
+# i) func_quote_for_eval_result
+# double-quoted, suitable for a subsequent eval
+# ii) func_quote_for_eval_unquoted_result
+# has all characters that are still active within double
+# quotes backslashified.
+func_quote_for_eval ()
+{
+ $debug_cmd
+
+ func_quote_for_eval_unquoted_result=
+ func_quote_for_eval_result=
+ while test 0 -lt $#; do
+ case $1 in
+ *[\\\`\"\$]*)
+ _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;;
+ *)
+ _G_unquoted_arg=$1 ;;
+ esac
+ if test -n "$func_quote_for_eval_unquoted_result"; then
+ func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
+ else
+ func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg"
+ fi
+
+ case $_G_unquoted_arg in
+ # Double-quote args containing shell metacharacters to delay
+ # word splitting, command substitution and variable expansion
+ # for a subsequent eval.
+ # Many Bourne shells cannot handle close brackets correctly
+ # in scan sets, so we specify it separately.
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ _G_quoted_arg=\"$_G_unquoted_arg\"
+ ;;
+ *)
+ _G_quoted_arg=$_G_unquoted_arg
+ ;;
+ esac
+
+ if test -n "$func_quote_for_eval_result"; then
+ func_append func_quote_for_eval_result " $_G_quoted_arg"
+ else
+ func_append func_quote_for_eval_result "$_G_quoted_arg"
+ fi
+ shift
+ done
+}
+
+
+# func_quote_for_expand ARG
+# -------------------------
+# Aesthetically quote ARG to be evaled later; same as above,
+# but do not quote variable references.
+func_quote_for_expand ()
+{
+ $debug_cmd
+
+ case $1 in
+ *[\\\`\"]*)
+ _G_arg=`$ECHO "$1" | $SED \
+ -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;;
+ *)
+ _G_arg=$1 ;;
+ esac
+
+ case $_G_arg in
+ # Double-quote args containing shell metacharacters to delay
+ # word splitting and command substitution for a subsequent eval.
+ # Many Bourne shells cannot handle close brackets correctly
+ # in scan sets, so we specify it separately.
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ _G_arg=\"$_G_arg\"
+ ;;
+ esac
+
+ func_quote_for_expand_result=$_G_arg
+}
+
+
+# func_stripname PREFIX SUFFIX NAME
+# ---------------------------------
+# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+if test yes = "$_G_HAVE_XSI_OPS"; then
+ eval 'func_stripname ()
+ {
+ $debug_cmd
+
+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+ # positional parameters, so assign one to ordinary variable first.
+ func_stripname_result=$3
+ func_stripname_result=${func_stripname_result#"$1"}
+ func_stripname_result=${func_stripname_result%"$2"}
+ }'
+else
+ func_stripname ()
+ {
+ $debug_cmd
+
+ case $2 in
+ .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;;
+ *) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;;
+ esac
+ }
+fi
+
+
+# func_show_eval CMD [FAIL_EXP]
+# -----------------------------
+# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is
+# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.
+func_show_eval ()
+{
+ $debug_cmd
+
+ _G_cmd=$1
+ _G_fail_exp=${2-':'}
+
+ func_quote_for_expand "$_G_cmd"
+ eval "func_notquiet $func_quote_for_expand_result"
+
+ $opt_dry_run || {
+ eval "$_G_cmd"
+ _G_status=$?
+ if test 0 -ne "$_G_status"; then
+ eval "(exit $_G_status); $_G_fail_exp"
+ fi
+ }
+}
+
+
+# func_show_eval_locale CMD [FAIL_EXP]
+# ------------------------------------
+# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is
+# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it. Use the saved locale for evaluation.
+func_show_eval_locale ()
+{
+ $debug_cmd
+
+ _G_cmd=$1
+ _G_fail_exp=${2-':'}
+
+ $opt_quiet || {
+ func_quote_for_expand "$_G_cmd"
+ eval "func_echo $func_quote_for_expand_result"
+ }
+
+ $opt_dry_run || {
+ eval "$_G_user_locale
+ $_G_cmd"
+ _G_status=$?
+ eval "$_G_safe_locale"
+ if test 0 -ne "$_G_status"; then
+ eval "(exit $_G_status); $_G_fail_exp"
+ fi
+ }
+}
+
+
+# func_tr_sh
+# ----------
+# Turn $1 into a string suitable for a shell variable name.
+# Result is stored in $func_tr_sh_result. All characters
+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
+# if $1 begins with a digit, a '_' is prepended as well.
+func_tr_sh ()
+{
+ $debug_cmd
+
+ case $1 in
+ [0-9]* | *[!a-zA-Z0-9_]*)
+ func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 's/[^a-zA-Z0-9_]/_/g'`
+ ;;
+ * )
+ func_tr_sh_result=$1
+ ;;
+ esac
+}
+
+
+# func_verbose ARG...
+# -------------------
+# Echo program name prefixed message in verbose mode only.
+func_verbose ()
+{
+ $debug_cmd
+
+ $opt_verbose && func_echo "$*"
+
+ :
+}
+
+
+# func_warn_and_continue ARG...
+# -----------------------------
+# Echo program name prefixed warning message to standard error.
+func_warn_and_continue ()
+{
+ $debug_cmd
+
+ $require_term_colors
+
+ func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2
+}
+
+
+# func_warning CATEGORY ARG...
+# ----------------------------
+# Echo program name prefixed warning message to standard error. Warning
+# messages can be filtered according to CATEGORY, where this function
+# elides messages where CATEGORY is not listed in the global variable
+# 'opt_warning_types'.
+func_warning ()
+{
+ $debug_cmd
+
+ # CATEGORY must be in the warning_categories list!
+ case " $warning_categories " in
+ *" $1 "*) ;;
+ *) func_internal_error "invalid warning category '$1'" ;;
+ esac
+
+ _G_category=$1
+ shift
+
+ case " $opt_warning_types " in
+ *" $_G_category "*) $warning_func ${1+"$@"} ;;
+ esac
+}
+
+
+# func_sort_ver VER1 VER2
+# -----------------------
+# 'sort -V' is not generally available.
+# Note this deviates from the version comparison in automake
+# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a
+# but this should suffice as we won't be specifying old
+# version formats or redundant trailing .0 in bootstrap.conf.
+# If we did want full compatibility then we should probably
+# use m4_version_compare from autoconf.
+func_sort_ver ()
+{
+ $debug_cmd
+
+ printf '%s\n%s\n' "$1" "$2" \
+ | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n
+}
+
+# func_lt_ver PREV CURR
+# ---------------------
+# Return true if PREV and CURR are in the correct order according to
+# func_sort_ver, otherwise false. Use it like this:
+#
+# func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..."
+func_lt_ver ()
+{
+ $debug_cmd
+
+ test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q`
+}
+
+
+# Local variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# time-stamp-time-zone: "UTC"
+# End:
+#! /bin/sh
+
+# Set a version string for this script.
+scriptversion=2014-01-07.03; # UTC
+
+# A portable, pluggable option parser for Bourne shell.
+# Written by Gary V. Vaughan, 2010
+
+# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions. There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Please report bugs or propose patches to gary at gnu.org.
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# This file is a library for parsing options in your shell scripts along
+# with assorted other useful supporting features that you can make use
+# of too.
+#
+# For the simplest scripts you might need only:
+#
+# #!/bin/sh
+# . relative/path/to/funclib.sh
+# . relative/path/to/options-parser
+# scriptversion=1.0
+# func_options ${1+"$@"}
+# eval set dummy "$func_options_result"; shift
+# ...rest of your script...
+#
+# In order for the '--version' option to work, you will need to have a
+# suitably formatted comment like the one at the top of this file
+# starting with '# Written by ' and ending with '# warranty; '.
+#
+# For '-h' and '--help' to work, you will also need a one line
+# description of your script's purpose in a comment directly above the
+# '# Written by ' line, like the one at the top of this file.
+#
+# The default options also support '--debug', which will turn on shell
+# execution tracing (see the comment above debug_cmd below for another
+# use), and '--verbose' and the func_verbose function to allow your script
+# to display verbose messages only when your user has specified
+# '--verbose'.
+#
+# After sourcing this file, you can plug processing for additional
+# options by amending the variables from the 'Configuration' section
+# below, and following the instructions in the 'Option parsing'
+# section further down.
+
+## -------------- ##
+## Configuration. ##
+## -------------- ##
+
+# You should override these variables in your script after sourcing this
+# file so that they reflect the customisations you have added to the
+# option parser.
+
+# The usage line for option parsing errors and the start of '-h' and
+# '--help' output messages. You can embed shell variables for delayed
+# expansion at the time the message is displayed, but you will need to
+# quote other shell meta-characters carefully to prevent them being
+# expanded when the contents are evaled.
+usage='$progpath [OPTION]...'
+
+# Short help message in response to '-h' and '--help'. Add to this or
+# override it after sourcing this library to reflect the full set of
+# options your script accepts.
+usage_message="\
+ --debug enable verbose shell tracing
+ -W, --warnings=CATEGORY
+ report the warnings falling in CATEGORY [all]
+ -v, --verbose verbosely report processing
+ --version print version information and exit
+ -h, --help print short or long help message and exit
+"
+
+# Additional text appended to 'usage_message' in response to '--help'.
+long_help_message="
+Warning categories include:
+ 'all' show all warnings
+ 'none' turn off all the warnings
+ 'error' warnings are treated as fatal errors"
+
+# Help message printed before fatal option parsing errors.
+fatal_help="Try '\$progname --help' for more information."
+
+
+
+## ------------------------- ##
+## Hook function management. ##
+## ------------------------- ##
+
+# This section contains functions for adding, removing, and running hooks
+# to the main code. A hook is just a named list of of function, that can
+# be run in order later on.
+
+# func_hookable FUNC_NAME
+# -----------------------
+# Declare that FUNC_NAME will run hooks added with
+# 'func_add_hook FUNC_NAME ...'.
+func_hookable ()
+{
+ $debug_cmd
+
+ func_append hookable_fns " $1"
+}
+
+
+# func_add_hook FUNC_NAME HOOK_FUNC
+# ---------------------------------
+# Request that FUNC_NAME call HOOK_FUNC before it returns. FUNC_NAME must
+# first have been declared "hookable" by a call to 'func_hookable'.
+func_add_hook ()
+{
+ $debug_cmd
+
+ case " $hookable_fns " in
+ *" $1 "*) ;;
+ *) func_fatal_error "'$1' does not accept hook functions." ;;
+ esac
+
+ eval func_append ${1}_hooks '" $2"'
+}
+
+
+# func_remove_hook FUNC_NAME HOOK_FUNC
+# ------------------------------------
+# Remove HOOK_FUNC from the list of functions called by FUNC_NAME.
+func_remove_hook ()
+{
+ $debug_cmd
+
+ eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`'
+}
+
+
+# func_run_hooks FUNC_NAME [ARG]...
+# ---------------------------------
+# Run all hook functions registered to FUNC_NAME.
+# It is assumed that the list of hook functions contains nothing more
+# than a whitespace-delimited list of legal shell function names, and
+# no effort is wasted trying to catch shell meta-characters or preserve
+# whitespace.
+func_run_hooks ()
+{
+ $debug_cmd
+
+ case " $hookable_fns " in
+ *" $1 "*) ;;
+ *) func_fatal_error "'$1' does not support hook funcions.n" ;;
+ esac
+
+ eval _G_hook_fns=\$$1_hooks; shift
+
+ for _G_hook in $_G_hook_fns; do
+ eval $_G_hook '"$@"'
+
+ # store returned options list back into positional
+ # parameters for next 'cmd' execution.
+ eval _G_hook_result=\$${_G_hook}_result
+ eval set dummy "$_G_hook_result"; shift
+ done
+
+ func_quote_for_eval ${1+"$@"}
+ func_run_hooks_result=$func_quote_for_eval_result
+}
+
+
+
+## --------------- ##
+## Option parsing. ##
+## --------------- ##
+
+# In order to add your own option parsing hooks, you must accept the
+# full positional parameter list in your hook function, remove any
+# options that you action, and then pass back the remaining unprocessed
+# options in '<hooked_function_name>_result', escaped suitably for
+# 'eval'. Like this:
+#
+# my_options_prep ()
+# {
+# $debug_cmd
+#
+# # Extend the existing usage message.
+# usage_message=$usage_message'
+# -s, --silent don'\''t print informational messages
+# '
+#
+# func_quote_for_eval ${1+"$@"}
+# my_options_prep_result=$func_quote_for_eval_result
+# }
+# func_add_hook func_options_prep my_options_prep
+#
+#
+# my_silent_option ()
+# {
+# $debug_cmd
+#
+# # Note that for efficiency, we parse as many options as we can
+# # recognise in a loop before passing the remainder back to the
+# # caller on the first unrecognised argument we encounter.
+# while test $# -gt 0; do
+# opt=$1; shift
+# case $opt in
+# --silent|-s) opt_silent=: ;;
+# # Separate non-argument short options:
+# -s*) func_split_short_opt "$_G_opt"
+# set dummy "$func_split_short_opt_name" \
+# "-$func_split_short_opt_arg" ${1+"$@"}
+# shift
+# ;;
+# *) set dummy "$_G_opt" "$*"; shift; break ;;
+# esac
+# done
+#
+# func_quote_for_eval ${1+"$@"}
+# my_silent_option_result=$func_quote_for_eval_result
+# }
+# func_add_hook func_parse_options my_silent_option
+#
+#
+# my_option_validation ()
+# {
+# $debug_cmd
+#
+# $opt_silent && $opt_verbose && func_fatal_help "\
+# '--silent' and '--verbose' options are mutually exclusive."
+#
+# func_quote_for_eval ${1+"$@"}
+# my_option_validation_result=$func_quote_for_eval_result
+# }
+# func_add_hook func_validate_options my_option_validation
+#
+# You'll alse need to manually amend $usage_message to reflect the extra
+# options you parse. It's preferable to append if you can, so that
+# multiple option parsing hooks can be added safely.
+
+
+# func_options [ARG]...
+# ---------------------
+# All the functions called inside func_options are hookable. See the
+# individual implementations for details.
+func_hookable func_options
+func_options ()
+{
+ $debug_cmd
+
+ func_options_prep ${1+"$@"}
+ eval func_parse_options \
+ ${func_options_prep_result+"$func_options_prep_result"}
+ eval func_validate_options \
+ ${func_parse_options_result+"$func_parse_options_result"}
+
+ eval func_run_hooks func_options \
+ ${func_validate_options_result+"$func_validate_options_result"}
+
+ # save modified positional parameters for caller
+ func_options_result=$func_run_hooks_result
}
-# func_quote_for_eval arg
-# Aesthetically quote ARG to be evaled later.
-# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
-# is double-quoted, suitable for a subsequent eval, whereas
-# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
-# which are still active within double quotes backslashified.
-func_quote_for_eval ()
+# func_options_prep [ARG]...
+# --------------------------
+# All initialisations required before starting the option parse loop.
+# Note that when calling hook functions, we pass through the list of
+# positional parameters. If a hook function modifies that list, and
+# needs to propogate that back to rest of this script, then the complete
+# modified list must be put in 'func_run_hooks_result' before
+# returning.
+func_hookable func_options_prep
+func_options_prep ()
{
- case $1 in
- *[\\\`\"\$]*)
- func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
- *)
- func_quote_for_eval_unquoted_result="$1" ;;
- esac
+ $debug_cmd
- case $func_quote_for_eval_unquoted_result in
- # Double-quote args containing shell metacharacters to delay
- # word splitting, command substitution and and variable
- # expansion for a subsequent eval.
- # Many Bourne shells cannot handle close brackets correctly
- # in scan sets, so we specify it separately.
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
- ;;
- *)
- func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
- esac
+ # Option defaults:
+ opt_verbose=false
+ opt_warning_types=
+
+ func_run_hooks func_options_prep ${1+"$@"}
+
+ # save modified positional parameters for caller
+ func_options_prep_result=$func_run_hooks_result
}
-# func_quote_for_expand arg
-# Aesthetically quote ARG to be evaled later; same as above,
-# but do not quote variable references.
-func_quote_for_expand ()
+# func_parse_options [ARG]...
+# ---------------------------
+# The main option parsing loop.
+func_hookable func_parse_options
+func_parse_options ()
{
- case $1 in
- *[\\\`\"]*)
- my_arg=`$ECHO "$1" | $SED \
- -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
- *)
- my_arg="$1" ;;
- esac
+ $debug_cmd
- case $my_arg in
- # Double-quote args containing shell metacharacters to delay
- # word splitting and command substitution for a subsequent eval.
- # Many Bourne shells cannot handle close brackets correctly
- # in scan sets, so we specify it separately.
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- my_arg="\"$my_arg\""
- ;;
- esac
+ func_parse_options_result=
- func_quote_for_expand_result="$my_arg"
-}
+ # this just eases exit handling
+ while test $# -gt 0; do
+ # Defer to hook functions for initial option parsing, so they
+ # get priority in the event of reusing an option name.
+ func_run_hooks func_parse_options ${1+"$@"}
+ # Adjust func_parse_options positional parameters to match
+ eval set dummy "$func_run_hooks_result"; shift
-# func_show_eval cmd [fail_exp]
-# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is
-# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
-# is given, then evaluate it.
-func_show_eval ()
-{
- my_cmd="$1"
- my_fail_exp="${2-:}"
+ # Break out of the loop if we already parsed every option.
+ test $# -gt 0 || break
- ${opt_silent-false} || {
- func_quote_for_expand "$my_cmd"
- eval "func_echo $func_quote_for_expand_result"
- }
+ _G_opt=$1
+ shift
+ case $_G_opt in
+ --debug|-x) debug_cmd='set -x'
+ func_echo "enabling shell trace mode"
+ $debug_cmd
+ ;;
+
+ --no-warnings|--no-warning|--no-warn)
+ set dummy --warnings none ${1+"$@"}
+ shift
+ ;;
- if ${opt_dry_run-false}; then :; else
- eval "$my_cmd"
- my_status=$?
- if test "$my_status" -eq 0; then :; else
- eval "(exit $my_status); $my_fail_exp"
- fi
- fi
+ --warnings|--warning|-W)
+ test $# = 0 && func_missing_arg $_G_opt && break
+ case " $warning_categories $1" in
+ *" $1 "*)
+ # trailing space prevents matching last $1 above
+ func_append_uniq opt_warning_types " $1"
+ ;;
+ *all)
+ opt_warning_types=$warning_categories
+ ;;
+ *none)
+ opt_warning_types=none
+ warning_func=:
+ ;;
+ *error)
+ opt_warning_types=$warning_categories
+ warning_func=func_fatal_error
+ ;;
+ *)
+ func_fatal_error \
+ "unsupported warning category: '$1'"
+ ;;
+ esac
+ shift
+ ;;
+
+ --verbose|-v) opt_verbose=: ;;
+ --version) func_version ;;
+ -\?|-h) func_usage ;;
+ --help) func_help ;;
+
+ # Separate optargs to long options (plugins may need this):
+ --*=*) func_split_equals "$_G_opt"
+ set dummy "$func_split_equals_lhs" \
+ "$func_split_equals_rhs" ${1+"$@"}
+ shift
+ ;;
+
+ # Separate optargs to short options:
+ -W*)
+ func_split_short_opt "$_G_opt"
+ set dummy "$func_split_short_opt_name" \
+ "$func_split_short_opt_arg" ${1+"$@"}
+ shift
+ ;;
+
+ # Separate non-argument short options:
+ -\?*|-h*|-v*|-x*)
+ func_split_short_opt "$_G_opt"
+ set dummy "$func_split_short_opt_name" \
+ "-$func_split_short_opt_arg" ${1+"$@"}
+ shift
+ ;;
+
+ --) break ;;
+ -*) func_fatal_help "unrecognised option: '$_G_opt'" ;;
+ *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
+ esac
+ done
+
+ # save modified positional parameters for caller
+ func_quote_for_eval ${1+"$@"}
+ func_parse_options_result=$func_quote_for_eval_result
}
-# func_show_eval_locale cmd [fail_exp]
-# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is
-# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
-# is given, then evaluate it. Use the saved locale for evaluation.
-func_show_eval_locale ()
+# func_validate_options [ARG]...
+# ------------------------------
+# Perform any sanity checks on option settings and/or unconsumed
+# arguments.
+func_hookable func_validate_options
+func_validate_options ()
{
- my_cmd="$1"
- my_fail_exp="${2-:}"
+ $debug_cmd
- ${opt_silent-false} || {
- func_quote_for_expand "$my_cmd"
- eval "func_echo $func_quote_for_expand_result"
- }
+ # Display all warnings if -W was not given.
+ test -n "$opt_warning_types" || opt_warning_types=" $warning_categories"
- if ${opt_dry_run-false}; then :; else
- eval "$lt_user_locale
- $my_cmd"
- my_status=$?
- eval "$lt_safe_locale"
- if test "$my_status" -eq 0; then :; else
- eval "(exit $my_status); $my_fail_exp"
- fi
- fi
-}
+ func_run_hooks func_validate_options ${1+"$@"}
-# func_tr_sh
-# Turn $1 into a string suitable for a shell variable name.
-# Result is stored in $func_tr_sh_result. All characters
-# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
-# if $1 begins with a digit, a '_' is prepended as well.
-func_tr_sh ()
-{
- case $1 in
- [0-9]* | *[!a-zA-Z0-9_]*)
- func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
- ;;
- * )
- func_tr_sh_result=$1
- ;;
- esac
+ # Bail if the options were screwed!
+ $exit_cmd $EXIT_FAILURE
+
+ # save modified positional parameters for caller
+ func_validate_options_result=$func_run_hooks_result
}
-# func_version
-# Echo version message to standard output and exit.
-func_version ()
-{
- $opt_debug
- $SED -n '/(C)/!b go
- :more
- /\./!{
- N
- s/\n# / /
- b more
- }
- :go
- /^# '$PROGRAM' (GNU /,/# warranty; / {
- s/^# //
- s/^# *$//
- s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
- p
- }' < "$progpath"
- exit $?
-}
+## ----------------- ##
+## Helper functions. ##
+## ----------------- ##
-# func_usage
-# Echo short help message to standard output and exit.
-func_usage ()
+# This section contains the helper functions used by the rest of the
+# hookable option parser framework in ascii-betical order.
+
+
+# func_fatal_help ARG...
+# ----------------------
+# Echo program name prefixed message to standard error, followed by
+# a help hint, and exit.
+func_fatal_help ()
{
- $opt_debug
+ $debug_cmd
- $SED -n '/^# Usage:/,/^# *.*--help/ {
- s/^# //
- s/^# *$//
- s/\$progname/'$progname'/
- p
- }' < "$progpath"
- echo
- $ECHO "run \`$progname --help | more' for full usage"
- exit $?
+ eval \$ECHO \""Usage: $usage"\"
+ eval \$ECHO \""$fatal_help"\"
+ func_error ${1+"$@"}
+ exit $EXIT_FAILURE
}
-# func_help [NOEXIT]
-# Echo long help message to standard output and exit,
-# unless 'noexit' is passed as argument.
+
+# func_help
+# ---------
+# Echo long help message to standard output and exit.
func_help ()
{
- $opt_debug
-
- $SED -n '/^# Usage:/,/# Report bugs to/ {
- :print
- s/^# //
- s/^# *$//
- s*\$progname*'$progname'*
- s*\$host*'"$host"'*
- s*\$SHELL*'"$SHELL"'*
- s*\$LTCC*'"$LTCC"'*
- s*\$LTCFLAGS*'"$LTCFLAGS"'*
- s*\$LD*'"$LD"'*
- s/\$with_gnu_ld/'"$with_gnu_ld"'/
- s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
- s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
- p
- d
- }
- /^# .* home page:/b print
- /^# General help using/b print
- ' < "$progpath"
- ret=$?
- if test -z "$1"; then
- exit $ret
- fi
+ $debug_cmd
+
+ func_usage_message
+ $ECHO "$long_help_message"
+ exit 0
}
-# func_missing_arg argname
+
+# func_missing_arg ARGNAME
+# ------------------------
# Echo program name prefixed message to standard error and set global
# exit_cmd.
func_missing_arg ()
{
- $opt_debug
+ $debug_cmd
- func_error "missing argument for $1."
+ func_error "Missing argument for '$1'."
exit_cmd=exit
}
-# func_split_short_opt shortopt
+# func_split_equals STRING
+# ------------------------
+# Set func_split_equals_lhs and func_split_equals_rhs shell variables after
+# splitting STRING at the '=' sign.
+test -z "$_G_HAVE_XSI_OPS" \
+ && (eval 'x=a/b/c;
+ test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
+ && _G_HAVE_XSI_OPS=yes
+
+if test yes = "$_G_HAVE_XSI_OPS"
+then
+ # This is an XSI compatible shell, allowing a faster implementation...
+ eval 'func_split_equals ()
+ {
+ $debug_cmd
+
+ func_split_equals_lhs=${1%%=*}
+ func_split_equals_rhs=${1#*=}
+ test "x$func_split_equals_lhs" = "x$1" \
+ && func_split_equals_rhs=
+ }'
+else
+ # ...otherwise fall back to using expr, which is often a shell builtin.
+ func_split_equals ()
+ {
+ $debug_cmd
+
+ func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'`
+ func_split_equals_rhs=
+ test "x$func_split_equals_lhs" = "x$1" \
+ || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'`
+ }
+fi #func_split_equals
+
+
+# func_split_short_opt SHORTOPT
+# -----------------------------
# Set func_split_short_opt_name and func_split_short_opt_arg shell
# variables after splitting SHORTOPT after the 2nd character.
-func_split_short_opt ()
+if test yes = "$_G_HAVE_XSI_OPS"
+then
+ # This is an XSI compatible shell, allowing a faster implementation...
+ eval 'func_split_short_opt ()
+ {
+ $debug_cmd
+
+ func_split_short_opt_arg=${1#??}
+ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}
+ }'
+else
+ # ...otherwise fall back to using expr, which is often a shell builtin.
+ func_split_short_opt ()
+ {
+ $debug_cmd
+
+ func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'`
+ func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'`
+ }
+fi #func_split_short_opt
+
+
+# func_usage
+# ----------
+# Echo short help message to standard output and exit.
+func_usage ()
{
- my_sed_short_opt='1s/^\(..\).*$/\1/;q'
- my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
+ $debug_cmd
- func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
- func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
-} # func_split_short_opt may be replaced by extended shell implementation
+ func_usage_message
+ $ECHO "Run '$progname --help |${PAGER-more}' for full usage"
+ exit 0
+}
-# func_split_long_opt longopt
-# Set func_split_long_opt_name and func_split_long_opt_arg shell
-# variables after splitting LONGOPT at the `=' sign.
-func_split_long_opt ()
+# func_usage_message
+# ------------------
+# Echo short help message to standard output.
+func_usage_message ()
{
- my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
- my_sed_long_arg='1s/^--[^=]*=//'
+ $debug_cmd
- func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
- func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
-} # func_split_long_opt may be replaced by extended shell implementation
+ eval \$ECHO \""Usage: $usage"\"
+ echo
+ $SED -n 's|^# ||
+ /^Written by/{
+ x;p;x
+ }
+ h
+ /^Written by/q' < "$progpath"
+ echo
+ eval \$ECHO \""$usage_message"\"
+}
-exit_cmd=:
+# func_version
+# ------------
+# Echo version message to standard output and exit.
+func_version ()
+{
+ $debug_cmd
+ printf '%s\n' "$progname $scriptversion"
+ $SED -n '
+ /(C)/!b go
+ :more
+ /\./!{
+ N
+ s|\n# | |
+ b more
+ }
+ :go
+ /^# Written by /,/# warranty; / {
+ s|^# ||
+ s|^# *$||
+ s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2|
+ p
+ }
+ /^# Written by / {
+ s|^# ||
+ p
+ }
+ /^warranty; /q' < "$progpath"
+ exit $?
+}
-magic="%%%MAGIC variable%%%"
-magic_exe="%%%MAGIC EXE variable%%%"
+# Local variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# time-stamp-time-zone: "UTC"
+# End:
-# Global variables.
-nonopt=
-preserve_args=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-extracted_archives=
-extracted_serial=0
+# Set a version string.
+scriptversion='(GNU libtool) 2.4.6'
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end. This prevents here-documents from being
-# left over by shells.
-exec_cmd=
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
+# func_echo ARG...
+# ----------------
+# Libtool also displays the current mode in messages, so override
+# funclib.sh func_echo with this custom definition.
+func_echo ()
{
- eval "${1}=\$${1}\${2}"
-} # func_append may be replaced by extended shell implementation
+ $debug_cmd
-# func_append_quoted var value
-# Quote VALUE and append to the end of shell variable VAR, separated
-# by a space.
-func_append_quoted ()
-{
- func_quote_for_eval "${2}"
- eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
-} # func_append_quoted may be replaced by extended shell implementation
+ _G_message=$*
+ func_echo_IFS=$IFS
+ IFS=$nl
+ for _G_line in $_G_message; do
+ IFS=$func_echo_IFS
+ $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line"
+ done
+ IFS=$func_echo_IFS
+}
-# func_arith arithmetic-term...
-func_arith ()
+
+# func_warning ARG...
+# -------------------
+# Libtool warnings are not categorized, so override funclib.sh
+# func_warning with this simpler definition.
+func_warning ()
{
- func_arith_result=`expr "${@}"`
-} # func_arith may be replaced by extended shell implementation
+ $debug_cmd
+ $warning_func ${1+"$@"}
+}
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
- func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
-} # func_len may be replaced by extended shell implementation
+## ---------------- ##
+## Options parsing. ##
+## ---------------- ##
+
+# Hook in the functions to make sure our own options are parsed during
+# the option parsing loop.
+
+usage='$progpath [OPTION]... [MODE-ARG]...'
+
+# Short help message in response to '-h'.
+usage_message="Options:
+ --config show all configuration variables
+ --debug enable verbose shell tracing
+ -n, --dry-run display commands without modifying any files
+ --features display basic configuration information and exit
+ --mode=MODE use operation mode MODE
+ --no-warnings equivalent to '-Wnone'
+ --preserve-dup-deps don't remove duplicate dependency libraries
+ --quiet, --silent don't print informational messages
+ --tag=TAG use configuration variables from tag TAG
+ -v, --verbose print more informational messages than default
+ --version print version information
+ -W, --warnings=CATEGORY report the warnings falling in CATEGORY [all]
+ -h, --help, --help-all print short, long, or detailed help message
+"
-# func_lo2o object
-func_lo2o ()
+# Additional text appended to 'usage_message' in response to '--help'.
+func_help ()
{
- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
-} # func_lo2o may be replaced by extended shell implementation
+ $debug_cmd
+
+ func_usage_message
+ $ECHO "$long_help_message
+
+MODE must be one of the following:
+
+ clean remove files from the build directory
+ compile compile a source file into a libtool object
+ execute automatically set library path, then run a program
+ finish complete the installation of libtool libraries
+ install install libraries or executables
+ link create a library or an executable
+ uninstall remove libraries from an installed directory
+
+MODE-ARGS vary depending on the MODE. When passed as first option,
+'--mode=MODE' may be abbreviated as 'MODE' or a unique abbreviation of that.
+Try '$progname --help --mode=MODE' for a more detailed description of MODE.
+
+When reporting a bug, please describe a test case to reproduce it and
+include the following information:
+
+ host-triplet: $host
+ shell: $SHELL
+ compiler: $LTCC
+ compiler flags: $LTCFLAGS
+ linker: $LD (gnu? $with_gnu_ld)
+ version: $progname (GNU libtool) 2.4.6
+ automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
+ autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
+
+Report bugs to <bug-libtool at gnu.org>.
+GNU libtool home page: <http://www.gnu.org/software/libtool/>.
+General help using GNU software: <http://www.gnu.org/gethelp/>."
+ exit 0
+}
-# func_xform libobj-or-source
-func_xform ()
-{
- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
-} # func_xform may be replaced by extended shell implementation
+# func_lo2o OBJECT-NAME
+# ---------------------
+# Transform OBJECT-NAME from a '.lo' suffix to the platform specific
+# object suffix.
+
+lo2o=s/\\.lo\$/.$objext/
+o2lo=s/\\.$objext\$/.lo/
+
+if test yes = "$_G_HAVE_XSI_OPS"; then
+ eval 'func_lo2o ()
+ {
+ case $1 in
+ *.lo) func_lo2o_result=${1%.lo}.$objext ;;
+ * ) func_lo2o_result=$1 ;;
+ esac
+ }'
+
+ # func_xform LIBOBJ-OR-SOURCE
+ # ---------------------------
+ # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise)
+ # suffix to a '.lo' libtool-object suffix.
+ eval 'func_xform ()
+ {
+ func_xform_result=${1%.*}.lo
+ }'
+else
+ # ...otherwise fall back to using sed.
+ func_lo2o ()
+ {
+ func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"`
+ }
+
+ func_xform ()
+ {
+ func_xform_result=`$ECHO "$1" | $SED 's|\.[^.]*$|.lo|'`
+ }
+fi
-# func_fatal_configuration arg...
+# func_fatal_configuration ARG...
+# -------------------------------
# Echo program name prefixed message to standard error, followed by
# a configuration failure hint, and exit.
func_fatal_configuration ()
{
- func_error ${1+"$@"}
- func_error "See the $PACKAGE documentation for more information."
- func_fatal_error "Fatal configuration error."
+ func__fatal_error ${1+"$@"} \
+ "See the $PACKAGE documentation for more information." \
+ "Fatal configuration error."
}
# func_config
+# -----------
# Display the configuration for all the tags in this script.
func_config ()
{
@@ -915,17 +2149,19 @@ func_config ()
exit $?
}
+
# func_features
+# -------------
# Display the features supported by this script.
func_features ()
{
echo "host: $host"
- if test "$build_libtool_libs" = yes; then
+ if test yes = "$build_libtool_libs"; then
echo "enable shared libraries"
else
echo "disable shared libraries"
fi
- if test "$build_old_libs" = yes; then
+ if test yes = "$build_old_libs"; then
echo "enable static libraries"
else
echo "disable static libraries"
@@ -934,314 +2170,350 @@ func_features ()
exit $?
}
-# func_enable_tag tagname
+
+# func_enable_tag TAGNAME
+# -----------------------
# Verify that TAGNAME is valid, and either flag an error and exit, or
# enable the TAGNAME tag. We also add TAGNAME to the global $taglist
# variable here.
func_enable_tag ()
{
- # Global variable:
- tagname="$1"
+ # Global variable:
+ tagname=$1
- re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
- re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
- sed_extractcf="/$re_begincf/,/$re_endcf/p"
+ re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
+ re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
+ sed_extractcf=/$re_begincf/,/$re_endcf/p
- # Validate tagname.
- case $tagname in
- *[!-_A-Za-z0-9,/]*)
- func_fatal_error "invalid tag name: $tagname"
- ;;
- esac
+ # Validate tagname.
+ case $tagname in
+ *[!-_A-Za-z0-9,/]*)
+ func_fatal_error "invalid tag name: $tagname"
+ ;;
+ esac
- # Don't test for the "default" C tag, as we know it's
- # there but not specially marked.
- case $tagname in
- CC) ;;
+ # Don't test for the "default" C tag, as we know it's
+ # there but not specially marked.
+ case $tagname in
+ CC) ;;
*)
- if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
- taglist="$taglist $tagname"
-
- # Evaluate the configuration. Be careful to quote the path
- # and the sed script, to avoid splitting on whitespace, but
- # also don't use non-portable quotes within backquotes within
- # quotes we have to do it in 2 steps:
- extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
- eval "$extractedcf"
- else
- func_error "ignoring unknown tag $tagname"
- fi
- ;;
- esac
+ if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
+ taglist="$taglist $tagname"
+
+ # Evaluate the configuration. Be careful to quote the path
+ # and the sed script, to avoid splitting on whitespace, but
+ # also don't use non-portable quotes within backquotes within
+ # quotes we have to do it in 2 steps:
+ extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
+ eval "$extractedcf"
+ else
+ func_error "ignoring unknown tag $tagname"
+ fi
+ ;;
+ esac
}
+
# func_check_version_match
+# ------------------------
# Ensure that we are using m4 macros, and libtool script from the same
# release of libtool.
func_check_version_match ()
{
- if test "$package_revision" != "$macro_revision"; then
- if test "$VERSION" != "$macro_version"; then
- if test -z "$macro_version"; then
- cat >&2 <<_LT_EOF
+ if test "$package_revision" != "$macro_revision"; then
+ if test "$VERSION" != "$macro_version"; then
+ if test -z "$macro_version"; then
+ cat >&2 <<_LT_EOF
$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
$progname: definition of this LT_INIT comes from an older release.
$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
$progname: and run autoconf again.
_LT_EOF
- else
- cat >&2 <<_LT_EOF
+ else
+ cat >&2 <<_LT_EOF
$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
$progname: and run autoconf again.
_LT_EOF
- fi
- else
- cat >&2 <<_LT_EOF
+ fi
+ else
+ cat >&2 <<_LT_EOF
$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
$progname: but the definition of this LT_INIT comes from revision $macro_revision.
$progname: You should recreate aclocal.m4 with macros from revision $package_revision
$progname: of $PACKAGE $VERSION and run autoconf again.
_LT_EOF
- fi
+ fi
- exit $EXIT_MISMATCH
- fi
+ exit $EXIT_MISMATCH
+ fi
}
-# Shorthand for --mode=foo, only valid as the first argument
-case $1 in
-clean|clea|cle|cl)
- shift; set dummy --mode clean ${1+"$@"}; shift
- ;;
-compile|compil|compi|comp|com|co|c)
- shift; set dummy --mode compile ${1+"$@"}; shift
- ;;
-execute|execut|execu|exec|exe|ex|e)
- shift; set dummy --mode execute ${1+"$@"}; shift
- ;;
-finish|finis|fini|fin|fi|f)
- shift; set dummy --mode finish ${1+"$@"}; shift
- ;;
-install|instal|insta|inst|ins|in|i)
- shift; set dummy --mode install ${1+"$@"}; shift
- ;;
-link|lin|li|l)
- shift; set dummy --mode link ${1+"$@"}; shift
- ;;
-uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
- shift; set dummy --mode uninstall ${1+"$@"}; shift
- ;;
-esac
+# libtool_options_prep [ARG]...
+# -----------------------------
+# Preparation for options parsed by libtool.
+libtool_options_prep ()
+{
+ $debug_mode
+ # Option defaults:
+ opt_config=false
+ opt_dlopen=
+ opt_dry_run=false
+ opt_help=false
+ opt_mode=
+ opt_preserve_dup_deps=false
+ opt_quiet=false
+ nonopt=
+ preserve_args=
-# Option defaults:
-opt_debug=:
-opt_dry_run=false
-opt_config=false
-opt_preserve_dup_deps=false
-opt_features=false
-opt_finish=false
-opt_help=false
-opt_help_all=false
-opt_silent=:
-opt_warning=:
-opt_verbose=:
-opt_silent=false
-opt_verbose=false
+ # Shorthand for --mode=foo, only valid as the first argument
+ case $1 in
+ clean|clea|cle|cl)
+ shift; set dummy --mode clean ${1+"$@"}; shift
+ ;;
+ compile|compil|compi|comp|com|co|c)
+ shift; set dummy --mode compile ${1+"$@"}; shift
+ ;;
+ execute|execut|execu|exec|exe|ex|e)
+ shift; set dummy --mode execute ${1+"$@"}; shift
+ ;;
+ finish|finis|fini|fin|fi|f)
+ shift; set dummy --mode finish ${1+"$@"}; shift
+ ;;
+ install|instal|insta|inst|ins|in|i)
+ shift; set dummy --mode install ${1+"$@"}; shift
+ ;;
+ link|lin|li|l)
+ shift; set dummy --mode link ${1+"$@"}; shift
+ ;;
+ uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+ shift; set dummy --mode uninstall ${1+"$@"}; shift
+ ;;
+ esac
+
+ # Pass back the list of options.
+ func_quote_for_eval ${1+"$@"}
+ libtool_options_prep_result=$func_quote_for_eval_result
+}
+func_add_hook func_options_prep libtool_options_prep
-# Parse options once, thoroughly. This comes as soon as possible in the
-# script to make things like `--version' happen as quickly as we can.
+# libtool_parse_options [ARG]...
+# ---------------------------------
+# Provide handling for libtool specific options.
+libtool_parse_options ()
{
- # this just eases exit handling
- while test $# -gt 0; do
- opt="$1"
- shift
- case $opt in
- --debug|-x) opt_debug='set -x'
- func_echo "enabling shell trace mode"
- $opt_debug
- ;;
- --dry-run|--dryrun|-n)
- opt_dry_run=:
- ;;
- --config)
- opt_config=:
-func_config
- ;;
- --dlopen|-dlopen)
- optarg="$1"
- opt_dlopen="${opt_dlopen+$opt_dlopen
-}$optarg"
- shift
- ;;
- --preserve-dup-deps)
- opt_preserve_dup_deps=:
- ;;
- --features)
- opt_features=:
-func_features
- ;;
- --finish)
- opt_finish=:
-set dummy --mode finish ${1+"$@"}; shift
- ;;
- --help)
- opt_help=:
- ;;
- --help-all)
- opt_help_all=:
-opt_help=': help-all'
- ;;
- --mode)
- test $# = 0 && func_missing_arg $opt && break
- optarg="$1"
- opt_mode="$optarg"
-case $optarg in
- # Valid mode arguments:
- clean|compile|execute|finish|install|link|relink|uninstall) ;;
-
- # Catch anything else as an error
- *) func_error "invalid argument for $opt"
- exit_cmd=exit
- break
- ;;
-esac
- shift
- ;;
- --no-silent|--no-quiet)
- opt_silent=false
-func_append preserve_args " $opt"
- ;;
- --no-warning|--no-warn)
- opt_warning=false
-func_append preserve_args " $opt"
- ;;
- --no-verbose)
- opt_verbose=false
-func_append preserve_args " $opt"
- ;;
- --silent|--quiet)
- opt_silent=:
-func_append preserve_args " $opt"
- opt_verbose=false
- ;;
- --verbose|-v)
- opt_verbose=:
-func_append preserve_args " $opt"
-opt_silent=false
- ;;
- --tag)
- test $# = 0 && func_missing_arg $opt && break
- optarg="$1"
- opt_tag="$optarg"
-func_append preserve_args " $opt $optarg"
-func_enable_tag "$optarg"
- shift
- ;;
-
- -\?|-h) func_usage ;;
- --help) func_help ;;
- --version) func_version ;;
-
- # Separate optargs to long options:
- --*=*)
- func_split_long_opt "$opt"
- set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
- shift
- ;;
-
- # Separate non-argument short options:
- -\?*|-h*|-n*|-v*)
- func_split_short_opt "$opt"
- set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
- shift
- ;;
-
- --) break ;;
- -*) func_fatal_help "unrecognized option \`$opt'" ;;
- *) set dummy "$opt" ${1+"$@"}; shift; break ;;
- esac
- done
+ $debug_cmd
- # Validate options:
+ # Perform our own loop to consume as many options as possible in
+ # each iteration.
+ while test $# -gt 0; do
+ _G_opt=$1
+ shift
+ case $_G_opt in
+ --dry-run|--dryrun|-n)
+ opt_dry_run=:
+ ;;
+
+ --config) func_config ;;
+
+ --dlopen|-dlopen)
+ opt_dlopen="${opt_dlopen+$opt_dlopen
+}$1"
+ shift
+ ;;
+
+ --preserve-dup-deps)
+ opt_preserve_dup_deps=: ;;
+
+ --features) func_features ;;
+
+ --finish) set dummy --mode finish ${1+"$@"}; shift ;;
+
+ --help) opt_help=: ;;
+
+ --help-all) opt_help=': help-all' ;;
+
+ --mode) test $# = 0 && func_missing_arg $_G_opt && break
+ opt_mode=$1
+ case $1 in
+ # Valid mode arguments:
+ clean|compile|execute|finish|install|link|relink|uninstall) ;;
+
+ # Catch anything else as an error
+ *) func_error "invalid argument for $_G_opt"
+ exit_cmd=exit
+ break
+ ;;
+ esac
+ shift
+ ;;
+
+ --no-silent|--no-quiet)
+ opt_quiet=false
+ func_append preserve_args " $_G_opt"
+ ;;
+
+ --no-warnings|--no-warning|--no-warn)
+ opt_warning=false
+ func_append preserve_args " $_G_opt"
+ ;;
+
+ --no-verbose)
+ opt_verbose=false
+ func_append preserve_args " $_G_opt"
+ ;;
+
+ --silent|--quiet)
+ opt_quiet=:
+ opt_verbose=false
+ func_append preserve_args " $_G_opt"
+ ;;
+
+ --tag) test $# = 0 && func_missing_arg $_G_opt && break
+ opt_tag=$1
+ func_append preserve_args " $_G_opt $1"
+ func_enable_tag "$1"
+ shift
+ ;;
+
+ --verbose|-v) opt_quiet=false
+ opt_verbose=:
+ func_append preserve_args " $_G_opt"
+ ;;
+
+ # An option not handled by this hook function:
+ *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
+ esac
+ done
- # save first non-option argument
- if test "$#" -gt 0; then
- nonopt="$opt"
- shift
- fi
- # preserve --debug
- test "$opt_debug" = : || func_append preserve_args " --debug"
+ # save modified positional parameters for caller
+ func_quote_for_eval ${1+"$@"}
+ libtool_parse_options_result=$func_quote_for_eval_result
+}
+func_add_hook func_parse_options libtool_parse_options
- case $host in
- *cygwin* | *mingw* | *pw32* | *cegcc*)
- # don't eliminate duplications in $postdeps and $predeps
- opt_duplicate_compiler_generated_deps=:
- ;;
- *)
- opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
- ;;
- esac
- $opt_help || {
- # Sanity checks first:
- func_check_version_match
- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
- func_fatal_configuration "not configured to build any kind of library"
+# libtool_validate_options [ARG]...
+# ---------------------------------
+# Perform any sanity checks on option settings and/or unconsumed
+# arguments.
+libtool_validate_options ()
+{
+ # save first non-option argument
+ if test 0 -lt $#; then
+ nonopt=$1
+ shift
fi
- # Darwin sucks
- eval std_shrext=\"$shrext_cmds\"
+ # preserve --debug
+ test : = "$debug_cmd" || func_append preserve_args " --debug"
- # Only execute mode is allowed to have -dlopen flags.
- if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
- func_error "unrecognized option \`-dlopen'"
- $ECHO "$help" 1>&2
- exit $EXIT_FAILURE
- fi
+ case $host in
+ # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
+ # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
+ *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*)
+ # don't eliminate duplications in $postdeps and $predeps
+ opt_duplicate_compiler_generated_deps=:
+ ;;
+ *)
+ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
+ ;;
+ esac
- # Change the help message to a mode-specific one.
- generic_help="$help"
- help="Try \`$progname --help --mode=$opt_mode' for more information."
- }
+ $opt_help || {
+ # Sanity checks first:
+ func_check_version_match
+
+ test yes != "$build_libtool_libs" \
+ && test yes != "$build_old_libs" \
+ && func_fatal_configuration "not configured to build any kind of library"
+
+ # Darwin sucks
+ eval std_shrext=\"$shrext_cmds\"
+
+ # Only execute mode is allowed to have -dlopen flags.
+ if test -n "$opt_dlopen" && test execute != "$opt_mode"; then
+ func_error "unrecognized option '-dlopen'"
+ $ECHO "$help" 1>&2
+ exit $EXIT_FAILURE
+ fi
+ # Change the help message to a mode-specific one.
+ generic_help=$help
+ help="Try '$progname --help --mode=$opt_mode' for more information."
+ }
- # Bail if the options were screwed
- $exit_cmd $EXIT_FAILURE
+ # Pass back the unparsed argument list
+ func_quote_for_eval ${1+"$@"}
+ libtool_validate_options_result=$func_quote_for_eval_result
}
+func_add_hook func_validate_options libtool_validate_options
+# Process options as early as possible so that --help and --version
+# can return quickly.
+func_options ${1+"$@"}
+eval set dummy "$func_options_result"; shift
+
## ----------- ##
## Main. ##
## ----------- ##
+magic='%%%MAGIC variable%%%'
+magic_exe='%%%MAGIC EXE variable%%%'
+
+# Global variables.
+extracted_archives=
+extracted_serial=0
+
+# If this variable is set in any of the actions, the command in it
+# will be execed at the end. This prevents here-documents from being
+# left over by shells.
+exec_cmd=
+
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+ eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+
+# func_generated_by_libtool
+# True iff stdin has been generated by Libtool. This function is only
+# a basic sanity check; it will hardly flush out determined imposters.
+func_generated_by_libtool_p ()
+{
+ $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+}
+
# func_lalib_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
+# True iff FILE is a libtool '.la' library or '.lo' object file.
# This function is only a basic sanity check; it will hardly flush out
# determined imposters.
func_lalib_p ()
{
test -f "$1" &&
- $SED -e 4q "$1" 2>/dev/null \
- | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+ $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p
}
# func_lalib_unsafe_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
+# True iff FILE is a libtool '.la' library or '.lo' object file.
# This function implements the same check as func_lalib_p without
# resorting to external programs. To this end, it redirects stdin and
# closes it afterwards, without saving the original file descriptor.
# As a safety measure, use it only where a negative result would be
-# fatal anyway. Works if `file' does not exist.
+# fatal anyway. Works if 'file' does not exist.
func_lalib_unsafe_p ()
{
lalib_p=no
@@ -1249,13 +2521,13 @@ func_lalib_unsafe_p ()
for lalib_p_l in 1 2 3 4
do
read lalib_p_line
- case "$lalib_p_line" in
+ case $lalib_p_line in
\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
esac
done
exec 0<&5 5<&-
fi
- test "$lalib_p" = yes
+ test yes = "$lalib_p"
}
# func_ltwrapper_script_p file
@@ -1264,7 +2536,8 @@ func_lalib_unsafe_p ()
# determined imposters.
func_ltwrapper_script_p ()
{
- func_lalib_p "$1"
+ test -f "$1" &&
+ $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p
}
# func_ltwrapper_executable_p file
@@ -1289,7 +2562,7 @@ func_ltwrapper_scriptname ()
{
func_dirname_and_basename "$1" "" "."
func_stripname '' '.exe' "$func_basename_result"
- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
+ func_ltwrapper_scriptname_result=$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper
}
# func_ltwrapper_p file
@@ -1308,11 +2581,13 @@ func_ltwrapper_p ()
# FAIL_CMD may read-access the current command in variable CMD!
func_execute_cmds ()
{
- $opt_debug
+ $debug_cmd
+
save_ifs=$IFS; IFS='~'
for cmd in $1; do
- IFS=$save_ifs
+ IFS=$sp$nl
eval cmd=\"$cmd\"
+ IFS=$save_ifs
func_show_eval "$cmd" "${2-:}"
done
IFS=$save_ifs
@@ -1324,10 +2599,11 @@ func_execute_cmds ()
# Note that it is not necessary on cygwin/mingw to append a dot to
# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
# behavior happens only for exec(3), not for open(2)! Also, sourcing
-# `FILE.' does not work on cygwin managed mounts.
+# 'FILE.' does not work on cygwin managed mounts.
func_source ()
{
- $opt_debug
+ $debug_cmd
+
case $1 in
*/* | *\\*) . "$1" ;;
*) . "./$1" ;;
@@ -1354,10 +2630,10 @@ func_resolve_sysroot ()
# store the result into func_replace_sysroot_result.
func_replace_sysroot ()
{
- case "$lt_sysroot:$1" in
+ case $lt_sysroot:$1 in
?*:"$lt_sysroot"*)
func_stripname "$lt_sysroot" '' "$1"
- func_replace_sysroot_result="=$func_stripname_result"
+ func_replace_sysroot_result='='$func_stripname_result
;;
*)
# Including no sysroot.
@@ -1374,7 +2650,8 @@ func_replace_sysroot ()
# arg is usually of the form 'gcc ...'
func_infer_tag ()
{
- $opt_debug
+ $debug_cmd
+
if test -n "$available_tags" && test -z "$tagname"; then
CC_quoted=
for arg in $CC; do
@@ -1393,7 +2670,7 @@ func_infer_tag ()
for z in $available_tags; do
if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
# Evaluate the configuration.
- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+ eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
CC_quoted=
for arg in $CC; do
# Double-quote args containing other shell metacharacters.
@@ -1418,7 +2695,7 @@ func_infer_tag ()
# line option must be used.
if test -z "$tagname"; then
func_echo "unable to infer tagged configuration"
- func_fatal_error "specify a tag with \`--tag'"
+ func_fatal_error "specify a tag with '--tag'"
# else
# func_verbose "using $tagname tagged configuration"
fi
@@ -1434,15 +2711,15 @@ func_infer_tag ()
# but don't create it if we're doing a dry run.
func_write_libtool_object ()
{
- write_libobj=${1}
- if test "$build_libtool_libs" = yes; then
- write_lobj=\'${2}\'
+ write_libobj=$1
+ if test yes = "$build_libtool_libs"; then
+ write_lobj=\'$2\'
else
write_lobj=none
fi
- if test "$build_old_libs" = yes; then
- write_oldobj=\'${3}\'
+ if test yes = "$build_old_libs"; then
+ write_oldobj=\'$3\'
else
write_oldobj=none
fi
@@ -1450,7 +2727,7 @@ func_write_libtool_object ()
$opt_dry_run || {
cat >${write_libobj}T <<EOF
# $write_libobj - a libtool object file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
#
# Please DO NOT delete this file!
# It is necessary for linking the library.
@@ -1462,7 +2739,7 @@ pic_object=$write_lobj
non_pic_object=$write_oldobj
EOF
- $MV "${write_libobj}T" "${write_libobj}"
+ $MV "${write_libobj}T" "$write_libobj"
}
}
@@ -1482,8 +2759,9 @@ EOF
# be empty on error (or when ARG is empty)
func_convert_core_file_wine_to_w32 ()
{
- $opt_debug
- func_convert_core_file_wine_to_w32_result="$1"
+ $debug_cmd
+
+ func_convert_core_file_wine_to_w32_result=$1
if test -n "$1"; then
# Unfortunately, winepath does not exit with a non-zero error code, so we
# are forced to check the contents of stdout. On the other hand, if the
@@ -1491,9 +2769,9 @@ func_convert_core_file_wine_to_w32 ()
# *an error message* to stdout. So we must check for both error code of
# zero AND non-empty stdout, which explains the odd construction:
func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
- if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
+ if test "$?" -eq 0 && test -n "$func_convert_core_file_wine_to_w32_tmp"; then
func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
- $SED -e "$lt_sed_naive_backslashify"`
+ $SED -e "$sed_naive_backslashify"`
else
func_convert_core_file_wine_to_w32_result=
fi
@@ -1514,18 +2792,19 @@ func_convert_core_file_wine_to_w32 ()
# are convertible, then the result may be empty.
func_convert_core_path_wine_to_w32 ()
{
- $opt_debug
+ $debug_cmd
+
# unfortunately, winepath doesn't convert paths, only file names
- func_convert_core_path_wine_to_w32_result=""
+ func_convert_core_path_wine_to_w32_result=
if test -n "$1"; then
oldIFS=$IFS
IFS=:
for func_convert_core_path_wine_to_w32_f in $1; do
IFS=$oldIFS
func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
- if test -n "$func_convert_core_file_wine_to_w32_result" ; then
+ if test -n "$func_convert_core_file_wine_to_w32_result"; then
if test -z "$func_convert_core_path_wine_to_w32_result"; then
- func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
+ func_convert_core_path_wine_to_w32_result=$func_convert_core_file_wine_to_w32_result
else
func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
fi
@@ -1554,7 +2833,8 @@ func_convert_core_path_wine_to_w32 ()
# environment variable; do not put it in $PATH.
func_cygpath ()
{
- $opt_debug
+ $debug_cmd
+
if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
if test "$?" -ne 0; then
@@ -1563,7 +2843,7 @@ func_cygpath ()
fi
else
func_cygpath_result=
- func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
+ func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'"
fi
}
#end: func_cygpath
@@ -1574,10 +2854,11 @@ func_cygpath ()
# result in func_convert_core_msys_to_w32_result.
func_convert_core_msys_to_w32 ()
{
- $opt_debug
+ $debug_cmd
+
# awkward: cmd appends spaces to result
func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
+ $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"`
}
#end: func_convert_core_msys_to_w32
@@ -1588,13 +2869,14 @@ func_convert_core_msys_to_w32 ()
# func_to_host_file_result to ARG1).
func_convert_file_check ()
{
- $opt_debug
- if test -z "$2" && test -n "$1" ; then
+ $debug_cmd
+
+ if test -z "$2" && test -n "$1"; then
func_error "Could not determine host file name corresponding to"
- func_error " \`$1'"
+ func_error " '$1'"
func_error "Continuing, but uninstalled executables may not work."
# Fallback:
- func_to_host_file_result="$1"
+ func_to_host_file_result=$1
fi
}
# end func_convert_file_check
@@ -1606,10 +2888,11 @@ func_convert_file_check ()
# func_to_host_file_result to a simplistic fallback value (see below).
func_convert_path_check ()
{
- $opt_debug
+ $debug_cmd
+
if test -z "$4" && test -n "$3"; then
func_error "Could not determine the host path corresponding to"
- func_error " \`$3'"
+ func_error " '$3'"
func_error "Continuing, but uninstalled executables may not work."
# Fallback. This is a deliberately simplistic "conversion" and
# should not be "improved". See libtool.info.
@@ -1618,7 +2901,7 @@ func_convert_path_check ()
func_to_host_path_result=`echo "$3" |
$SED -e "$lt_replace_pathsep_chars"`
else
- func_to_host_path_result="$3"
+ func_to_host_path_result=$3
fi
fi
}
@@ -1630,9 +2913,10 @@ func_convert_path_check ()
# and appending REPL if ORIG matches BACKPAT.
func_convert_path_front_back_pathsep ()
{
- $opt_debug
+ $debug_cmd
+
case $4 in
- $1 ) func_to_host_path_result="$3$func_to_host_path_result"
+ $1 ) func_to_host_path_result=$3$func_to_host_path_result
;;
esac
case $4 in
@@ -1646,7 +2930,7 @@ func_convert_path_front_back_pathsep ()
##################################################
# $build to $host FILE NAME CONVERSION FUNCTIONS #
##################################################
-# invoked via `$to_host_file_cmd ARG'
+# invoked via '$to_host_file_cmd ARG'
#
# In each case, ARG is the path to be converted from $build to $host format.
# Result will be available in $func_to_host_file_result.
@@ -1657,7 +2941,8 @@ func_convert_path_front_back_pathsep ()
# in func_to_host_file_result.
func_to_host_file ()
{
- $opt_debug
+ $debug_cmd
+
$to_host_file_cmd "$1"
}
# end func_to_host_file
@@ -1669,7 +2954,8 @@ func_to_host_file ()
# in (the comma separated) LAZY, no conversion takes place.
func_to_tool_file ()
{
- $opt_debug
+ $debug_cmd
+
case ,$2, in
*,"$to_tool_file_cmd",*)
func_to_tool_file_result=$1
@@ -1687,7 +2973,7 @@ func_to_tool_file ()
# Copy ARG to func_to_host_file_result.
func_convert_file_noop ()
{
- func_to_host_file_result="$1"
+ func_to_host_file_result=$1
}
# end func_convert_file_noop
@@ -1698,11 +2984,12 @@ func_convert_file_noop ()
# func_to_host_file_result.
func_convert_file_msys_to_w32 ()
{
- $opt_debug
- func_to_host_file_result="$1"
+ $debug_cmd
+
+ func_to_host_file_result=$1
if test -n "$1"; then
func_convert_core_msys_to_w32 "$1"
- func_to_host_file_result="$func_convert_core_msys_to_w32_result"
+ func_to_host_file_result=$func_convert_core_msys_to_w32_result
fi
func_convert_file_check "$1" "$func_to_host_file_result"
}
@@ -1714,8 +3001,9 @@ func_convert_file_msys_to_w32 ()
# func_to_host_file_result.
func_convert_file_cygwin_to_w32 ()
{
- $opt_debug
- func_to_host_file_result="$1"
+ $debug_cmd
+
+ func_to_host_file_result=$1
if test -n "$1"; then
# because $build is cygwin, we call "the" cygpath in $PATH; no need to use
# LT_CYGPATH in this case.
@@ -1731,11 +3019,12 @@ func_convert_file_cygwin_to_w32 ()
# and a working winepath. Returns result in func_to_host_file_result.
func_convert_file_nix_to_w32 ()
{
- $opt_debug
- func_to_host_file_result="$1"
+ $debug_cmd
+
+ func_to_host_file_result=$1
if test -n "$1"; then
func_convert_core_file_wine_to_w32 "$1"
- func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
+ func_to_host_file_result=$func_convert_core_file_wine_to_w32_result
fi
func_convert_file_check "$1" "$func_to_host_file_result"
}
@@ -1747,12 +3036,13 @@ func_convert_file_nix_to_w32 ()
# Returns result in func_to_host_file_result.
func_convert_file_msys_to_cygwin ()
{
- $opt_debug
- func_to_host_file_result="$1"
+ $debug_cmd
+
+ func_to_host_file_result=$1
if test -n "$1"; then
func_convert_core_msys_to_w32 "$1"
func_cygpath -u "$func_convert_core_msys_to_w32_result"
- func_to_host_file_result="$func_cygpath_result"
+ func_to_host_file_result=$func_cygpath_result
fi
func_convert_file_check "$1" "$func_to_host_file_result"
}
@@ -1765,13 +3055,14 @@ func_convert_file_msys_to_cygwin ()
# in func_to_host_file_result.
func_convert_file_nix_to_cygwin ()
{
- $opt_debug
- func_to_host_file_result="$1"
+ $debug_cmd
+
+ func_to_host_file_result=$1
if test -n "$1"; then
# convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
func_convert_core_file_wine_to_w32 "$1"
func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
- func_to_host_file_result="$func_cygpath_result"
+ func_to_host_file_result=$func_cygpath_result
fi
func_convert_file_check "$1" "$func_to_host_file_result"
}
@@ -1781,7 +3072,7 @@ func_convert_file_nix_to_cygwin ()
#############################################
# $build to $host PATH CONVERSION FUNCTIONS #
#############################################
-# invoked via `$to_host_path_cmd ARG'
+# invoked via '$to_host_path_cmd ARG'
#
# In each case, ARG is the path to be converted from $build to $host format.
# The result will be available in $func_to_host_path_result.
@@ -1805,10 +3096,11 @@ func_convert_file_nix_to_cygwin ()
to_host_path_cmd=
func_init_to_host_path_cmd ()
{
- $opt_debug
+ $debug_cmd
+
if test -z "$to_host_path_cmd"; then
func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
- to_host_path_cmd="func_convert_path_${func_stripname_result}"
+ to_host_path_cmd=func_convert_path_$func_stripname_result
fi
}
@@ -1818,7 +3110,8 @@ func_init_to_host_path_cmd ()
# in func_to_host_path_result.
func_to_host_path ()
{
- $opt_debug
+ $debug_cmd
+
func_init_to_host_path_cmd
$to_host_path_cmd "$1"
}
@@ -1829,7 +3122,7 @@ func_to_host_path ()
# Copy ARG to func_to_host_path_result.
func_convert_path_noop ()
{
- func_to_host_path_result="$1"
+ func_to_host_path_result=$1
}
# end func_convert_path_noop
@@ -1840,8 +3133,9 @@ func_convert_path_noop ()
# func_to_host_path_result.
func_convert_path_msys_to_w32 ()
{
- $opt_debug
- func_to_host_path_result="$1"
+ $debug_cmd
+
+ func_to_host_path_result=$1
if test -n "$1"; then
# Remove leading and trailing path separator characters from ARG. MSYS
# behavior is inconsistent here; cygpath turns them into '.;' and ';.';
@@ -1849,7 +3143,7 @@ func_convert_path_msys_to_w32 ()
func_stripname : : "$1"
func_to_host_path_tmp1=$func_stripname_result
func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
- func_to_host_path_result="$func_convert_core_msys_to_w32_result"
+ func_to_host_path_result=$func_convert_core_msys_to_w32_result
func_convert_path_check : ";" \
"$func_to_host_path_tmp1" "$func_to_host_path_result"
func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
@@ -1863,8 +3157,9 @@ func_convert_path_msys_to_w32 ()
# func_to_host_file_result.
func_convert_path_cygwin_to_w32 ()
{
- $opt_debug
- func_to_host_path_result="$1"
+ $debug_cmd
+
+ func_to_host_path_result=$1
if test -n "$1"; then
# See func_convert_path_msys_to_w32:
func_stripname : : "$1"
@@ -1883,14 +3178,15 @@ func_convert_path_cygwin_to_w32 ()
# a working winepath. Returns result in func_to_host_file_result.
func_convert_path_nix_to_w32 ()
{
- $opt_debug
- func_to_host_path_result="$1"
+ $debug_cmd
+
+ func_to_host_path_result=$1
if test -n "$1"; then
# See func_convert_path_msys_to_w32:
func_stripname : : "$1"
func_to_host_path_tmp1=$func_stripname_result
func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
- func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
+ func_to_host_path_result=$func_convert_core_path_wine_to_w32_result
func_convert_path_check : ";" \
"$func_to_host_path_tmp1" "$func_to_host_path_result"
func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
@@ -1904,15 +3200,16 @@ func_convert_path_nix_to_w32 ()
# Returns result in func_to_host_file_result.
func_convert_path_msys_to_cygwin ()
{
- $opt_debug
- func_to_host_path_result="$1"
+ $debug_cmd
+
+ func_to_host_path_result=$1
if test -n "$1"; then
# See func_convert_path_msys_to_w32:
func_stripname : : "$1"
func_to_host_path_tmp1=$func_stripname_result
func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
- func_to_host_path_result="$func_cygpath_result"
+ func_to_host_path_result=$func_cygpath_result
func_convert_path_check : : \
"$func_to_host_path_tmp1" "$func_to_host_path_result"
func_convert_path_front_back_pathsep ":*" "*:" : "$1"
@@ -1927,8 +3224,9 @@ func_convert_path_msys_to_cygwin ()
# func_to_host_file_result.
func_convert_path_nix_to_cygwin ()
{
- $opt_debug
- func_to_host_path_result="$1"
+ $debug_cmd
+
+ func_to_host_path_result=$1
if test -n "$1"; then
# Remove leading and trailing path separator characters from
# ARG. msys behavior is inconsistent here, cygpath turns them
@@ -1937,7 +3235,7 @@ func_convert_path_nix_to_cygwin ()
func_to_host_path_tmp1=$func_stripname_result
func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
- func_to_host_path_result="$func_cygpath_result"
+ func_to_host_path_result=$func_cygpath_result
func_convert_path_check : : \
"$func_to_host_path_tmp1" "$func_to_host_path_result"
func_convert_path_front_back_pathsep ":*" "*:" : "$1"
@@ -1946,13 +3244,31 @@ func_convert_path_nix_to_cygwin ()
# end func_convert_path_nix_to_cygwin
+# func_dll_def_p FILE
+# True iff FILE is a Windows DLL '.def' file.
+# Keep in sync with _LT_DLL_DEF_P in libtool.m4
+func_dll_def_p ()
+{
+ $debug_cmd
+
+ func_dll_def_p_tmp=`$SED -n \
+ -e 's/^[ ]*//' \
+ -e '/^\(;.*\)*$/d' \
+ -e 's/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p' \
+ -e q \
+ "$1"`
+ test DEF = "$func_dll_def_p_tmp"
+}
+
+
# func_mode_compile arg...
func_mode_compile ()
{
- $opt_debug
+ $debug_cmd
+
# Get the compilation command and the source file.
base_compile=
- srcfile="$nonopt" # always keep a non-empty value in "srcfile"
+ srcfile=$nonopt # always keep a non-empty value in "srcfile"
suppress_opt=yes
suppress_output=
arg_mode=normal
@@ -1965,12 +3281,12 @@ func_mode_compile ()
case $arg_mode in
arg )
# do not "continue". Instead, add this to base_compile
- lastarg="$arg"
+ lastarg=$arg
arg_mode=normal
;;
target )
- libobj="$arg"
+ libobj=$arg
arg_mode=normal
continue
;;
@@ -1980,7 +3296,7 @@ func_mode_compile ()
case $arg in
-o)
test -n "$libobj" && \
- func_fatal_error "you cannot specify \`-o' more than once"
+ func_fatal_error "you cannot specify '-o' more than once"
arg_mode=target
continue
;;
@@ -2009,12 +3325,12 @@ func_mode_compile ()
func_stripname '-Wc,' '' "$arg"
args=$func_stripname_result
lastarg=
- save_ifs="$IFS"; IFS=','
+ save_ifs=$IFS; IFS=,
for arg in $args; do
- IFS="$save_ifs"
+ IFS=$save_ifs
func_append_quoted lastarg "$arg"
done
- IFS="$save_ifs"
+ IFS=$save_ifs
func_stripname ' ' '' "$lastarg"
lastarg=$func_stripname_result
@@ -2027,8 +3343,8 @@ func_mode_compile ()
# Accept the current argument as the source file.
# The previous "srcfile" becomes the current argument.
#
- lastarg="$srcfile"
- srcfile="$arg"
+ lastarg=$srcfile
+ srcfile=$arg
;;
esac # case $arg
;;
@@ -2043,13 +3359,13 @@ func_mode_compile ()
func_fatal_error "you must specify an argument for -Xcompile"
;;
target)
- func_fatal_error "you must specify a target with \`-o'"
+ func_fatal_error "you must specify a target with '-o'"
;;
*)
# Get the name of the library object.
test -z "$libobj" && {
func_basename "$srcfile"
- libobj="$func_basename_result"
+ libobj=$func_basename_result
}
;;
esac
@@ -2069,7 +3385,7 @@ func_mode_compile ()
case $libobj in
*.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
*)
- func_fatal_error "cannot determine name of library object from \`$libobj'"
+ func_fatal_error "cannot determine name of library object from '$libobj'"
;;
esac
@@ -2078,8 +3394,8 @@ func_mode_compile ()
for arg in $later; do
case $arg in
-shared)
- test "$build_libtool_libs" != yes && \
- func_fatal_configuration "can not build a shared library"
+ test yes = "$build_libtool_libs" \
+ || func_fatal_configuration "cannot build a shared library"
build_old_libs=no
continue
;;
@@ -2105,17 +3421,17 @@ func_mode_compile ()
func_quote_for_eval "$libobj"
test "X$libobj" != "X$func_quote_for_eval_result" \
&& $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \
- && func_warning "libobj name \`$libobj' may not contain shell special characters."
+ && func_warning "libobj name '$libobj' may not contain shell special characters."
func_dirname_and_basename "$obj" "/" ""
- objname="$func_basename_result"
- xdir="$func_dirname_result"
- lobj=${xdir}$objdir/$objname
+ objname=$func_basename_result
+ xdir=$func_dirname_result
+ lobj=$xdir$objdir/$objname
test -z "$base_compile" && \
func_fatal_help "you must specify a compilation command"
# Delete any leftover library objects.
- if test "$build_old_libs" = yes; then
+ if test yes = "$build_old_libs"; then
removelist="$obj $lobj $libobj ${libobj}T"
else
removelist="$lobj $libobj ${libobj}T"
@@ -2127,16 +3443,16 @@ func_mode_compile ()
pic_mode=default
;;
esac
- if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
+ if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then
# non-PIC code in shared libraries is not supported
pic_mode=default
fi
# Calculate the filename of the output object if compiler does
# not support -o with -c
- if test "$compiler_c_o" = no; then
- output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
- lockfile="$output_obj.lock"
+ if test no = "$compiler_c_o"; then
+ output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext
+ lockfile=$output_obj.lock
else
output_obj=
need_locks=no
@@ -2145,12 +3461,12 @@ func_mode_compile ()
# Lock this critical section if it is needed
# We use this script file to make the link, it avoids creating a new file
- if test "$need_locks" = yes; then
+ if test yes = "$need_locks"; then
until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
func_echo "Waiting for $lockfile to be removed"
sleep 2
done
- elif test "$need_locks" = warn; then
+ elif test warn = "$need_locks"; then
if test -f "$lockfile"; then
$ECHO "\
*** ERROR, $lockfile exists and contains:
@@ -2158,7 +3474,7 @@ func_mode_compile ()
This indicates that another process is trying to use the same
temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together. If you
+your compiler does not support '-c' and '-o' together. If you
repeat this compilation, it may succeed, by chance, but you had better
avoid parallel builds (make -j) in this platform, or get a better
compiler."
@@ -2180,11 +3496,11 @@ compiler."
qsrcfile=$func_quote_for_eval_result
# Only build a PIC object if we are building libtool libraries.
- if test "$build_libtool_libs" = yes; then
+ if test yes = "$build_libtool_libs"; then
# Without this assignment, base_compile gets emptied.
fbsd_hideous_sh_bug=$base_compile
- if test "$pic_mode" != no; then
+ if test no != "$pic_mode"; then
command="$base_compile $qsrcfile $pic_flag"
else
# Don't build PIC code
@@ -2201,7 +3517,7 @@ compiler."
func_show_eval_locale "$command" \
'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
- if test "$need_locks" = warn &&
+ if test warn = "$need_locks" &&
test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
$ECHO "\
*** ERROR, $lockfile contains:
@@ -2212,7 +3528,7 @@ $srcfile
This indicates that another process is trying to use the same
temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together. If you
+your compiler does not support '-c' and '-o' together. If you
repeat this compilation, it may succeed, by chance, but you had better
avoid parallel builds (make -j) in this platform, or get a better
compiler."
@@ -2228,20 +3544,20 @@ compiler."
fi
# Allow error messages only from the first compilation.
- if test "$suppress_opt" = yes; then
+ if test yes = "$suppress_opt"; then
suppress_output=' >/dev/null 2>&1'
fi
fi
# Only build a position-dependent object if we build old libraries.
- if test "$build_old_libs" = yes; then
- if test "$pic_mode" != yes; then
+ if test yes = "$build_old_libs"; then
+ if test yes != "$pic_mode"; then
# Don't build PIC code
command="$base_compile $qsrcfile$pie_flag"
else
command="$base_compile $qsrcfile $pic_flag"
fi
- if test "$compiler_c_o" = yes; then
+ if test yes = "$compiler_c_o"; then
func_append command " -o $obj"
fi
@@ -2250,7 +3566,7 @@ compiler."
func_show_eval_locale "$command" \
'$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
- if test "$need_locks" = warn &&
+ if test warn = "$need_locks" &&
test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
$ECHO "\
*** ERROR, $lockfile contains:
@@ -2261,7 +3577,7 @@ $srcfile
This indicates that another process is trying to use the same
temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together. If you
+your compiler does not support '-c' and '-o' together. If you
repeat this compilation, it may succeed, by chance, but you had better
avoid parallel builds (make -j) in this platform, or get a better
compiler."
@@ -2281,7 +3597,7 @@ compiler."
func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
# Unlock the critical section if it was locked
- if test "$need_locks" != no; then
+ if test no != "$need_locks"; then
removelist=$lockfile
$RM "$lockfile"
fi
@@ -2291,7 +3607,7 @@ compiler."
}
$opt_help || {
- test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
+ test compile = "$opt_mode" && func_mode_compile ${1+"$@"}
}
func_mode_help ()
@@ -2311,7 +3627,7 @@ func_mode_help ()
Remove files from the build directory.
RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed
+(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed
to RM.
If FILE is a libtool library, object or program, all the files associated
@@ -2330,16 +3646,16 @@ This mode accepts the following additional options:
-no-suppress do not suppress compiler output for multiple passes
-prefer-pic try to build PIC objects only
-prefer-non-pic try to build non-PIC objects only
- -shared do not build a \`.o' file suitable for static linking
- -static only build a \`.o' file suitable for static linking
+ -shared do not build a '.o' file suitable for static linking
+ -static only build a '.o' file suitable for static linking
-Wc,FLAG pass FLAG directly to the compiler
-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+COMPILE-COMMAND is a command to be used in creating a 'standard' object file
from the given SOURCEFILE.
The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
+SOURCEFILE, then substituting the C source code suffix '.c' with the
+library object suffix, '.lo'."
;;
execute)
@@ -2352,7 +3668,7 @@ This mode accepts the following additional options:
-dlopen FILE add the directory containing FILE to the library path
-This mode sets the library path environment variable according to \`-dlopen'
+This mode sets the library path environment variable according to '-dlopen'
flags.
If any of the ARGS are libtool executable wrappers, then they are translated
@@ -2371,7 +3687,7 @@ Complete the installation of libtool libraries.
Each LIBDIR is a directory that contains libtool libraries.
The commands that this mode executes may require superuser privileges. Use
-the \`--dry-run' option if you just want to see what would be executed."
+the '--dry-run' option if you just want to see what would be executed."
;;
install)
@@ -2381,7 +3697,7 @@ the \`--dry-run' option if you just want to see what would be executed."
Install executables or libraries.
INSTALL-COMMAND is the installation command. The first component should be
-either the \`install' or \`cp' program.
+either the 'install' or 'cp' program.
The following components of INSTALL-COMMAND are treated specially:
@@ -2407,7 +3723,7 @@ The following components of LINK-COMMAND are treated specially:
-avoid-version do not add a version suffix if possible
-bindir BINDIR specify path to binaries directory (for systems where
libraries must be found in the PATH setting at runtime)
- -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime
+ -dlopen FILE '-dlpreopen' FILE if it cannot be dlopened at runtime
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-export-symbols SYMFILE
@@ -2421,7 +3737,8 @@ The following components of LINK-COMMAND are treated specially:
-no-install link a not-installable executable
-no-undefined declare that a library does not refer to external symbols
-o OUTPUT-FILE create OUTPUT-FILE from the specified objects
- -objectlist FILE Use a list of object files found in FILE to specify objects
+ -objectlist FILE use a list of object files found in FILE to specify objects
+ -os2dllname NAME force a short DLL name on OS/2 (no effect on other OSes)
-precious-files-regex REGEX
don't remove output files matching REGEX
-release RELEASE specify package release information
@@ -2441,20 +3758,20 @@ The following components of LINK-COMMAND are treated specially:
-Xlinker FLAG pass linker-specific FLAG directly to the linker
-XCClinker FLAG pass link-specific FLAG to the compiler driver (CC)
-All other options (arguments beginning with \`-') are ignored.
+All other options (arguments beginning with '-') are ignored.
-Every other argument is treated as a filename. Files ending in \`.la' are
+Every other argument is treated as a filename. Files ending in '.la' are
treated as uninstalled libtool libraries, other files are standard or library
object files.
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-only library objects (\`.lo' files) may be specified, and \`-rpath' is
+If the OUTPUT-FILE ends in '.la', then a libtool library is created,
+only library objects ('.lo' files) may be specified, and '-rpath' is
required, except when creating a convenience library.
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
+If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created
+using 'ar' and 'ranlib', or on Windows using 'lib'.
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file
is created, otherwise an executable program is created."
;;
@@ -2465,7 +3782,7 @@ is created, otherwise an executable program is created."
Remove libraries from an installation directory.
RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed
+(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed
to RM.
If FILE is a libtool library, all the files associated with it are deleted.
@@ -2473,17 +3790,17 @@ Otherwise, only FILE itself is deleted using RM."
;;
*)
- func_fatal_help "invalid operation mode \`$opt_mode'"
+ func_fatal_help "invalid operation mode '$opt_mode'"
;;
esac
echo
- $ECHO "Try \`$progname --help' for more information about other modes."
+ $ECHO "Try '$progname --help' for more information about other modes."
}
# Now that we've collected a possible --mode arg, show help if necessary
if $opt_help; then
- if test "$opt_help" = :; then
+ if test : = "$opt_help"; then
func_mode_help
else
{
@@ -2491,7 +3808,7 @@ if $opt_help; then
for opt_mode in compile link execute install finish uninstall clean; do
func_mode_help
done
- } | sed -n '1p; 2,$s/^Usage:/ or: /p'
+ } | $SED -n '1p; 2,$s/^Usage:/ or: /p'
{
func_help noexit
for opt_mode in compile link execute install finish uninstall clean; do
@@ -2499,7 +3816,7 @@ if $opt_help; then
func_mode_help
done
} |
- sed '1d
+ $SED '1d
/^When reporting/,/^Report/{
H
d
@@ -2516,16 +3833,17 @@ fi
# func_mode_execute arg...
func_mode_execute ()
{
- $opt_debug
+ $debug_cmd
+
# The first argument is the command name.
- cmd="$nonopt"
+ cmd=$nonopt
test -z "$cmd" && \
func_fatal_help "you must specify a COMMAND"
# Handle -dlopen flags immediately.
for file in $opt_dlopen; do
test -f "$file" \
- || func_fatal_help "\`$file' is not a file"
+ || func_fatal_help "'$file' is not a file"
dir=
case $file in
@@ -2535,7 +3853,7 @@ func_mode_execute ()
# Check to see that this really is a libtool archive.
func_lalib_unsafe_p "$file" \
- || func_fatal_help "\`$lib' is not a valid libtool archive"
+ || func_fatal_help "'$lib' is not a valid libtool archive"
# Read the libtool library.
dlname=
@@ -2546,18 +3864,18 @@ func_mode_execute ()
if test -z "$dlname"; then
# Warn if it was a shared library.
test -n "$library_names" && \
- func_warning "\`$file' was not linked with \`-export-dynamic'"
+ func_warning "'$file' was not linked with '-export-dynamic'"
continue
fi
func_dirname "$file" "" "."
- dir="$func_dirname_result"
+ dir=$func_dirname_result
if test -f "$dir/$objdir/$dlname"; then
func_append dir "/$objdir"
else
if test ! -f "$dir/$dlname"; then
- func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
+ func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'"
fi
fi
;;
@@ -2565,18 +3883,18 @@ func_mode_execute ()
*.lo)
# Just add the directory containing the .lo file.
func_dirname "$file" "" "."
- dir="$func_dirname_result"
+ dir=$func_dirname_result
;;
*)
- func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
+ func_warning "'-dlopen' is ignored for non-libtool libraries and objects"
continue
;;
esac
# Get the absolute pathname.
absdir=`cd "$dir" && pwd`
- test -n "$absdir" && dir="$absdir"
+ test -n "$absdir" && dir=$absdir
# Now add the directory to shlibpath_var.
if eval "test -z \"\$$shlibpath_var\""; then
@@ -2588,7 +3906,7 @@ func_mode_execute ()
# This variable tells wrapper scripts just to set shlibpath_var
# rather than running their programs.
- libtool_execute_magic="$magic"
+ libtool_execute_magic=$magic
# Check if any of the arguments is a wrapper script.
args=
@@ -2601,12 +3919,12 @@ func_mode_execute ()
if func_ltwrapper_script_p "$file"; then
func_source "$file"
# Transform arg to wrapped name.
- file="$progdir/$program"
+ file=$progdir/$program
elif func_ltwrapper_executable_p "$file"; then
func_ltwrapper_scriptname "$file"
func_source "$func_ltwrapper_scriptname_result"
# Transform arg to wrapped name.
- file="$progdir/$program"
+ file=$progdir/$program
fi
;;
esac
@@ -2614,7 +3932,15 @@ func_mode_execute ()
func_append_quoted args "$file"
done
- if test "X$opt_dry_run" = Xfalse; then
+ if $opt_dry_run; then
+ # Display what would be done.
+ if test -n "$shlibpath_var"; then
+ eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
+ echo "export $shlibpath_var"
+ fi
+ $ECHO "$cmd$args"
+ exit $EXIT_SUCCESS
+ else
if test -n "$shlibpath_var"; then
# Export the shlibpath_var.
eval "export $shlibpath_var"
@@ -2631,25 +3957,18 @@ func_mode_execute ()
done
# Now prepare to actually exec the command.
- exec_cmd="\$cmd$args"
- else
- # Display what would be done.
- if test -n "$shlibpath_var"; then
- eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
- echo "export $shlibpath_var"
- fi
- $ECHO "$cmd$args"
- exit $EXIT_SUCCESS
+ exec_cmd=\$cmd$args
fi
}
-test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
+test execute = "$opt_mode" && func_mode_execute ${1+"$@"}
# func_mode_finish arg...
func_mode_finish ()
{
- $opt_debug
+ $debug_cmd
+
libs=
libdirs=
admincmds=
@@ -2663,11 +3982,11 @@ func_mode_finish ()
if func_lalib_unsafe_p "$opt"; then
func_append libs " $opt"
else
- func_warning "\`$opt' is not a valid libtool archive"
+ func_warning "'$opt' is not a valid libtool archive"
fi
else
- func_fatal_error "invalid argument \`$opt'"
+ func_fatal_error "invalid argument '$opt'"
fi
done
@@ -2682,12 +4001,12 @@ func_mode_finish ()
# Remove sysroot references
if $opt_dry_run; then
for lib in $libs; do
- echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
+ echo "removing references to $lt_sysroot and '=' prefixes from $lib"
done
else
tmpdir=`func_mktempdir`
for lib in $libs; do
- sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
+ $SED -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
> $tmpdir/tmp-la
mv -f $tmpdir/tmp-la $lib
done
@@ -2712,7 +4031,7 @@ func_mode_finish ()
fi
# Exit here if they wanted silent mode.
- $opt_silent && exit $EXIT_SUCCESS
+ $opt_quiet && exit $EXIT_SUCCESS
if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
echo "----------------------------------------------------------------------"
@@ -2723,27 +4042,27 @@ func_mode_finish ()
echo
echo "If you ever happen to want to link against installed libraries"
echo "in a given directory, LIBDIR, you must either use libtool, and"
- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+ echo "specify the full pathname of the library, or use the '-LLIBDIR'"
echo "flag during linking and do at least one of the following:"
if test -n "$shlibpath_var"; then
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
+ echo " - add LIBDIR to the '$shlibpath_var' environment variable"
echo " during execution"
fi
if test -n "$runpath_var"; then
- echo " - add LIBDIR to the \`$runpath_var' environment variable"
+ echo " - add LIBDIR to the '$runpath_var' environment variable"
echo " during linking"
fi
if test -n "$hardcode_libdir_flag_spec"; then
libdir=LIBDIR
eval flag=\"$hardcode_libdir_flag_spec\"
- $ECHO " - use the \`$flag' linker flag"
+ $ECHO " - use the '$flag' linker flag"
fi
if test -n "$admincmds"; then
$ECHO " - have your system administrator run these commands:$admincmds"
fi
if test -f /etc/ld.so.conf; then
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+ echo " - have your system administrator add LIBDIR to '/etc/ld.so.conf'"
fi
echo
@@ -2762,18 +4081,20 @@ func_mode_finish ()
exit $EXIT_SUCCESS
}
-test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
+test finish = "$opt_mode" && func_mode_finish ${1+"$@"}
# func_mode_install arg...
func_mode_install ()
{
- $opt_debug
+ $debug_cmd
+
# There may be an optional sh(1) argument at the beginning of
# install_prog (especially on Windows NT).
- if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+ if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" ||
# Allow the use of GNU shtool's install command.
- case $nonopt in *shtool*) :;; *) false;; esac; then
+ case $nonopt in *shtool*) :;; *) false;; esac
+ then
# Aesthetically quote it.
func_quote_for_eval "$nonopt"
install_prog="$func_quote_for_eval_result "
@@ -2800,7 +4121,7 @@ func_mode_install ()
opts=
prev=
install_type=
- isdir=no
+ isdir=false
stripme=
no_mode=:
for arg
@@ -2813,7 +4134,7 @@ func_mode_install ()
fi
case $arg in
- -d) isdir=yes ;;
+ -d) isdir=: ;;
-f)
if $install_cp; then :; else
prev=$arg
@@ -2831,7 +4152,7 @@ func_mode_install ()
*)
# If the previous option needed an argument, then skip it.
if test -n "$prev"; then
- if test "x$prev" = x-m && test -n "$install_override_mode"; then
+ if test X-m = "X$prev" && test -n "$install_override_mode"; then
arg2=$install_override_mode
no_mode=false
fi
@@ -2856,7 +4177,7 @@ func_mode_install ()
func_fatal_help "you must specify an install program"
test -n "$prev" && \
- func_fatal_help "the \`$prev' option requires an argument"
+ func_fatal_help "the '$prev' option requires an argument"
if test -n "$install_override_mode" && $no_mode; then
if $install_cp; then :; else
@@ -2878,19 +4199,19 @@ func_mode_install ()
dest=$func_stripname_result
# Check to see that the destination is a directory.
- test -d "$dest" && isdir=yes
- if test "$isdir" = yes; then
- destdir="$dest"
+ test -d "$dest" && isdir=:
+ if $isdir; then
+ destdir=$dest
destname=
else
func_dirname_and_basename "$dest" "" "."
- destdir="$func_dirname_result"
- destname="$func_basename_result"
+ destdir=$func_dirname_result
+ destname=$func_basename_result
# Not a directory, so check to see that there is only one file specified.
set dummy $files; shift
test "$#" -gt 1 && \
- func_fatal_help "\`$dest' is not a directory"
+ func_fatal_help "'$dest' is not a directory"
fi
case $destdir in
[\\/]* | [A-Za-z]:[\\/]*) ;;
@@ -2899,7 +4220,7 @@ func_mode_install ()
case $file in
*.lo) ;;
*)
- func_fatal_help "\`$destdir' must be an absolute directory name"
+ func_fatal_help "'$destdir' must be an absolute directory name"
;;
esac
done
@@ -2908,7 +4229,7 @@ func_mode_install ()
# This variable tells wrapper scripts just to set variables rather
# than running their programs.
- libtool_install_magic="$magic"
+ libtool_install_magic=$magic
staticlibs=
future_libdirs=
@@ -2928,7 +4249,7 @@ func_mode_install ()
# Check to see that this really is a libtool archive.
func_lalib_unsafe_p "$file" \
- || func_fatal_help "\`$file' is not a valid libtool archive"
+ || func_fatal_help "'$file' is not a valid libtool archive"
library_names=
old_library=
@@ -2950,7 +4271,7 @@ func_mode_install ()
fi
func_dirname "$file" "/" ""
- dir="$func_dirname_result"
+ dir=$func_dirname_result
func_append dir "$objdir"
if test -n "$relink_command"; then
@@ -2964,7 +4285,7 @@ func_mode_install ()
# are installed into $libdir/../bin (currently, that works fine)
# but it's something to keep an eye on.
test "$inst_prefix_dir" = "$destdir" && \
- func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
+ func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir"
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
@@ -2973,29 +4294,36 @@ func_mode_install ()
relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
fi
- func_warning "relinking \`$file'"
+ func_warning "relinking '$file'"
func_show_eval "$relink_command" \
- 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
+ 'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"'
fi
# See the names of the shared library.
set dummy $library_names; shift
if test -n "$1"; then
- realname="$1"
+ realname=$1
shift
- srcname="$realname"
- test -n "$relink_command" && srcname="$realname"T
+ srcname=$realname
+ test -n "$relink_command" && srcname=${realname}T
# Install the shared library and build the symlinks.
func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
'exit $?'
- tstripme="$stripme"
+ tstripme=$stripme
case $host_os in
cygwin* | mingw* | pw32* | cegcc*)
case $realname in
*.dll.a)
- tstripme=""
+ tstripme=
+ ;;
+ esac
+ ;;
+ os2*)
+ case $realname in
+ *_dll.a)
+ tstripme=
;;
esac
;;
@@ -3006,7 +4334,7 @@ func_mode_install ()
if test "$#" -gt 0; then
# Delete the old symlinks, and create new ones.
- # Try `ln -sf' first, because the `ln' binary might depend on
+ # Try 'ln -sf' first, because the 'ln' binary might depend on
# the symlink we replace! Solaris /bin/ln does not understand -f,
# so we also need to try rm && ln -s.
for linkname
@@ -3017,14 +4345,14 @@ func_mode_install ()
fi
# Do each command in the postinstall commands.
- lib="$destdir/$realname"
+ lib=$destdir/$realname
func_execute_cmds "$postinstall_cmds" 'exit $?'
fi
# Install the pseudo-library for information purposes.
func_basename "$file"
- name="$func_basename_result"
- instname="$dir/$name"i
+ name=$func_basename_result
+ instname=$dir/${name}i
func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
# Maybe install the static library, too.
@@ -3036,11 +4364,11 @@ func_mode_install ()
# Figure out destination file name, if it wasn't already specified.
if test -n "$destname"; then
- destfile="$destdir/$destname"
+ destfile=$destdir/$destname
else
func_basename "$file"
- destfile="$func_basename_result"
- destfile="$destdir/$destfile"
+ destfile=$func_basename_result
+ destfile=$destdir/$destfile
fi
# Deduce the name of the destination old-style object file.
@@ -3050,11 +4378,11 @@ func_mode_install ()
staticdest=$func_lo2o_result
;;
*.$objext)
- staticdest="$destfile"
+ staticdest=$destfile
destfile=
;;
*)
- func_fatal_help "cannot copy a libtool object to \`$destfile'"
+ func_fatal_help "cannot copy a libtool object to '$destfile'"
;;
esac
@@ -3063,7 +4391,7 @@ func_mode_install ()
func_show_eval "$install_prog $file $destfile" 'exit $?'
# Install the old object if enabled.
- if test "$build_old_libs" = yes; then
+ if test yes = "$build_old_libs"; then
# Deduce the name of the old-style object file.
func_lo2o "$file"
staticobj=$func_lo2o_result
@@ -3075,23 +4403,23 @@ func_mode_install ()
*)
# Figure out destination file name, if it wasn't already specified.
if test -n "$destname"; then
- destfile="$destdir/$destname"
+ destfile=$destdir/$destname
else
func_basename "$file"
- destfile="$func_basename_result"
- destfile="$destdir/$destfile"
+ destfile=$func_basename_result
+ destfile=$destdir/$destfile
fi
# If the file is missing, and there is a .exe on the end, strip it
# because it is most likely a libtool script we actually want to
# install
- stripped_ext=""
+ stripped_ext=
case $file in
*.exe)
if test ! -f "$file"; then
func_stripname '' '.exe' "$file"
file=$func_stripname_result
- stripped_ext=".exe"
+ stripped_ext=.exe
fi
;;
esac
@@ -3119,19 +4447,19 @@ func_mode_install ()
# Check the variables that should have been set.
test -z "$generated_by_libtool_version" && \
- func_fatal_error "invalid libtool wrapper script \`$wrapper'"
+ func_fatal_error "invalid libtool wrapper script '$wrapper'"
- finalize=yes
+ finalize=:
for lib in $notinst_deplibs; do
# Check to see that each library is installed.
libdir=
if test -f "$lib"; then
func_source "$lib"
fi
- libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
+ libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'`
if test -n "$libdir" && test ! -f "$libfile"; then
- func_warning "\`$lib' has not been installed in \`$libdir'"
- finalize=no
+ func_warning "'$lib' has not been installed in '$libdir'"
+ finalize=false
fi
done
@@ -3139,29 +4467,29 @@ func_mode_install ()
func_source "$wrapper"
outputname=
- if test "$fast_install" = no && test -n "$relink_command"; then
+ if test no = "$fast_install" && test -n "$relink_command"; then
$opt_dry_run || {
- if test "$finalize" = yes; then
+ if $finalize; then
tmpdir=`func_mktempdir`
func_basename "$file$stripped_ext"
- file="$func_basename_result"
- outputname="$tmpdir/$file"
+ file=$func_basename_result
+ outputname=$tmpdir/$file
# Replace the output file specification.
relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
- $opt_silent || {
+ $opt_quiet || {
func_quote_for_expand "$relink_command"
eval "func_echo $func_quote_for_expand_result"
}
if eval "$relink_command"; then :
else
- func_error "error: relink \`$file' with the above command before installing it"
+ func_error "error: relink '$file' with the above command before installing it"
$opt_dry_run || ${RM}r "$tmpdir"
continue
fi
- file="$outputname"
+ file=$outputname
else
- func_warning "cannot relink \`$file'"
+ func_warning "cannot relink '$file'"
fi
}
else
@@ -3198,10 +4526,10 @@ func_mode_install ()
for file in $staticlibs; do
func_basename "$file"
- name="$func_basename_result"
+ name=$func_basename_result
# Set up the ranlib parameters.
- oldlib="$destdir/$name"
+ oldlib=$destdir/$name
func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
tool_oldlib=$func_to_tool_file_result
@@ -3216,18 +4544,18 @@ func_mode_install ()
done
test -n "$future_libdirs" && \
- func_warning "remember to run \`$progname --finish$future_libdirs'"
+ func_warning "remember to run '$progname --finish$future_libdirs'"
if test -n "$current_libdirs"; then
# Maybe just do a dry run.
$opt_dry_run && current_libdirs=" -n$current_libdirs"
- exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+ exec_cmd='$SHELL "$progpath" $preserve_args --finish$current_libdirs'
else
exit $EXIT_SUCCESS
fi
}
-test "$opt_mode" = install && func_mode_install ${1+"$@"}
+test install = "$opt_mode" && func_mode_install ${1+"$@"}
# func_generate_dlsyms outputname originator pic_p
@@ -3235,16 +4563,17 @@ test "$opt_mode" = install && func_mode_install ${1+"$@"}
# a dlpreopen symbol table.
func_generate_dlsyms ()
{
- $opt_debug
- my_outputname="$1"
- my_originator="$2"
- my_pic_p="${3-no}"
- my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
+ $debug_cmd
+
+ my_outputname=$1
+ my_originator=$2
+ my_pic_p=${3-false}
+ my_prefix=`$ECHO "$my_originator" | $SED 's%[^a-zA-Z0-9]%_%g'`
my_dlsyms=
- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
if test -n "$NM" && test -n "$global_symbol_pipe"; then
- my_dlsyms="${my_outputname}S.c"
+ my_dlsyms=${my_outputname}S.c
else
func_error "not configured to extract global symbols from dlpreopened files"
fi
@@ -3255,7 +4584,7 @@ func_generate_dlsyms ()
"") ;;
*.c)
# Discover the nlist of each of the dlfiles.
- nlist="$output_objdir/${my_outputname}.nm"
+ nlist=$output_objdir/$my_outputname.nm
func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
@@ -3263,34 +4592,36 @@ func_generate_dlsyms ()
func_verbose "creating $output_objdir/$my_dlsyms"
$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
-/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
-/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
+/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */
+/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */
#ifdef __cplusplus
extern \"C\" {
#endif
-#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
+#if defined __GNUC__ && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
#endif
/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
relocations are performed -- see ld's documentation on pseudo-relocs. */
# define LT_DLSYM_CONST
-#elif defined(__osf__)
+#elif defined __osf__
/* This system does not cope well with relocations in const data. */
# define LT_DLSYM_CONST
#else
# define LT_DLSYM_CONST const
#endif
+#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
+
/* External symbol declarations for the compiler. */\
"
- if test "$dlself" = yes; then
- func_verbose "generating symbol list for \`$output'"
+ if test yes = "$dlself"; then
+ func_verbose "generating symbol list for '$output'"
$opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
@@ -3298,7 +4629,7 @@ extern \"C\" {
progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
for progfile in $progfiles; do
func_to_tool_file "$progfile" func_convert_file_msys_to_w32
- func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
+ func_verbose "extracting global C symbols from '$func_to_tool_file_result'"
$opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
done
@@ -3318,10 +4649,10 @@ extern \"C\" {
# Prepare the list of exported symbols
if test -z "$export_symbols"; then
- export_symbols="$output_objdir/$outputname.exp"
+ export_symbols=$output_objdir/$outputname.exp
$opt_dry_run || {
$RM $export_symbols
- eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+ eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
case $host in
*cygwin* | *mingw* | *cegcc* )
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
@@ -3331,7 +4662,7 @@ extern \"C\" {
}
else
$opt_dry_run || {
- eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+ eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
eval '$MV "$nlist"T "$nlist"'
case $host in
@@ -3345,22 +4676,22 @@ extern \"C\" {
fi
for dlprefile in $dlprefiles; do
- func_verbose "extracting global C symbols from \`$dlprefile'"
+ func_verbose "extracting global C symbols from '$dlprefile'"
func_basename "$dlprefile"
- name="$func_basename_result"
+ name=$func_basename_result
case $host in
*cygwin* | *mingw* | *cegcc* )
# if an import library, we need to obtain dlname
if func_win32_import_lib_p "$dlprefile"; then
func_tr_sh "$dlprefile"
eval "curr_lafile=\$libfile_$func_tr_sh_result"
- dlprefile_dlbasename=""
+ dlprefile_dlbasename=
if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
# Use subshell, to avoid clobbering current variable values
dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
- if test -n "$dlprefile_dlname" ; then
+ if test -n "$dlprefile_dlname"; then
func_basename "$dlprefile_dlname"
- dlprefile_dlbasename="$func_basename_result"
+ dlprefile_dlbasename=$func_basename_result
else
# no lafile. user explicitly requested -dlpreopen <import library>.
$sharedlib_from_linklib_cmd "$dlprefile"
@@ -3368,7 +4699,7 @@ extern \"C\" {
fi
fi
$opt_dry_run || {
- if test -n "$dlprefile_dlbasename" ; then
+ if test -n "$dlprefile_dlbasename"; then
eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
else
func_warning "Could not compute DLL name from $name"
@@ -3424,6 +4755,11 @@ extern \"C\" {
echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
fi
+ func_show_eval '$RM "${nlist}I"'
+ if test -n "$global_symbol_to_import"; then
+ eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I'
+ fi
+
echo >> "$output_objdir/$my_dlsyms" "\
/* The mapping between symbol names and symbols. */
@@ -3432,11 +4768,30 @@ typedef struct {
void *address;
} lt_dlsymlist;
extern LT_DLSYM_CONST lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols[];
+lt_${my_prefix}_LTX_preloaded_symbols[];\
+"
+
+ if test -s "$nlist"I; then
+ echo >> "$output_objdir/$my_dlsyms" "\
+static void lt_syminit(void)
+{
+ LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols;
+ for (; symbol->name; ++symbol)
+ {"
+ $SED 's/.*/ if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms"
+ echo >> "$output_objdir/$my_dlsyms" "\
+ }
+}"
+ fi
+ echo >> "$output_objdir/$my_dlsyms" "\
LT_DLSYM_CONST lt_dlsymlist
lt_${my_prefix}_LTX_preloaded_symbols[] =
-{\
- { \"$my_originator\", (void *) 0 },"
+{ {\"$my_originator\", (void *) 0},"
+
+ if test -s "$nlist"I; then
+ echo >> "$output_objdir/$my_dlsyms" "\
+ {\"@INIT@\", (void *) <_syminit},"
+ fi
case $need_lib_prefix in
no)
@@ -3478,9 +4833,7 @@ static const void *lt_preloaded_setup() {
*-*-hpux*)
pic_flag_for_symtable=" $pic_flag" ;;
*)
- if test "X$my_pic_p" != Xno; then
- pic_flag_for_symtable=" $pic_flag"
- fi
+ $my_pic_p && pic_flag_for_symtable=" $pic_flag"
;;
esac
;;
@@ -3497,10 +4850,10 @@ static const void *lt_preloaded_setup() {
func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
# Clean up the generated files.
- func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
+ func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"'
# Transform the symbol file into the correct name.
- symfileobj="$output_objdir/${my_outputname}S.$objext"
+ symfileobj=$output_objdir/${my_outputname}S.$objext
case $host in
*cygwin* | *mingw* | *cegcc* )
if test -f "$output_objdir/$my_outputname.def"; then
@@ -3518,7 +4871,7 @@ static const void *lt_preloaded_setup() {
esac
;;
*)
- func_fatal_error "unknown suffix for \`$my_dlsyms'"
+ func_fatal_error "unknown suffix for '$my_dlsyms'"
;;
esac
else
@@ -3532,6 +4885,32 @@ static const void *lt_preloaded_setup() {
fi
}
+# func_cygming_gnu_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is a GNU/binutils-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_gnu_implib_p ()
+{
+ $debug_cmd
+
+ func_to_tool_file "$1" func_convert_file_msys_to_w32
+ func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
+ test -n "$func_cygming_gnu_implib_tmp"
+}
+
+# func_cygming_ms_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is an MS-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_ms_implib_p ()
+{
+ $debug_cmd
+
+ func_to_tool_file "$1" func_convert_file_msys_to_w32
+ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
+ test -n "$func_cygming_ms_implib_tmp"
+}
+
# func_win32_libid arg
# return the library type of file 'arg'
#
@@ -3541,8 +4920,9 @@ static const void *lt_preloaded_setup() {
# Despite the name, also deal with 64 bit binaries.
func_win32_libid ()
{
- $opt_debug
- win32_libid_type="unknown"
+ $debug_cmd
+
+ win32_libid_type=unknown
win32_fileres=`file -L $1 2>/dev/null`
case $win32_fileres in
*ar\ archive\ import\ library*) # definitely import
@@ -3552,16 +4932,29 @@ func_win32_libid ()
# Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
$EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
- func_to_tool_file "$1" func_convert_file_msys_to_w32
- win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
- $SED -n -e '
+ case $nm_interface in
+ "MS dumpbin")
+ if func_cygming_ms_implib_p "$1" ||
+ func_cygming_gnu_implib_p "$1"
+ then
+ win32_nmres=import
+ else
+ win32_nmres=
+ fi
+ ;;
+ *)
+ func_to_tool_file "$1" func_convert_file_msys_to_w32
+ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
+ $SED -n -e '
1,100{
/ I /{
- s,.*,import,
+ s|.*|import|
p
q
}
}'`
+ ;;
+ esac
case $win32_nmres in
import*) win32_libid_type="x86 archive import";;
*) win32_libid_type="x86 archive static";;
@@ -3593,7 +4986,8 @@ func_win32_libid ()
# $sharedlib_from_linklib_result
func_cygming_dll_for_implib ()
{
- $opt_debug
+ $debug_cmd
+
sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
}
@@ -3610,7 +5004,8 @@ func_cygming_dll_for_implib ()
# specified import library.
func_cygming_dll_for_implib_fallback_core ()
{
- $opt_debug
+ $debug_cmd
+
match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
$OBJDUMP -s --section "$1" "$2" 2>/dev/null |
$SED '/^Contents of section '"$match_literal"':/{
@@ -3646,8 +5041,8 @@ func_cygming_dll_for_implib_fallback_core ()
/./p' |
# we now have a list, one entry per line, of the stringified
# contents of the appropriate section of all members of the
- # archive which possess that section. Heuristic: eliminate
- # all those which have a first or second character that is
+ # archive that possess that section. Heuristic: eliminate
+ # all those that have a first or second character that is
# a '.' (that is, objdump's representation of an unprintable
# character.) This should work for all archives with less than
# 0x302f exports -- but will fail for DLLs whose name actually
@@ -3658,30 +5053,6 @@ func_cygming_dll_for_implib_fallback_core ()
$SED -e '/^\./d;/^.\./d;q'
}
-# func_cygming_gnu_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is a GNU/binutils-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_gnu_implib_p ()
-{
- $opt_debug
- func_to_tool_file "$1" func_convert_file_msys_to_w32
- func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
- test -n "$func_cygming_gnu_implib_tmp"
-}
-
-# func_cygming_ms_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is an MS-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_ms_implib_p ()
-{
- $opt_debug
- func_to_tool_file "$1" func_convert_file_msys_to_w32
- func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
- test -n "$func_cygming_ms_implib_tmp"
-}
-
# func_cygming_dll_for_implib_fallback ARG
# Platform-specific function to extract the
# name of the DLL associated with the specified
@@ -3695,16 +5066,17 @@ func_cygming_ms_implib_p ()
# $sharedlib_from_linklib_result
func_cygming_dll_for_implib_fallback ()
{
- $opt_debug
- if func_cygming_gnu_implib_p "$1" ; then
+ $debug_cmd
+
+ if func_cygming_gnu_implib_p "$1"; then
# binutils import library
sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
- elif func_cygming_ms_implib_p "$1" ; then
+ elif func_cygming_ms_implib_p "$1"; then
# ms-generated import library
sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
else
# unknown
- sharedlib_from_linklib_result=""
+ sharedlib_from_linklib_result=
fi
}
@@ -3712,10 +5084,11 @@ func_cygming_dll_for_implib_fallback ()
# func_extract_an_archive dir oldlib
func_extract_an_archive ()
{
- $opt_debug
- f_ex_an_ar_dir="$1"; shift
- f_ex_an_ar_oldlib="$1"
- if test "$lock_old_archive_extraction" = yes; then
+ $debug_cmd
+
+ f_ex_an_ar_dir=$1; shift
+ f_ex_an_ar_oldlib=$1
+ if test yes = "$lock_old_archive_extraction"; then
lockfile=$f_ex_an_ar_oldlib.lock
until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
func_echo "Waiting for $lockfile to be removed"
@@ -3724,7 +5097,7 @@ func_extract_an_archive ()
fi
func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
'stat=$?; rm -f "$lockfile"; exit $stat'
- if test "$lock_old_archive_extraction" = yes; then
+ if test yes = "$lock_old_archive_extraction"; then
$opt_dry_run || rm -f "$lockfile"
fi
if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
@@ -3738,22 +5111,23 @@ func_extract_an_archive ()
# func_extract_archives gentop oldlib ...
func_extract_archives ()
{
- $opt_debug
- my_gentop="$1"; shift
+ $debug_cmd
+
+ my_gentop=$1; shift
my_oldlibs=${1+"$@"}
- my_oldobjs=""
- my_xlib=""
- my_xabs=""
- my_xdir=""
+ my_oldobjs=
+ my_xlib=
+ my_xabs=
+ my_xdir=
for my_xlib in $my_oldlibs; do
# Extract the objects.
case $my_xlib in
- [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) my_xabs=$my_xlib ;;
*) my_xabs=`pwd`"/$my_xlib" ;;
esac
func_basename "$my_xlib"
- my_xlib="$func_basename_result"
+ my_xlib=$func_basename_result
my_xlib_u=$my_xlib
while :; do
case " $extracted_archives " in
@@ -3765,7 +5139,7 @@ func_extract_archives ()
esac
done
extracted_archives="$extracted_archives $my_xlib_u"
- my_xdir="$my_gentop/$my_xlib_u"
+ my_xdir=$my_gentop/$my_xlib_u
func_mkdir_p "$my_xdir"
@@ -3778,22 +5152,23 @@ func_extract_archives ()
cd $my_xdir || exit $?
darwin_archive=$my_xabs
darwin_curdir=`pwd`
- darwin_base_archive=`basename "$darwin_archive"`
+ func_basename "$darwin_archive"
+ darwin_base_archive=$func_basename_result
darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
if test -n "$darwin_arches"; then
darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
darwin_arch=
func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
- for darwin_arch in $darwin_arches ; do
- func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
- $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
- cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
- func_extract_an_archive "`pwd`" "${darwin_base_archive}"
+ for darwin_arch in $darwin_arches; do
+ func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch"
+ $LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive"
+ cd "unfat-$$/$darwin_base_archive-$darwin_arch"
+ func_extract_an_archive "`pwd`" "$darwin_base_archive"
cd "$darwin_curdir"
- $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
+ $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive"
done # $darwin_arches
## Okay now we've a bunch of thin objects, gotta fatten them up :)
- darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
+ darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u`
darwin_file=
darwin_files=
for darwin_file in $darwin_filelist; do
@@ -3815,7 +5190,7 @@ func_extract_archives ()
my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
done
- func_extract_archives_result="$my_oldobjs"
+ func_extract_archives_result=$my_oldobjs
}
@@ -3830,7 +5205,7 @@ func_extract_archives ()
#
# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
# variable will take. If 'yes', then the emitted script
-# will assume that the directory in which it is stored is
+# will assume that the directory where it is stored is
# the $objdir directory. This is a cygwin/mingw-specific
# behavior.
func_emit_wrapper ()
@@ -3841,7 +5216,7 @@ func_emit_wrapper ()
#! $SHELL
# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
#
# The $output program cannot be directly executed until all the libtool
# libraries that it depends on are installed.
@@ -3898,9 +5273,9 @@ _LTECHO_EOF'
# Very basic option parsing. These options are (a) specific to
# the libtool wrapper, (b) are identical between the wrapper
-# /script/ and the wrapper /executable/ which is used only on
+# /script/ and the wrapper /executable/ that is used only on
# windows platforms, and (c) all begin with the string "--lt-"
-# (application programs are unlikely to have options which match
+# (application programs are unlikely to have options that match
# this pattern).
#
# There are only two supported options: --lt-debug and
@@ -3933,7 +5308,7 @@ func_parse_lt_options ()
# Print the debug banner immediately:
if test -n \"\$lt_option_debug\"; then
- echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
+ echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2
fi
}
@@ -3944,7 +5319,7 @@ func_lt_dump_args ()
lt_dump_args_N=1;
for lt_arg
do
- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
+ \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\"
lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
done
}
@@ -3958,7 +5333,7 @@ func_exec_program_core ()
*-*-mingw | *-*-os2* | *-cegcc*)
$ECHO "\
if test -n \"\$lt_option_debug\"; then
- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
+ \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2
func_lt_dump_args \${1+\"\$@\"} 1>&2
fi
exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
@@ -3968,7 +5343,7 @@ func_exec_program_core ()
*)
$ECHO "\
if test -n \"\$lt_option_debug\"; then
- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
+ \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2
func_lt_dump_args \${1+\"\$@\"} 1>&2
fi
exec \"\$progdir/\$program\" \${1+\"\$@\"}
@@ -4043,13 +5418,13 @@ func_exec_program ()
test -n \"\$absdir\" && thisdir=\"\$absdir\"
"
- if test "$fast_install" = yes; then
+ if test yes = "$fast_install"; then
$ECHO "\
program=lt-'$outputname'$exeext
progdir=\"\$thisdir/$objdir\"
if test ! -f \"\$progdir/\$program\" ||
- { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
+ { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\
test \"X\$file\" != \"X\$progdir/\$program\"; }; then
file=\"\$\$-\$program\"
@@ -4066,7 +5441,7 @@ func_exec_program ()
if test -n \"\$relink_command\"; then
if relink_command_output=\`eval \$relink_command 2>&1\`; then :
else
- $ECHO \"\$relink_command_output\" >&2
+ \$ECHO \"\$relink_command_output\" >&2
$RM \"\$progdir/\$file\"
exit 1
fi
@@ -4101,7 +5476,7 @@ func_exec_program ()
fi
# Export our shlibpath_var if we have one.
- if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+ if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
$ECHO "\
# Add our own library path to $shlibpath_var
$shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
@@ -4121,7 +5496,7 @@ func_exec_program ()
fi
else
# The program doesn't exist.
- \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
+ \$ECHO \"\$0: error: '\$progdir/\$program' does not exist\" 1>&2
\$ECHO \"This script is just a wrapper for \$program.\" 1>&2
\$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
exit 1
@@ -4140,7 +5515,7 @@ func_emit_cwrapperexe_src ()
cat <<EOF
/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
- Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+ Generated by $PROGRAM (GNU $PACKAGE) $VERSION
The $output program cannot be directly executed until all the libtool
libraries that it depends on are installed.
@@ -4175,47 +5550,45 @@ EOF
#include <fcntl.h>
#include <sys/stat.h>
+#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
+
/* declarations of non-ANSI functions */
-#if defined(__MINGW32__)
+#if defined __MINGW32__
# ifdef __STRICT_ANSI__
int _putenv (const char *);
# endif
-#elif defined(__CYGWIN__)
+#elif defined __CYGWIN__
# ifdef __STRICT_ANSI__
char *realpath (const char *, char *);
int putenv (char *);
int setenv (const char *, const char *, int);
# endif
-/* #elif defined (other platforms) ... */
+/* #elif defined other_platform || defined ... */
#endif
/* portability defines, excluding path handling macros */
-#if defined(_MSC_VER)
+#if defined _MSC_VER
# define setmode _setmode
# define stat _stat
# define chmod _chmod
# define getcwd _getcwd
# define putenv _putenv
# define S_IXUSR _S_IEXEC
-# ifndef _INTPTR_T_DEFINED
-# define _INTPTR_T_DEFINED
-# define intptr_t int
-# endif
-#elif defined(__MINGW32__)
+#elif defined __MINGW32__
# define setmode _setmode
# define stat _stat
# define chmod _chmod
# define getcwd _getcwd
# define putenv _putenv
-#elif defined(__CYGWIN__)
+#elif defined __CYGWIN__
# define HAVE_SETENV
# define FOPEN_WB "wb"
-/* #elif defined (other platforms) ... */
+/* #elif defined other platforms ... */
#endif
-#if defined(PATH_MAX)
+#if defined PATH_MAX
# define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
+#elif defined MAXPATHLEN
# define LT_PATHMAX MAXPATHLEN
#else
# define LT_PATHMAX 1024
@@ -4234,8 +5607,8 @@ int setenv (const char *, const char *, int);
# define PATH_SEPARATOR ':'
#endif
-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
- defined (__OS2__)
+#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \
+ defined __OS2__
# define HAVE_DOS_BASED_FILE_SYSTEM
# define FOPEN_WB "wb"
# ifndef DIR_SEPARATOR_2
@@ -4268,10 +5641,10 @@ int setenv (const char *, const char *, int);
#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type)))
#define XFREE(stale) do { \
- if (stale) { free ((void *) stale); stale = 0; } \
+ if (stale) { free (stale); stale = 0; } \
} while (0)
-#if defined(LT_DEBUGWRAPPER)
+#if defined LT_DEBUGWRAPPER
static int lt_debug = 1;
#else
static int lt_debug = 0;
@@ -4300,11 +5673,16 @@ void lt_dump_script (FILE *f);
EOF
cat <<EOF
-volatile const char * MAGIC_EXE = "$magic_exe";
+#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
+# define externally_visible volatile
+#else
+# define externally_visible __attribute__((externally_visible)) volatile
+#endif
+externally_visible const char * MAGIC_EXE = "$magic_exe";
const char * LIB_PATH_VARNAME = "$shlibpath_var";
EOF
- if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+ if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
func_to_host_path "$temp_rpath"
cat <<EOF
const char * LIB_PATH_VALUE = "$func_to_host_path_result";
@@ -4328,7 +5706,7 @@ const char * EXE_PATH_VALUE = "";
EOF
fi
- if test "$fast_install" = yes; then
+ if test yes = "$fast_install"; then
cat <<EOF
const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
EOF
@@ -4357,12 +5735,12 @@ main (int argc, char *argv[])
char *actual_cwrapper_name;
char *target_name;
char *lt_argv_zero;
- intptr_t rval = 127;
+ int rval = 127;
int i;
program_name = (char *) xstrdup (base_name (argv[0]));
- newargz = XMALLOC (char *, argc + 1);
+ newargz = XMALLOC (char *, (size_t) argc + 1);
/* very simple arg parsing; don't want to rely on getopt
* also, copy all non cwrapper options to newargz, except
@@ -4371,10 +5749,10 @@ main (int argc, char *argv[])
newargc=0;
for (i = 1; i < argc; i++)
{
- if (strcmp (argv[i], dumpscript_opt) == 0)
+ if (STREQ (argv[i], dumpscript_opt))
{
EOF
- case "$host" in
+ case $host in
*mingw* | *cygwin* )
# make stdout use "unix" line endings
echo " setmode(1,_O_BINARY);"
@@ -4385,12 +5763,12 @@ EOF
lt_dump_script (stdout);
return 0;
}
- if (strcmp (argv[i], debug_opt) == 0)
+ if (STREQ (argv[i], debug_opt))
{
lt_debug = 1;
continue;
}
- if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
+ if (STREQ (argv[i], ltwrapper_option_prefix))
{
/* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
namespace, but it is not one of the ones we know about and
@@ -4413,7 +5791,7 @@ EOF
EOF
cat <<EOF
/* The GNU banner must be the first non-error debug message */
- lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
+ lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE) $VERSION\n");
EOF
cat <<"EOF"
lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
@@ -4524,7 +5902,7 @@ EOF
cat <<"EOF"
/* execv doesn't actually work on mingw as expected on unix */
newargz = prepare_spawn (newargz);
- rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
+ rval = (int) _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
if (rval == -1)
{
/* failed to start process */
@@ -4569,7 +5947,7 @@ base_name (const char *name)
{
const char *base;
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
/* Skip over the disk name in MSDOS pathnames. */
if (isalpha ((unsigned char) name[0]) && name[1] == ':')
name += 2;
@@ -4628,7 +6006,7 @@ find_executable (const char *wrapper)
const char *p_next;
/* static buffer for getcwd */
char tmp[LT_PATHMAX + 1];
- int tmp_len;
+ size_t tmp_len;
char *concat_name;
lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
@@ -4638,7 +6016,7 @@ find_executable (const char *wrapper)
return NULL;
/* Absolute path? */
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
{
concat_name = xstrdup (wrapper);
@@ -4656,7 +6034,7 @@ find_executable (const char *wrapper)
return concat_name;
XFREE (concat_name);
}
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
}
#endif
@@ -4679,7 +6057,7 @@ find_executable (const char *wrapper)
for (q = p; *q; q++)
if (IS_PATH_SEPARATOR (*q))
break;
- p_len = q - p;
+ p_len = (size_t) (q - p);
p_next = (*q == '\0' ? q : q + 1);
if (p_len == 0)
{
@@ -4798,7 +6176,7 @@ strendzap (char *str, const char *pat)
if (patlen <= len)
{
str += len - patlen;
- if (strcmp (str, pat) == 0)
+ if (STREQ (str, pat))
*str = '\0';
}
return str;
@@ -4863,7 +6241,7 @@ lt_setenv (const char *name, const char *value)
char *str = xstrdup (value);
setenv (name, str, 1);
#else
- int len = strlen (name) + 1 + strlen (value) + 1;
+ size_t len = strlen (name) + 1 + strlen (value) + 1;
char *str = XMALLOC (char, len);
sprintf (str, "%s=%s", name, value);
if (putenv (str) != EXIT_SUCCESS)
@@ -4880,8 +6258,8 @@ lt_extend_str (const char *orig_value, const char *add, int to_end)
char *new_value;
if (orig_value && *orig_value)
{
- int orig_value_len = strlen (orig_value);
- int add_len = strlen (add);
+ size_t orig_value_len = strlen (orig_value);
+ size_t add_len = strlen (add);
new_value = XMALLOC (char, add_len + orig_value_len + 1);
if (to_end)
{
@@ -4912,10 +6290,10 @@ lt_update_exe_path (const char *name, const char *value)
{
char *new_value = lt_extend_str (getenv (name), value, 0);
/* some systems can't cope with a ':'-terminated path #' */
- int len = strlen (new_value);
- while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
+ size_t len = strlen (new_value);
+ while ((len > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
{
- new_value[len-1] = '\0';
+ new_value[--len] = '\0';
}
lt_setenv (name, new_value);
XFREE (new_value);
@@ -5082,27 +6460,47 @@ EOF
# True if ARG is an import lib, as indicated by $file_magic_cmd
func_win32_import_lib_p ()
{
- $opt_debug
+ $debug_cmd
+
case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
*import*) : ;;
*) false ;;
esac
}
+# func_suncc_cstd_abi
+# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!!
+# Several compiler flags select an ABI that is incompatible with the
+# Cstd library. Avoid specifying it if any are in CXXFLAGS.
+func_suncc_cstd_abi ()
+{
+ $debug_cmd
+
+ case " $compile_command " in
+ *" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*)
+ suncc_use_cstd_abi=no
+ ;;
+ *)
+ suncc_use_cstd_abi=yes
+ ;;
+ esac
+}
+
# func_mode_link arg...
func_mode_link ()
{
- $opt_debug
+ $debug_cmd
+
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
# It is impossible to link a dll without this setting, and
# we shouldn't force the makefile maintainer to figure out
- # which system we are compiling for in order to pass an extra
+ # what system we are compiling for in order to pass an extra
# flag for every libtool invocation.
# allow_undefined=no
# FIXME: Unfortunately, there are problems with the above when trying
- # to make a dll which has undefined symbols, in which case not
+ # to make a dll that has undefined symbols, in which case not
# even a static library is built. For now, we need to specify
# -no-undefined on the libtool link line when we can be certain
# that all symbols are satisfied, otherwise we get a static library.
@@ -5146,10 +6544,11 @@ func_mode_link ()
module=no
no_install=no
objs=
+ os2dllname=
non_pic_objects=
precious_files_regex=
prefer_static_libs=no
- preload=no
+ preload=false
prev=
prevarg=
release=
@@ -5161,7 +6560,7 @@ func_mode_link ()
vinfo=
vinfo_number=no
weak_libs=
- single_module="${wl}-single_module"
+ single_module=$wl-single_module
func_infer_tag $base_compile
# We need to know -static, to get the right output filenames.
@@ -5169,15 +6568,15 @@ func_mode_link ()
do
case $arg in
-shared)
- test "$build_libtool_libs" != yes && \
- func_fatal_configuration "can not build a shared library"
+ test yes != "$build_libtool_libs" \
+ && func_fatal_configuration "cannot build a shared library"
build_old_libs=no
break
;;
-all-static | -static | -static-libtool-libs)
case $arg in
-all-static)
- if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+ if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then
func_warning "complete static linking is impossible in this configuration"
fi
if test -n "$link_static_flag"; then
@@ -5210,7 +6609,7 @@ func_mode_link ()
# Go through the arguments, transforming them on the way.
while test "$#" -gt 0; do
- arg="$1"
+ arg=$1
shift
func_quote_for_eval "$arg"
qarg=$func_quote_for_eval_unquoted_result
@@ -5227,21 +6626,21 @@ func_mode_link ()
case $prev in
bindir)
- bindir="$arg"
+ bindir=$arg
prev=
continue
;;
dlfiles|dlprefiles)
- if test "$preload" = no; then
+ $preload || {
# Add the symbol object into the linking commands.
func_append compile_command " @SYMFILE@"
func_append finalize_command " @SYMFILE@"
- preload=yes
- fi
+ preload=:
+ }
case $arg in
*.la | *.lo) ;; # We handle these cases below.
force)
- if test "$dlself" = no; then
+ if test no = "$dlself"; then
dlself=needless
export_dynamic=yes
fi
@@ -5249,9 +6648,9 @@ func_mode_link ()
continue
;;
self)
- if test "$prev" = dlprefiles; then
+ if test dlprefiles = "$prev"; then
dlself=yes
- elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
+ elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then
dlself=yes
else
dlself=needless
@@ -5261,7 +6660,7 @@ func_mode_link ()
continue
;;
*)
- if test "$prev" = dlfiles; then
+ if test dlfiles = "$prev"; then
func_append dlfiles " $arg"
else
func_append dlprefiles " $arg"
@@ -5272,14 +6671,14 @@ func_mode_link ()
esac
;;
expsyms)
- export_symbols="$arg"
+ export_symbols=$arg
test -f "$arg" \
- || func_fatal_error "symbol file \`$arg' does not exist"
+ || func_fatal_error "symbol file '$arg' does not exist"
prev=
continue
;;
expsyms_regex)
- export_symbols_regex="$arg"
+ export_symbols_regex=$arg
prev=
continue
;;
@@ -5297,7 +6696,13 @@ func_mode_link ()
continue
;;
inst_prefix)
- inst_prefix_dir="$arg"
+ inst_prefix_dir=$arg
+ prev=
+ continue
+ ;;
+ mllvm)
+ # Clang does not use LLVM to link, so we can simply discard any
+ # '-mllvm $arg' options when doing the link step.
prev=
continue
;;
@@ -5321,21 +6726,21 @@ func_mode_link ()
if test -z "$pic_object" ||
test -z "$non_pic_object" ||
- test "$pic_object" = none &&
- test "$non_pic_object" = none; then
- func_fatal_error "cannot find name of object for \`$arg'"
+ test none = "$pic_object" &&
+ test none = "$non_pic_object"; then
+ func_fatal_error "cannot find name of object for '$arg'"
fi
# Extract subdirectory from the argument.
func_dirname "$arg" "/" ""
- xdir="$func_dirname_result"
+ xdir=$func_dirname_result
- if test "$pic_object" != none; then
+ if test none != "$pic_object"; then
# Prepend the subdirectory the object is found in.
- pic_object="$xdir$pic_object"
+ pic_object=$xdir$pic_object
- if test "$prev" = dlfiles; then
- if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+ if test dlfiles = "$prev"; then
+ if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
func_append dlfiles " $pic_object"
prev=
continue
@@ -5346,7 +6751,7 @@ func_mode_link ()
fi
# CHECK ME: I think I busted this. -Ossama
- if test "$prev" = dlprefiles; then
+ if test dlprefiles = "$prev"; then
# Preload the old-style object.
func_append dlprefiles " $pic_object"
prev=
@@ -5354,23 +6759,23 @@ func_mode_link ()
# A PIC object.
func_append libobjs " $pic_object"
- arg="$pic_object"
+ arg=$pic_object
fi
# Non-PIC object.
- if test "$non_pic_object" != none; then
+ if test none != "$non_pic_object"; then
# Prepend the subdirectory the object is found in.
- non_pic_object="$xdir$non_pic_object"
+ non_pic_object=$xdir$non_pic_object
# A standard non-PIC object
func_append non_pic_objects " $non_pic_object"
- if test -z "$pic_object" || test "$pic_object" = none ; then
- arg="$non_pic_object"
+ if test -z "$pic_object" || test none = "$pic_object"; then
+ arg=$non_pic_object
fi
else
# If the PIC object exists, use it instead.
# $xdir was prepended to $pic_object above.
- non_pic_object="$pic_object"
+ non_pic_object=$pic_object
func_append non_pic_objects " $non_pic_object"
fi
else
@@ -5378,7 +6783,7 @@ func_mode_link ()
if $opt_dry_run; then
# Extract subdirectory from the argument.
func_dirname "$arg" "/" ""
- xdir="$func_dirname_result"
+ xdir=$func_dirname_result
func_lo2o "$arg"
pic_object=$xdir$objdir/$func_lo2o_result
@@ -5386,24 +6791,29 @@ func_mode_link ()
func_append libobjs " $pic_object"
func_append non_pic_objects " $non_pic_object"
else
- func_fatal_error "\`$arg' is not a valid libtool object"
+ func_fatal_error "'$arg' is not a valid libtool object"
fi
fi
done
else
- func_fatal_error "link input file \`$arg' does not exist"
+ func_fatal_error "link input file '$arg' does not exist"
fi
arg=$save_arg
prev=
continue
;;
+ os2dllname)
+ os2dllname=$arg
+ prev=
+ continue
+ ;;
precious_regex)
- precious_files_regex="$arg"
+ precious_files_regex=$arg
prev=
continue
;;
release)
- release="-$arg"
+ release=-$arg
prev=
continue
;;
@@ -5415,7 +6825,7 @@ func_mode_link ()
func_fatal_error "only absolute run-paths are allowed"
;;
esac
- if test "$prev" = rpath; then
+ if test rpath = "$prev"; then
case "$rpath " in
*" $arg "*) ;;
*) func_append rpath " $arg" ;;
@@ -5430,7 +6840,7 @@ func_mode_link ()
continue
;;
shrext)
- shrext_cmds="$arg"
+ shrext_cmds=$arg
prev=
continue
;;
@@ -5470,7 +6880,7 @@ func_mode_link ()
esac
fi # test -n "$prev"
- prevarg="$arg"
+ prevarg=$arg
case $arg in
-all-static)
@@ -5484,7 +6894,7 @@ func_mode_link ()
-allow-undefined)
# FIXME: remove this flag sometime in the future.
- func_fatal_error "\`-allow-undefined' must not be used because it is the default"
+ func_fatal_error "'-allow-undefined' must not be used because it is the default"
;;
-avoid-version)
@@ -5516,7 +6926,7 @@ func_mode_link ()
if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
func_fatal_error "more than one -exported-symbols argument is not allowed"
fi
- if test "X$arg" = "X-export-symbols"; then
+ if test X-export-symbols = "X$arg"; then
prev=expsyms
else
prev=expsyms_regex
@@ -5550,9 +6960,9 @@ func_mode_link ()
func_stripname "-L" '' "$arg"
if test -z "$func_stripname_result"; then
if test "$#" -gt 0; then
- func_fatal_error "require no space between \`-L' and \`$1'"
+ func_fatal_error "require no space between '-L' and '$1'"
else
- func_fatal_error "need path for \`-L' option"
+ func_fatal_error "need path for '-L' option"
fi
fi
func_resolve_sysroot "$func_stripname_result"
@@ -5563,8 +6973,8 @@ func_mode_link ()
*)
absdir=`cd "$dir" && pwd`
test -z "$absdir" && \
- func_fatal_error "cannot determine absolute directory name of \`$dir'"
- dir="$absdir"
+ func_fatal_error "cannot determine absolute directory name of '$dir'"
+ dir=$absdir
;;
esac
case "$deplibs " in
@@ -5599,7 +7009,7 @@ func_mode_link ()
;;
-l*)
- if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+ if test X-lc = "X$arg" || test X-lm = "X$arg"; then
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
# These systems don't actually have a C or math library (as such)
@@ -5607,11 +7017,11 @@ func_mode_link ()
;;
*-*-os2*)
# These systems don't actually have a C library (as such)
- test "X$arg" = "X-lc" && continue
+ test X-lc = "X$arg" && continue
;;
- *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
# Do not include libc due to us having libc/libc_r.
- test "X$arg" = "X-lc" && continue
+ test X-lc = "X$arg" && continue
;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C and math libraries are in the System framework
@@ -5620,16 +7030,16 @@ func_mode_link ()
;;
*-*-sco3.2v5* | *-*-sco5v6*)
# Causes problems with __ctype
- test "X$arg" = "X-lc" && continue
+ test X-lc = "X$arg" && continue
;;
*-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
# Compiler inserts libc in the correct place for threads to work
- test "X$arg" = "X-lc" && continue
+ test X-lc = "X$arg" && continue
;;
esac
- elif test "X$arg" = "X-lc_r"; then
+ elif test X-lc_r = "X$arg"; then
case $host in
- *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
# Do not include libc_r directly, use -pthread flag.
continue
;;
@@ -5639,6 +7049,11 @@ func_mode_link ()
continue
;;
+ -mllvm)
+ prev=mllvm
+ continue
+ ;;
+
-module)
module=yes
continue
@@ -5668,7 +7083,7 @@ func_mode_link ()
;;
-multi_module)
- single_module="${wl}-multi_module"
+ single_module=$wl-multi_module
continue
;;
@@ -5682,8 +7097,8 @@ func_mode_link ()
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
# The PATH hackery in wrapper scripts is required on Windows
# and Darwin in order for the loader to find any dlls it needs.
- func_warning "\`-no-install' is ignored for $host"
- func_warning "assuming \`-no-fast-install' instead"
+ func_warning "'-no-install' is ignored for $host"
+ func_warning "assuming '-no-fast-install' instead"
fast_install=no
;;
*) no_install=yes ;;
@@ -5701,6 +7116,11 @@ func_mode_link ()
continue
;;
+ -os2dllname)
+ prev=os2dllname
+ continue
+ ;;
+
-o) prev=output ;;
-precious-files-regex)
@@ -5788,14 +7208,14 @@ func_mode_link ()
func_stripname '-Wc,' '' "$arg"
args=$func_stripname_result
arg=
- save_ifs="$IFS"; IFS=','
+ save_ifs=$IFS; IFS=,
for flag in $args; do
- IFS="$save_ifs"
+ IFS=$save_ifs
func_quote_for_eval "$flag"
func_append arg " $func_quote_for_eval_result"
func_append compiler_flags " $func_quote_for_eval_result"
done
- IFS="$save_ifs"
+ IFS=$save_ifs
func_stripname ' ' '' "$arg"
arg=$func_stripname_result
;;
@@ -5804,15 +7224,15 @@ func_mode_link ()
func_stripname '-Wl,' '' "$arg"
args=$func_stripname_result
arg=
- save_ifs="$IFS"; IFS=','
+ save_ifs=$IFS; IFS=,
for flag in $args; do
- IFS="$save_ifs"
+ IFS=$save_ifs
func_quote_for_eval "$flag"
func_append arg " $wl$func_quote_for_eval_result"
func_append compiler_flags " $wl$func_quote_for_eval_result"
func_append linker_flags " $func_quote_for_eval_result"
done
- IFS="$save_ifs"
+ IFS=$save_ifs
func_stripname ' ' '' "$arg"
arg=$func_stripname_result
;;
@@ -5835,7 +7255,7 @@ func_mode_link ()
# -msg_* for osf cc
-msg_*)
func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
+ arg=$func_quote_for_eval_result
;;
# Flags to be passed through unchanged, with rationale:
@@ -5847,25 +7267,46 @@ func_mode_link ()
# -m*, -t[45]*, -txscale* architecture-specific flags for GCC
# -F/path path to uninstalled frameworks, gcc on darwin
# -p, -pg, --coverage, -fprofile-* profiling flags for GCC
+ # -fstack-protector* stack protector flags for GCC
# @file GCC response files
# -tp=* Portland pgcc target processor selection
# --sysroot=* for sysroot support
- # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+ # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+ # -stdlib=* select c++ std lib with clang
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
- -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
+ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
+ arg=$func_quote_for_eval_result
func_append compile_command " $arg"
func_append finalize_command " $arg"
func_append compiler_flags " $arg"
continue
;;
+ -Z*)
+ if test os2 = "`expr $host : '.*\(os2\)'`"; then
+ # OS/2 uses -Zxxx to specify OS/2-specific options
+ compiler_flags="$compiler_flags $arg"
+ func_append compile_command " $arg"
+ func_append finalize_command " $arg"
+ case $arg in
+ -Zlinker | -Zstack)
+ prev=xcompiler
+ ;;
+ esac
+ continue
+ else
+ # Otherwise treat like 'Some other compiler flag' below
+ func_quote_for_eval "$arg"
+ arg=$func_quote_for_eval_result
+ fi
+ ;;
+
# Some other compiler flag.
-* | +*)
func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
+ arg=$func_quote_for_eval_result
;;
*.$objext)
@@ -5886,21 +7327,21 @@ func_mode_link ()
if test -z "$pic_object" ||
test -z "$non_pic_object" ||
- test "$pic_object" = none &&
- test "$non_pic_object" = none; then
- func_fatal_error "cannot find name of object for \`$arg'"
+ test none = "$pic_object" &&
+ test none = "$non_pic_object"; then
+ func_fatal_error "cannot find name of object for '$arg'"
fi
# Extract subdirectory from the argument.
func_dirname "$arg" "/" ""
- xdir="$func_dirname_result"
+ xdir=$func_dirname_result
- if test "$pic_object" != none; then
+ test none = "$pic_object" || {
# Prepend the subdirectory the object is found in.
- pic_object="$xdir$pic_object"
+ pic_object=$xdir$pic_object
- if test "$prev" = dlfiles; then
- if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+ if test dlfiles = "$prev"; then
+ if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
func_append dlfiles " $pic_object"
prev=
continue
@@ -5911,7 +7352,7 @@ func_mode_link ()
fi
# CHECK ME: I think I busted this. -Ossama
- if test "$prev" = dlprefiles; then
+ if test dlprefiles = "$prev"; then
# Preload the old-style object.
func_append dlprefiles " $pic_object"
prev=
@@ -5919,23 +7360,23 @@ func_mode_link ()
# A PIC object.
func_append libobjs " $pic_object"
- arg="$pic_object"
- fi
+ arg=$pic_object
+ }
# Non-PIC object.
- if test "$non_pic_object" != none; then
+ if test none != "$non_pic_object"; then
# Prepend the subdirectory the object is found in.
- non_pic_object="$xdir$non_pic_object"
+ non_pic_object=$xdir$non_pic_object
# A standard non-PIC object
func_append non_pic_objects " $non_pic_object"
- if test -z "$pic_object" || test "$pic_object" = none ; then
- arg="$non_pic_object"
+ if test -z "$pic_object" || test none = "$pic_object"; then
+ arg=$non_pic_object
fi
else
# If the PIC object exists, use it instead.
# $xdir was prepended to $pic_object above.
- non_pic_object="$pic_object"
+ non_pic_object=$pic_object
func_append non_pic_objects " $non_pic_object"
fi
else
@@ -5943,7 +7384,7 @@ func_mode_link ()
if $opt_dry_run; then
# Extract subdirectory from the argument.
func_dirname "$arg" "/" ""
- xdir="$func_dirname_result"
+ xdir=$func_dirname_result
func_lo2o "$arg"
pic_object=$xdir$objdir/$func_lo2o_result
@@ -5951,7 +7392,7 @@ func_mode_link ()
func_append libobjs " $pic_object"
func_append non_pic_objects " $non_pic_object"
else
- func_fatal_error "\`$arg' is not a valid libtool object"
+ func_fatal_error "'$arg' is not a valid libtool object"
fi
fi
;;
@@ -5967,11 +7408,11 @@ func_mode_link ()
# A libtool-controlled library.
func_resolve_sysroot "$arg"
- if test "$prev" = dlfiles; then
+ if test dlfiles = "$prev"; then
# This library was specified with -dlopen.
func_append dlfiles " $func_resolve_sysroot_result"
prev=
- elif test "$prev" = dlprefiles; then
+ elif test dlprefiles = "$prev"; then
# The library was specified with -dlpreopen.
func_append dlprefiles " $func_resolve_sysroot_result"
prev=
@@ -5986,7 +7427,7 @@ func_mode_link ()
# Unknown arguments in both finalize_command and compile_command need
# to be aesthetically quoted because they are evaled later.
func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
+ arg=$func_quote_for_eval_result
;;
esac # arg
@@ -5998,9 +7439,9 @@ func_mode_link ()
done # argument parsing loop
test -n "$prev" && \
- func_fatal_help "the \`$prevarg' option requires an argument"
+ func_fatal_help "the '$prevarg' option requires an argument"
- if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+ if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then
eval arg=\"$export_dynamic_flag_spec\"
func_append compile_command " $arg"
func_append finalize_command " $arg"
@@ -6009,20 +7450,23 @@ func_mode_link ()
oldlibs=
# calculate the name of the file, without its directory
func_basename "$output"
- outputname="$func_basename_result"
- libobjs_save="$libobjs"
+ outputname=$func_basename_result
+ libobjs_save=$libobjs
if test -n "$shlibpath_var"; then
# get the directories listed in $shlibpath_var
- eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
+ eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\`
else
shlib_search_path=
fi
eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
+ # Definition is injected by LT_CONFIG during libtool generation.
+ func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH"
+
func_dirname "$output" "/" ""
- output_objdir="$func_dirname_result$objdir"
+ output_objdir=$func_dirname_result$objdir
func_to_tool_file "$output_objdir/"
tool_output_objdir=$func_to_tool_file_result
# Create the object directory.
@@ -6045,7 +7489,7 @@ func_mode_link ()
# Find all interdependent deplibs by searching for libraries
# that are linked more than once (e.g. -la -lb -la)
for deplib in $deplibs; do
- if $opt_preserve_dup_deps ; then
+ if $opt_preserve_dup_deps; then
case "$libs " in
*" $deplib "*) func_append specialdeplibs " $deplib" ;;
esac
@@ -6053,7 +7497,7 @@ func_mode_link ()
func_append libs " $deplib"
done
- if test "$linkmode" = lib; then
+ if test lib = "$linkmode"; then
libs="$predeps $libs $compiler_lib_search_path $postdeps"
# Compute libraries that are listed more than once in $predeps
@@ -6085,7 +7529,7 @@ func_mode_link ()
case $file in
*.la) ;;
*)
- func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
+ func_fatal_help "libraries can '-dlopen' only libtool libraries: $file"
;;
esac
done
@@ -6093,7 +7537,7 @@ func_mode_link ()
prog)
compile_deplibs=
finalize_deplibs=
- alldeplibs=no
+ alldeplibs=false
newdlfiles=
newdlprefiles=
passes="conv scan dlopen dlpreopen link"
@@ -6105,29 +7549,29 @@ func_mode_link ()
for pass in $passes; do
# The preopen pass in lib mode reverses $deplibs; put it back here
# so that -L comes before libs that need it for instance...
- if test "$linkmode,$pass" = "lib,link"; then
+ if test lib,link = "$linkmode,$pass"; then
## FIXME: Find the place where the list is rebuilt in the wrong
## order, and fix it there properly
tmp_deplibs=
for deplib in $deplibs; do
tmp_deplibs="$deplib $tmp_deplibs"
done
- deplibs="$tmp_deplibs"
+ deplibs=$tmp_deplibs
fi
- if test "$linkmode,$pass" = "lib,link" ||
- test "$linkmode,$pass" = "prog,scan"; then
- libs="$deplibs"
+ if test lib,link = "$linkmode,$pass" ||
+ test prog,scan = "$linkmode,$pass"; then
+ libs=$deplibs
deplibs=
fi
- if test "$linkmode" = prog; then
+ if test prog = "$linkmode"; then
case $pass in
- dlopen) libs="$dlfiles" ;;
- dlpreopen) libs="$dlprefiles" ;;
+ dlopen) libs=$dlfiles ;;
+ dlpreopen) libs=$dlprefiles ;;
link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
esac
fi
- if test "$linkmode,$pass" = "lib,dlpreopen"; then
+ if test lib,dlpreopen = "$linkmode,$pass"; then
# Collect and forward deplibs of preopened libtool libs
for lib in $dlprefiles; do
# Ignore non-libtool-libs
@@ -6148,26 +7592,26 @@ func_mode_link ()
esac
done
done
- libs="$dlprefiles"
+ libs=$dlprefiles
fi
- if test "$pass" = dlopen; then
+ if test dlopen = "$pass"; then
# Collect dlpreopened libraries
- save_deplibs="$deplibs"
+ save_deplibs=$deplibs
deplibs=
fi
for deplib in $libs; do
lib=
- found=no
+ found=false
case $deplib in
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
|-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
- if test "$linkmode,$pass" = "prog,link"; then
+ if test prog,link = "$linkmode,$pass"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
func_append compiler_flags " $deplib"
- if test "$linkmode" = lib ; then
+ if test lib = "$linkmode"; then
case "$new_inherited_linker_flags " in
*" $deplib "*) ;;
* ) func_append new_inherited_linker_flags " $deplib" ;;
@@ -6177,13 +7621,13 @@ func_mode_link ()
continue
;;
-l*)
- if test "$linkmode" != lib && test "$linkmode" != prog; then
- func_warning "\`-l' is ignored for archives/objects"
+ if test lib != "$linkmode" && test prog != "$linkmode"; then
+ func_warning "'-l' is ignored for archives/objects"
continue
fi
func_stripname '-l' '' "$deplib"
name=$func_stripname_result
- if test "$linkmode" = lib; then
+ if test lib = "$linkmode"; then
searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
else
searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
@@ -6191,31 +7635,22 @@ func_mode_link ()
for searchdir in $searchdirs; do
for search_ext in .la $std_shrext .so .a; do
# Search the libtool library
- lib="$searchdir/lib${name}${search_ext}"
+ lib=$searchdir/lib$name$search_ext
if test -f "$lib"; then
- if test "$search_ext" = ".la"; then
- found=yes
+ if test .la = "$search_ext"; then
+ found=:
else
- found=no
+ found=false
fi
break 2
fi
done
done
- if test "$found" != yes; then
- # deplib doesn't seem to be a libtool library
- if test "$linkmode,$pass" = "prog,link"; then
- compile_deplibs="$deplib $compile_deplibs"
- finalize_deplibs="$deplib $finalize_deplibs"
- else
- deplibs="$deplib $deplibs"
- test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
- fi
- continue
- else # deplib is a libtool library
+ if $found; then
+ # deplib is a libtool library
# If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
# We need to do some special things here, and not later.
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
case " $predeps $postdeps " in
*" $deplib "*)
if func_lalib_p "$lib"; then
@@ -6223,19 +7658,19 @@ func_mode_link ()
old_library=
func_source "$lib"
for l in $old_library $library_names; do
- ll="$l"
+ ll=$l
done
- if test "X$ll" = "X$old_library" ; then # only static version available
- found=no
+ if test "X$ll" = "X$old_library"; then # only static version available
+ found=false
func_dirname "$lib" "" "."
- ladir="$func_dirname_result"
+ ladir=$func_dirname_result
lib=$ladir/$old_library
- if test "$linkmode,$pass" = "prog,link"; then
+ if test prog,link = "$linkmode,$pass"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
deplibs="$deplib $deplibs"
- test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+ test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
fi
continue
fi
@@ -6244,15 +7679,25 @@ func_mode_link ()
*) ;;
esac
fi
+ else
+ # deplib doesn't seem to be a libtool library
+ if test prog,link = "$linkmode,$pass"; then
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ else
+ deplibs="$deplib $deplibs"
+ test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
+ fi
+ continue
fi
;; # -l
*.ltframework)
- if test "$linkmode,$pass" = "prog,link"; then
+ if test prog,link = "$linkmode,$pass"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
deplibs="$deplib $deplibs"
- if test "$linkmode" = lib ; then
+ if test lib = "$linkmode"; then
case "$new_inherited_linker_flags " in
*" $deplib "*) ;;
* ) func_append new_inherited_linker_flags " $deplib" ;;
@@ -6265,18 +7710,18 @@ func_mode_link ()
case $linkmode in
lib)
deplibs="$deplib $deplibs"
- test "$pass" = conv && continue
+ test conv = "$pass" && continue
newdependency_libs="$deplib $newdependency_libs"
func_stripname '-L' '' "$deplib"
func_resolve_sysroot "$func_stripname_result"
func_append newlib_search_path " $func_resolve_sysroot_result"
;;
prog)
- if test "$pass" = conv; then
+ if test conv = "$pass"; then
deplibs="$deplib $deplibs"
continue
fi
- if test "$pass" = scan; then
+ if test scan = "$pass"; then
deplibs="$deplib $deplibs"
else
compile_deplibs="$deplib $compile_deplibs"
@@ -6287,13 +7732,13 @@ func_mode_link ()
func_append newlib_search_path " $func_resolve_sysroot_result"
;;
*)
- func_warning "\`-L' is ignored for archives/objects"
+ func_warning "'-L' is ignored for archives/objects"
;;
esac # linkmode
continue
;; # -L
-R*)
- if test "$pass" = link; then
+ if test link = "$pass"; then
func_stripname '-R' '' "$deplib"
func_resolve_sysroot "$func_stripname_result"
dir=$func_resolve_sysroot_result
@@ -6311,7 +7756,7 @@ func_mode_link ()
lib=$func_resolve_sysroot_result
;;
*.$libext)
- if test "$pass" = conv; then
+ if test conv = "$pass"; then
deplibs="$deplib $deplibs"
continue
fi
@@ -6322,21 +7767,26 @@ func_mode_link ()
case " $dlpreconveniencelibs " in
*" $deplib "*) ;;
*)
- valid_a_lib=no
+ valid_a_lib=false
case $deplibs_check_method in
match_pattern*)
set dummy $deplibs_check_method; shift
match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
| $EGREP "$match_pattern_regex" > /dev/null; then
- valid_a_lib=yes
+ valid_a_lib=:
fi
;;
pass_all)
- valid_a_lib=yes
+ valid_a_lib=:
;;
esac
- if test "$valid_a_lib" != yes; then
+ if $valid_a_lib; then
+ echo
+ $ECHO "*** Warning: Linking the shared library $output against the"
+ $ECHO "*** static library $deplib is not portable!"
+ deplibs="$deplib $deplibs"
+ else
echo
$ECHO "*** Warning: Trying to link with static lib archive $deplib."
echo "*** I have the capability to make that library automatically link in when"
@@ -6344,18 +7794,13 @@ func_mode_link ()
echo "*** shared version of the library, which you do not appear to have"
echo "*** because the file extensions .$libext of this argument makes me believe"
echo "*** that it is just a static archive that I should not use here."
- else
- echo
- $ECHO "*** Warning: Linking the shared library $output against the"
- $ECHO "*** static library $deplib is not portable!"
- deplibs="$deplib $deplibs"
fi
;;
esac
continue
;;
prog)
- if test "$pass" != link; then
+ if test link != "$pass"; then
deplibs="$deplib $deplibs"
else
compile_deplibs="$deplib $compile_deplibs"
@@ -6366,10 +7811,10 @@ func_mode_link ()
esac # linkmode
;; # *.$libext
*.lo | *.$objext)
- if test "$pass" = conv; then
+ if test conv = "$pass"; then
deplibs="$deplib $deplibs"
- elif test "$linkmode" = prog; then
- if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+ elif test prog = "$linkmode"; then
+ if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then
# If there is no dlopen support or we're linking statically,
# we need to preload.
func_append newdlprefiles " $deplib"
@@ -6382,22 +7827,20 @@ func_mode_link ()
continue
;;
%DEPLIBS%)
- alldeplibs=yes
+ alldeplibs=:
continue
;;
esac # case $deplib
- if test "$found" = yes || test -f "$lib"; then :
- else
- func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
- fi
+ $found || test -f "$lib" \
+ || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'"
# Check to see that this really is a libtool archive.
func_lalib_unsafe_p "$lib" \
- || func_fatal_error "\`$lib' is not a valid libtool archive"
+ || func_fatal_error "'$lib' is not a valid libtool archive"
func_dirname "$lib" "" "."
- ladir="$func_dirname_result"
+ ladir=$func_dirname_result
dlname=
dlopen=
@@ -6427,30 +7870,30 @@ func_mode_link ()
done
fi
dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
- if test "$linkmode,$pass" = "lib,link" ||
- test "$linkmode,$pass" = "prog,scan" ||
- { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+ if test lib,link = "$linkmode,$pass" ||
+ test prog,scan = "$linkmode,$pass" ||
+ { test prog != "$linkmode" && test lib != "$linkmode"; }; then
test -n "$dlopen" && func_append dlfiles " $dlopen"
test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
fi
- if test "$pass" = conv; then
+ if test conv = "$pass"; then
# Only check for convenience libraries
deplibs="$lib $deplibs"
if test -z "$libdir"; then
if test -z "$old_library"; then
- func_fatal_error "cannot find name of link library for \`$lib'"
+ func_fatal_error "cannot find name of link library for '$lib'"
fi
# It is a libtool convenience library, so add in its objects.
func_append convenience " $ladir/$objdir/$old_library"
func_append old_convenience " $ladir/$objdir/$old_library"
- elif test "$linkmode" != prog && test "$linkmode" != lib; then
- func_fatal_error "\`$lib' is not a convenience library"
+ elif test prog != "$linkmode" && test lib != "$linkmode"; then
+ func_fatal_error "'$lib' is not a convenience library"
fi
tmp_libs=
for deplib in $dependency_libs; do
deplibs="$deplib $deplibs"
- if $opt_preserve_dup_deps ; then
+ if $opt_preserve_dup_deps; then
case "$tmp_libs " in
*" $deplib "*) func_append specialdeplibs " $deplib" ;;
esac
@@ -6464,26 +7907,26 @@ func_mode_link ()
# Get the name of the library we link against.
linklib=
if test -n "$old_library" &&
- { test "$prefer_static_libs" = yes ||
- test "$prefer_static_libs,$installed" = "built,no"; }; then
+ { test yes = "$prefer_static_libs" ||
+ test built,no = "$prefer_static_libs,$installed"; }; then
linklib=$old_library
else
for l in $old_library $library_names; do
- linklib="$l"
+ linklib=$l
done
fi
if test -z "$linklib"; then
- func_fatal_error "cannot find name of link library for \`$lib'"
+ func_fatal_error "cannot find name of link library for '$lib'"
fi
# This library was specified with -dlopen.
- if test "$pass" = dlopen; then
- if test -z "$libdir"; then
- func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
- fi
+ if test dlopen = "$pass"; then
+ test -z "$libdir" \
+ && func_fatal_error "cannot -dlopen a convenience library: '$lib'"
if test -z "$dlname" ||
- test "$dlopen_support" != yes ||
- test "$build_libtool_libs" = no; then
+ test yes != "$dlopen_support" ||
+ test no = "$build_libtool_libs"
+ then
# If there is no dlname, no dlopen support or we're linking
# statically, we need to preload. We also need to preload any
# dependent libraries so libltdl's deplib preloader doesn't
@@ -6497,40 +7940,40 @@ func_mode_link ()
# We need an absolute path.
case $ladir in
- [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) abs_ladir=$ladir ;;
*)
abs_ladir=`cd "$ladir" && pwd`
if test -z "$abs_ladir"; then
- func_warning "cannot determine absolute directory name of \`$ladir'"
+ func_warning "cannot determine absolute directory name of '$ladir'"
func_warning "passing it literally to the linker, although it might fail"
- abs_ladir="$ladir"
+ abs_ladir=$ladir
fi
;;
esac
func_basename "$lib"
- laname="$func_basename_result"
+ laname=$func_basename_result
# Find the relevant object directory and library name.
- if test "X$installed" = Xyes; then
+ if test yes = "$installed"; then
if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
- func_warning "library \`$lib' was moved."
- dir="$ladir"
- absdir="$abs_ladir"
- libdir="$abs_ladir"
+ func_warning "library '$lib' was moved."
+ dir=$ladir
+ absdir=$abs_ladir
+ libdir=$abs_ladir
else
- dir="$lt_sysroot$libdir"
- absdir="$lt_sysroot$libdir"
+ dir=$lt_sysroot$libdir
+ absdir=$lt_sysroot$libdir
fi
- test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+ test yes = "$hardcode_automatic" && avoidtemprpath=yes
else
if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
- dir="$ladir"
- absdir="$abs_ladir"
+ dir=$ladir
+ absdir=$abs_ladir
# Remove this search path later
func_append notinst_path " $abs_ladir"
else
- dir="$ladir/$objdir"
- absdir="$abs_ladir/$objdir"
+ dir=$ladir/$objdir
+ absdir=$abs_ladir/$objdir
# Remove this search path later
func_append notinst_path " $abs_ladir"
fi
@@ -6539,11 +7982,11 @@ func_mode_link ()
name=$func_stripname_result
# This library was specified with -dlpreopen.
- if test "$pass" = dlpreopen; then
- if test -z "$libdir" && test "$linkmode" = prog; then
- func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
+ if test dlpreopen = "$pass"; then
+ if test -z "$libdir" && test prog = "$linkmode"; then
+ func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'"
fi
- case "$host" in
+ case $host in
# special handling for platforms with PE-DLLs.
*cygwin* | *mingw* | *cegcc* )
# Linker will automatically link against shared library if both
@@ -6587,9 +8030,9 @@ func_mode_link ()
if test -z "$libdir"; then
# Link the convenience library
- if test "$linkmode" = lib; then
+ if test lib = "$linkmode"; then
deplibs="$dir/$old_library $deplibs"
- elif test "$linkmode,$pass" = "prog,link"; then
+ elif test prog,link = "$linkmode,$pass"; then
compile_deplibs="$dir/$old_library $compile_deplibs"
finalize_deplibs="$dir/$old_library $finalize_deplibs"
else
@@ -6599,14 +8042,14 @@ func_mode_link ()
fi
- if test "$linkmode" = prog && test "$pass" != link; then
+ if test prog = "$linkmode" && test link != "$pass"; then
func_append newlib_search_path " $ladir"
deplibs="$lib $deplibs"
- linkalldeplibs=no
- if test "$link_all_deplibs" != no || test -z "$library_names" ||
- test "$build_libtool_libs" = no; then
- linkalldeplibs=yes
+ linkalldeplibs=false
+ if test no != "$link_all_deplibs" || test -z "$library_names" ||
+ test no = "$build_libtool_libs"; then
+ linkalldeplibs=:
fi
tmp_libs=
@@ -6618,14 +8061,14 @@ func_mode_link ()
;;
esac
# Need to link against all dependency_libs?
- if test "$linkalldeplibs" = yes; then
+ if $linkalldeplibs; then
deplibs="$deplib $deplibs"
else
# Need to hardcode shared library paths
# or/and link against static libraries
newdependency_libs="$deplib $newdependency_libs"
fi
- if $opt_preserve_dup_deps ; then
+ if $opt_preserve_dup_deps; then
case "$tmp_libs " in
*" $deplib "*) func_append specialdeplibs " $deplib" ;;
esac
@@ -6635,15 +8078,15 @@ func_mode_link ()
continue
fi # $linkmode = prog...
- if test "$linkmode,$pass" = "prog,link"; then
+ if test prog,link = "$linkmode,$pass"; then
if test -n "$library_names" &&
- { { test "$prefer_static_libs" = no ||
- test "$prefer_static_libs,$installed" = "built,yes"; } ||
+ { { test no = "$prefer_static_libs" ||
+ test built,yes = "$prefer_static_libs,$installed"; } ||
test -z "$old_library"; }; then
# We need to hardcode the library path
- if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+ if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then
# Make sure the rpath contains only unique directories.
- case "$temp_rpath:" in
+ case $temp_rpath: in
*"$absdir:"*) ;;
*) func_append temp_rpath "$absdir:" ;;
esac
@@ -6672,9 +8115,9 @@ func_mode_link ()
esac
fi # $linkmode,$pass = prog,link...
- if test "$alldeplibs" = yes &&
- { test "$deplibs_check_method" = pass_all ||
- { test "$build_libtool_libs" = yes &&
+ if $alldeplibs &&
+ { test pass_all = "$deplibs_check_method" ||
+ { test yes = "$build_libtool_libs" &&
test -n "$library_names"; }; }; then
# We only need to search for static libraries
continue
@@ -6683,19 +8126,19 @@ func_mode_link ()
link_static=no # Whether the deplib will be linked statically
use_static_libs=$prefer_static_libs
- if test "$use_static_libs" = built && test "$installed" = yes; then
+ if test built = "$use_static_libs" && test yes = "$installed"; then
use_static_libs=no
fi
if test -n "$library_names" &&
- { test "$use_static_libs" = no || test -z "$old_library"; }; then
+ { test no = "$use_static_libs" || test -z "$old_library"; }; then
case $host in
- *cygwin* | *mingw* | *cegcc*)
+ *cygwin* | *mingw* | *cegcc* | *os2*)
# No point in relinking DLLs because paths are not encoded
func_append notinst_deplibs " $lib"
need_relink=no
;;
*)
- if test "$installed" = no; then
+ if test no = "$installed"; then
func_append notinst_deplibs " $lib"
need_relink=yes
fi
@@ -6705,24 +8148,24 @@ func_mode_link ()
# Warn about portability, can't link against -module's on some
# systems (darwin). Don't bleat about dlopened modules though!
- dlopenmodule=""
+ dlopenmodule=
for dlpremoduletest in $dlprefiles; do
if test "X$dlpremoduletest" = "X$lib"; then
- dlopenmodule="$dlpremoduletest"
+ dlopenmodule=$dlpremoduletest
break
fi
done
- if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
+ if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then
echo
- if test "$linkmode" = prog; then
+ if test prog = "$linkmode"; then
$ECHO "*** Warning: Linking the executable $output against the loadable module"
else
$ECHO "*** Warning: Linking the shared library $output against the loadable module"
fi
$ECHO "*** $linklib is not portable!"
fi
- if test "$linkmode" = lib &&
- test "$hardcode_into_libs" = yes; then
+ if test lib = "$linkmode" &&
+ test yes = "$hardcode_into_libs"; then
# Hardcode the library path.
# Skip directories that are in the system default run-time
# search path.
@@ -6750,43 +8193,43 @@ func_mode_link ()
# figure out the soname
set dummy $library_names
shift
- realname="$1"
+ realname=$1
shift
libname=`eval "\\$ECHO \"$libname_spec\""`
# use dlname if we got it. it's perfectly good, no?
if test -n "$dlname"; then
- soname="$dlname"
+ soname=$dlname
elif test -n "$soname_spec"; then
# bleh windows
case $host in
- *cygwin* | mingw* | *cegcc*)
+ *cygwin* | mingw* | *cegcc* | *os2*)
func_arith $current - $age
major=$func_arith_result
- versuffix="-$major"
+ versuffix=-$major
;;
esac
eval soname=\"$soname_spec\"
else
- soname="$realname"
+ soname=$realname
fi
# Make a new name for the extract_expsyms_cmds to use
- soroot="$soname"
+ soroot=$soname
func_basename "$soroot"
- soname="$func_basename_result"
+ soname=$func_basename_result
func_stripname 'lib' '.dll' "$soname"
newlib=libimp-$func_stripname_result.a
# If the library has no export list, then create one now
if test -f "$output_objdir/$soname-def"; then :
else
- func_verbose "extracting exported symbol list from \`$soname'"
+ func_verbose "extracting exported symbol list from '$soname'"
func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
fi
# Create $newlib
if test -f "$output_objdir/$newlib"; then :; else
- func_verbose "generating import library for \`$soname'"
+ func_verbose "generating import library for '$soname'"
func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
fi
# make sure the library variables are pointing to the new library
@@ -6794,58 +8237,58 @@ func_mode_link ()
linklib=$newlib
fi # test -n "$old_archive_from_expsyms_cmds"
- if test "$linkmode" = prog || test "$opt_mode" != relink; then
+ if test prog = "$linkmode" || test relink != "$opt_mode"; then
add_shlibpath=
add_dir=
add=
lib_linked=yes
case $hardcode_action in
immediate | unsupported)
- if test "$hardcode_direct" = no; then
- add="$dir/$linklib"
+ if test no = "$hardcode_direct"; then
+ add=$dir/$linklib
case $host in
- *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
- *-*-sysv4*uw2*) add_dir="-L$dir" ;;
+ *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;;
+ *-*-sysv4*uw2*) add_dir=-L$dir ;;
*-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
- *-*-unixware7*) add_dir="-L$dir" ;;
+ *-*-unixware7*) add_dir=-L$dir ;;
*-*-darwin* )
- # if the lib is a (non-dlopened) module then we can not
+ # if the lib is a (non-dlopened) module then we cannot
# link against it, someone is ignoring the earlier warnings
if /usr/bin/file -L $add 2> /dev/null |
- $GREP ": [^:]* bundle" >/dev/null ; then
+ $GREP ": [^:]* bundle" >/dev/null; then
if test "X$dlopenmodule" != "X$lib"; then
$ECHO "*** Warning: lib $linklib is a module, not a shared library"
- if test -z "$old_library" ; then
+ if test -z "$old_library"; then
echo
echo "*** And there doesn't seem to be a static archive available"
echo "*** The link will probably fail, sorry"
else
- add="$dir/$old_library"
+ add=$dir/$old_library
fi
elif test -n "$old_library"; then
- add="$dir/$old_library"
+ add=$dir/$old_library
fi
fi
esac
- elif test "$hardcode_minus_L" = no; then
+ elif test no = "$hardcode_minus_L"; then
case $host in
- *-*-sunos*) add_shlibpath="$dir" ;;
+ *-*-sunos*) add_shlibpath=$dir ;;
esac
- add_dir="-L$dir"
- add="-l$name"
- elif test "$hardcode_shlibpath_var" = no; then
- add_shlibpath="$dir"
- add="-l$name"
+ add_dir=-L$dir
+ add=-l$name
+ elif test no = "$hardcode_shlibpath_var"; then
+ add_shlibpath=$dir
+ add=-l$name
else
lib_linked=no
fi
;;
relink)
- if test "$hardcode_direct" = yes &&
- test "$hardcode_direct_absolute" = no; then
- add="$dir/$linklib"
- elif test "$hardcode_minus_L" = yes; then
- add_dir="-L$absdir"
+ if test yes = "$hardcode_direct" &&
+ test no = "$hardcode_direct_absolute"; then
+ add=$dir/$linklib
+ elif test yes = "$hardcode_minus_L"; then
+ add_dir=-L$absdir
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
case $libdir in
@@ -6854,10 +8297,10 @@ func_mode_link ()
;;
esac
fi
- add="-l$name"
- elif test "$hardcode_shlibpath_var" = yes; then
- add_shlibpath="$dir"
- add="-l$name"
+ add=-l$name
+ elif test yes = "$hardcode_shlibpath_var"; then
+ add_shlibpath=$dir
+ add=-l$name
else
lib_linked=no
fi
@@ -6865,7 +8308,7 @@ func_mode_link ()
*) lib_linked=no ;;
esac
- if test "$lib_linked" != yes; then
+ if test yes != "$lib_linked"; then
func_fatal_configuration "unsupported hardcode properties"
fi
@@ -6875,15 +8318,15 @@ func_mode_link ()
*) func_append compile_shlibpath "$add_shlibpath:" ;;
esac
fi
- if test "$linkmode" = prog; then
+ if test prog = "$linkmode"; then
test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
test -n "$add" && compile_deplibs="$add $compile_deplibs"
else
test -n "$add_dir" && deplibs="$add_dir $deplibs"
test -n "$add" && deplibs="$add $deplibs"
- if test "$hardcode_direct" != yes &&
- test "$hardcode_minus_L" != yes &&
- test "$hardcode_shlibpath_var" = yes; then
+ if test yes != "$hardcode_direct" &&
+ test yes != "$hardcode_minus_L" &&
+ test yes = "$hardcode_shlibpath_var"; then
case :$finalize_shlibpath: in
*":$libdir:"*) ;;
*) func_append finalize_shlibpath "$libdir:" ;;
@@ -6892,33 +8335,33 @@ func_mode_link ()
fi
fi
- if test "$linkmode" = prog || test "$opt_mode" = relink; then
+ if test prog = "$linkmode" || test relink = "$opt_mode"; then
add_shlibpath=
add_dir=
add=
# Finalize command for both is simple: just hardcode it.
- if test "$hardcode_direct" = yes &&
- test "$hardcode_direct_absolute" = no; then
- add="$libdir/$linklib"
- elif test "$hardcode_minus_L" = yes; then
- add_dir="-L$libdir"
- add="-l$name"
- elif test "$hardcode_shlibpath_var" = yes; then
+ if test yes = "$hardcode_direct" &&
+ test no = "$hardcode_direct_absolute"; then
+ add=$libdir/$linklib
+ elif test yes = "$hardcode_minus_L"; then
+ add_dir=-L$libdir
+ add=-l$name
+ elif test yes = "$hardcode_shlibpath_var"; then
case :$finalize_shlibpath: in
*":$libdir:"*) ;;
*) func_append finalize_shlibpath "$libdir:" ;;
esac
- add="-l$name"
- elif test "$hardcode_automatic" = yes; then
+ add=-l$name
+ elif test yes = "$hardcode_automatic"; then
if test -n "$inst_prefix_dir" &&
- test -f "$inst_prefix_dir$libdir/$linklib" ; then
- add="$inst_prefix_dir$libdir/$linklib"
+ test -f "$inst_prefix_dir$libdir/$linklib"; then
+ add=$inst_prefix_dir$libdir/$linklib
else
- add="$libdir/$linklib"
+ add=$libdir/$linklib
fi
else
# We cannot seem to hardcode it, guess we'll fake it.
- add_dir="-L$libdir"
+ add_dir=-L$libdir
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
case $libdir in
@@ -6927,10 +8370,10 @@ func_mode_link ()
;;
esac
fi
- add="-l$name"
+ add=-l$name
fi
- if test "$linkmode" = prog; then
+ if test prog = "$linkmode"; then
test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
else
@@ -6938,43 +8381,43 @@ func_mode_link ()
test -n "$add" && deplibs="$add $deplibs"
fi
fi
- elif test "$linkmode" = prog; then
+ elif test prog = "$linkmode"; then
# Here we assume that one of hardcode_direct or hardcode_minus_L
# is not unsupported. This is valid on all known static and
# shared platforms.
- if test "$hardcode_direct" != unsupported; then
- test -n "$old_library" && linklib="$old_library"
+ if test unsupported != "$hardcode_direct"; then
+ test -n "$old_library" && linklib=$old_library
compile_deplibs="$dir/$linklib $compile_deplibs"
finalize_deplibs="$dir/$linklib $finalize_deplibs"
else
compile_deplibs="-l$name -L$dir $compile_deplibs"
finalize_deplibs="-l$name -L$dir $finalize_deplibs"
fi
- elif test "$build_libtool_libs" = yes; then
+ elif test yes = "$build_libtool_libs"; then
# Not a shared library
- if test "$deplibs_check_method" != pass_all; then
+ if test pass_all != "$deplibs_check_method"; then
# We're trying link a shared library against a static one
# but the system doesn't support it.
# Just print a warning and add the library to dependency_libs so
# that the program can be linked against the static library.
echo
- $ECHO "*** Warning: This system can not link to static lib archive $lib."
+ $ECHO "*** Warning: This system cannot link to static lib archive $lib."
echo "*** I have the capability to make that library automatically link in when"
echo "*** you link to this library. But I can only do this if you have a"
echo "*** shared version of the library, which you do not appear to have."
- if test "$module" = yes; then
+ if test yes = "$module"; then
echo "*** But as you try to build a module library, libtool will still create "
echo "*** a static module, that should work as long as the dlopening application"
echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
if test -z "$global_symbol_pipe"; then
echo
echo "*** However, this would only work if libtool was able to extract symbol"
- echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+ echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
echo "*** not find such a program. So, this module is probably useless."
- echo "*** \`nm' from GNU binutils and a full rebuild may help."
+ echo "*** 'nm' from GNU binutils and a full rebuild may help."
fi
- if test "$build_old_libs" = no; then
+ if test no = "$build_old_libs"; then
build_libtool_libs=module
build_old_libs=yes
else
@@ -6987,11 +8430,11 @@ func_mode_link ()
fi
fi # link shared/static library?
- if test "$linkmode" = lib; then
+ if test lib = "$linkmode"; then
if test -n "$dependency_libs" &&
- { test "$hardcode_into_libs" != yes ||
- test "$build_old_libs" = yes ||
- test "$link_static" = yes; }; then
+ { test yes != "$hardcode_into_libs" ||
+ test yes = "$build_old_libs" ||
+ test yes = "$link_static"; }; then
# Extract -R from dependency_libs
temp_deplibs=
for libdir in $dependency_libs; do
@@ -7005,12 +8448,12 @@ func_mode_link ()
*) func_append temp_deplibs " $libdir";;
esac
done
- dependency_libs="$temp_deplibs"
+ dependency_libs=$temp_deplibs
fi
func_append newlib_search_path " $absdir"
# Link against this library
- test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+ test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
# ... and its dependency_libs
tmp_libs=
for deplib in $dependency_libs; do
@@ -7020,7 +8463,7 @@ func_mode_link ()
func_resolve_sysroot "$func_stripname_result";;
*) func_resolve_sysroot "$deplib" ;;
esac
- if $opt_preserve_dup_deps ; then
+ if $opt_preserve_dup_deps; then
case "$tmp_libs " in
*" $func_resolve_sysroot_result "*)
func_append specialdeplibs " $func_resolve_sysroot_result" ;;
@@ -7029,12 +8472,12 @@ func_mode_link ()
func_append tmp_libs " $func_resolve_sysroot_result"
done
- if test "$link_all_deplibs" != no; then
+ if test no != "$link_all_deplibs"; then
# Add the search paths of all dependency libraries
for deplib in $dependency_libs; do
path=
case $deplib in
- -L*) path="$deplib" ;;
+ -L*) path=$deplib ;;
*.la)
func_resolve_sysroot "$deplib"
deplib=$func_resolve_sysroot_result
@@ -7042,12 +8485,12 @@ func_mode_link ()
dir=$func_dirname_result
# We need an absolute path.
case $dir in
- [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) absdir=$dir ;;
*)
absdir=`cd "$dir" && pwd`
if test -z "$absdir"; then
- func_warning "cannot determine absolute directory name of \`$dir'"
- absdir="$dir"
+ func_warning "cannot determine absolute directory name of '$dir'"
+ absdir=$dir
fi
;;
esac
@@ -7055,35 +8498,35 @@ func_mode_link ()
case $host in
*-*-darwin*)
depdepl=
- eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
- if test -n "$deplibrary_names" ; then
- for tmp in $deplibrary_names ; do
+ eval deplibrary_names=`$SED -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+ if test -n "$deplibrary_names"; then
+ for tmp in $deplibrary_names; do
depdepl=$tmp
done
- if test -f "$absdir/$objdir/$depdepl" ; then
- depdepl="$absdir/$objdir/$depdepl"
- darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+ if test -f "$absdir/$objdir/$depdepl"; then
+ depdepl=$absdir/$objdir/$depdepl
+ darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
if test -z "$darwin_install_name"; then
- darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+ darwin_install_name=`$OTOOL64 -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
fi
- func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
- func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
+ func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl"
+ func_append linker_flags " -dylib_file $darwin_install_name:$depdepl"
path=
fi
fi
;;
*)
- path="-L$absdir/$objdir"
+ path=-L$absdir/$objdir
;;
esac
else
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
test -z "$libdir" && \
- func_fatal_error "\`$deplib' is not a valid libtool archive"
+ func_fatal_error "'$deplib' is not a valid libtool archive"
test "$absdir" != "$libdir" && \
- func_warning "\`$deplib' seems to be moved"
+ func_warning "'$deplib' seems to be moved"
- path="-L$absdir"
+ path=-L$absdir
fi
;;
esac
@@ -7095,23 +8538,23 @@ func_mode_link ()
fi # link_all_deplibs != no
fi # linkmode = lib
done # for deplib in $libs
- if test "$pass" = link; then
- if test "$linkmode" = "prog"; then
+ if test link = "$pass"; then
+ if test prog = "$linkmode"; then
compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
else
compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
fi
fi
- dependency_libs="$newdependency_libs"
- if test "$pass" = dlpreopen; then
+ dependency_libs=$newdependency_libs
+ if test dlpreopen = "$pass"; then
# Link the dlpreopened libraries before other libraries
for deplib in $save_deplibs; do
deplibs="$deplib $deplibs"
done
fi
- if test "$pass" != dlopen; then
- if test "$pass" != conv; then
+ if test dlopen != "$pass"; then
+ test conv = "$pass" || {
# Make sure lib_search_path contains only unique directories.
lib_search_path=
for dir in $newlib_search_path; do
@@ -7121,12 +8564,12 @@ func_mode_link ()
esac
done
newlib_search_path=
- fi
+ }
- if test "$linkmode,$pass" != "prog,link"; then
- vars="deplibs"
- else
+ if test prog,link = "$linkmode,$pass"; then
vars="compile_deplibs finalize_deplibs"
+ else
+ vars=deplibs
fi
for var in $vars dependency_libs; do
# Add libraries to $var in reverse order
@@ -7184,62 +8627,93 @@ func_mode_link ()
eval $var=\"$tmp_libs\"
done # for var
fi
+
+ # Add Sun CC postdeps if required:
+ test CXX = "$tagname" && {
+ case $host_os in
+ linux*)
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*) # Sun C++ 5.9
+ func_suncc_cstd_abi
+
+ if test no != "$suncc_use_cstd_abi"; then
+ func_append postdeps ' -library=Cstd -library=Crun'
+ fi
+ ;;
+ esac
+ ;;
+
+ solaris*)
+ func_cc_basename "$CC"
+ case $func_cc_basename_result in
+ CC* | sunCC*)
+ func_suncc_cstd_abi
+
+ if test no != "$suncc_use_cstd_abi"; then
+ func_append postdeps ' -library=Cstd -library=Crun'
+ fi
+ ;;
+ esac
+ ;;
+ esac
+ }
+
# Last step: remove runtime libs from dependency_libs
# (they stay in deplibs)
tmp_libs=
- for i in $dependency_libs ; do
+ for i in $dependency_libs; do
case " $predeps $postdeps $compiler_lib_search_path " in
*" $i "*)
- i=""
+ i=
;;
esac
- if test -n "$i" ; then
+ if test -n "$i"; then
func_append tmp_libs " $i"
fi
done
dependency_libs=$tmp_libs
done # for pass
- if test "$linkmode" = prog; then
- dlfiles="$newdlfiles"
+ if test prog = "$linkmode"; then
+ dlfiles=$newdlfiles
fi
- if test "$linkmode" = prog || test "$linkmode" = lib; then
- dlprefiles="$newdlprefiles"
+ if test prog = "$linkmode" || test lib = "$linkmode"; then
+ dlprefiles=$newdlprefiles
fi
case $linkmode in
oldlib)
- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
- func_warning "\`-dlopen' is ignored for archives"
+ if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+ func_warning "'-dlopen' is ignored for archives"
fi
case " $deplibs" in
*\ -l* | *\ -L*)
- func_warning "\`-l' and \`-L' are ignored for archives" ;;
+ func_warning "'-l' and '-L' are ignored for archives" ;;
esac
test -n "$rpath" && \
- func_warning "\`-rpath' is ignored for archives"
+ func_warning "'-rpath' is ignored for archives"
test -n "$xrpath" && \
- func_warning "\`-R' is ignored for archives"
+ func_warning "'-R' is ignored for archives"
test -n "$vinfo" && \
- func_warning "\`-version-info/-version-number' is ignored for archives"
+ func_warning "'-version-info/-version-number' is ignored for archives"
test -n "$release" && \
- func_warning "\`-release' is ignored for archives"
+ func_warning "'-release' is ignored for archives"
test -n "$export_symbols$export_symbols_regex" && \
- func_warning "\`-export-symbols' is ignored for archives"
+ func_warning "'-export-symbols' is ignored for archives"
# Now set the variables for building old libraries.
build_libtool_libs=no
- oldlibs="$output"
+ oldlibs=$output
func_append objs "$old_deplibs"
;;
lib)
- # Make sure we only generate libraries of the form `libNAME.la'.
+ # Make sure we only generate libraries of the form 'libNAME.la'.
case $outputname in
lib*)
func_stripname 'lib' '.la' "$outputname"
@@ -7248,10 +8722,10 @@ func_mode_link ()
eval libname=\"$libname_spec\"
;;
*)
- test "$module" = no && \
- func_fatal_help "libtool library \`$output' must begin with \`lib'"
+ test no = "$module" \
+ && func_fatal_help "libtool library '$output' must begin with 'lib'"
- if test "$need_lib_prefix" != no; then
+ if test no != "$need_lib_prefix"; then
# Add the "lib" prefix for modules if required
func_stripname '' '.la' "$outputname"
name=$func_stripname_result
@@ -7265,8 +8739,8 @@ func_mode_link ()
esac
if test -n "$objs"; then
- if test "$deplibs_check_method" != pass_all; then
- func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
+ if test pass_all != "$deplibs_check_method"; then
+ func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs"
else
echo
$ECHO "*** Warning: Linking the shared library $output against the non-libtool"
@@ -7275,21 +8749,21 @@ func_mode_link ()
fi
fi
- test "$dlself" != no && \
- func_warning "\`-dlopen self' is ignored for libtool libraries"
+ test no = "$dlself" \
+ || func_warning "'-dlopen self' is ignored for libtool libraries"
set dummy $rpath
shift
- test "$#" -gt 1 && \
- func_warning "ignoring multiple \`-rpath's for a libtool library"
+ test 1 -lt "$#" \
+ && func_warning "ignoring multiple '-rpath's for a libtool library"
- install_libdir="$1"
+ install_libdir=$1
oldlibs=
if test -z "$rpath"; then
- if test "$build_libtool_libs" = yes; then
+ if test yes = "$build_libtool_libs"; then
# Building a libtool convenience library.
- # Some compilers have problems with a `.al' extension so
+ # Some compilers have problems with a '.al' extension so
# convenience libraries should have the same extension an
# archive normally would.
oldlibs="$output_objdir/$libname.$libext $oldlibs"
@@ -7298,20 +8772,20 @@ func_mode_link ()
fi
test -n "$vinfo" && \
- func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
+ func_warning "'-version-info/-version-number' is ignored for convenience libraries"
test -n "$release" && \
- func_warning "\`-release' is ignored for convenience libraries"
+ func_warning "'-release' is ignored for convenience libraries"
else
# Parse the version information argument.
- save_ifs="$IFS"; IFS=':'
+ save_ifs=$IFS; IFS=:
set dummy $vinfo 0 0 0
shift
- IFS="$save_ifs"
+ IFS=$save_ifs
test -n "$7" && \
- func_fatal_help "too many parameters to \`-version-info'"
+ func_fatal_help "too many parameters to '-version-info'"
# convert absolute version numbers to libtool ages
# this retains compatibility with .la files and attempts
@@ -7319,42 +8793,42 @@ func_mode_link ()
case $vinfo_number in
yes)
- number_major="$1"
- number_minor="$2"
- number_revision="$3"
+ number_major=$1
+ number_minor=$2
+ number_revision=$3
#
# There are really only two kinds -- those that
# use the current revision as the major version
# and those that subtract age and use age as
# a minor version. But, then there is irix
- # which has an extra 1 added just for fun
+ # that has an extra 1 added just for fun
#
case $version_type in
# correct linux to gnu/linux during the next big refactor
- darwin|linux|osf|windows|none)
+ darwin|freebsd-elf|linux|osf|windows|none)
func_arith $number_major + $number_minor
current=$func_arith_result
- age="$number_minor"
- revision="$number_revision"
+ age=$number_minor
+ revision=$number_revision
;;
- freebsd-aout|freebsd-elf|qnx|sunos)
- current="$number_major"
- revision="$number_minor"
- age="0"
+ freebsd-aout|qnx|sunos)
+ current=$number_major
+ revision=$number_minor
+ age=0
;;
irix|nonstopux)
func_arith $number_major + $number_minor
current=$func_arith_result
- age="$number_minor"
- revision="$number_minor"
+ age=$number_minor
+ revision=$number_minor
lt_irix_increment=no
;;
esac
;;
no)
- current="$1"
- revision="$2"
- age="$3"
+ current=$1
+ revision=$2
+ age=$3
;;
esac
@@ -7362,30 +8836,30 @@ func_mode_link ()
case $current in
0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
*)
- func_error "CURRENT \`$current' must be a nonnegative integer"
- func_fatal_error "\`$vinfo' is not valid version information"
+ func_error "CURRENT '$current' must be a nonnegative integer"
+ func_fatal_error "'$vinfo' is not valid version information"
;;
esac
case $revision in
0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
*)
- func_error "REVISION \`$revision' must be a nonnegative integer"
- func_fatal_error "\`$vinfo' is not valid version information"
+ func_error "REVISION '$revision' must be a nonnegative integer"
+ func_fatal_error "'$vinfo' is not valid version information"
;;
esac
case $age in
0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
*)
- func_error "AGE \`$age' must be a nonnegative integer"
- func_fatal_error "\`$vinfo' is not valid version information"
+ func_error "AGE '$age' must be a nonnegative integer"
+ func_fatal_error "'$vinfo' is not valid version information"
;;
esac
if test "$age" -gt "$current"; then
- func_error "AGE \`$age' is greater than the current interface number \`$current'"
- func_fatal_error "\`$vinfo' is not valid version information"
+ func_error "AGE '$age' is greater than the current interface number '$current'"
+ func_fatal_error "'$vinfo' is not valid version information"
fi
# Calculate the version variables.
@@ -7400,26 +8874,36 @@ func_mode_link ()
# verstring for coding it into the library header
func_arith $current - $age
major=.$func_arith_result
- versuffix="$major.$age.$revision"
+ versuffix=$major.$age.$revision
# Darwin ld doesn't like 0 for these options...
func_arith $current + 1
minor_current=$func_arith_result
- xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+ xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+ # On Darwin other compilers
+ case $CC in
+ nagfor*)
+ verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
+ ;;
+ *)
+ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+ ;;
+ esac
;;
freebsd-aout)
- major=".$current"
- versuffix=".$current.$revision";
+ major=.$current
+ versuffix=.$current.$revision
;;
freebsd-elf)
- major=".$current"
- versuffix=".$current"
+ func_arith $current - $age
+ major=.$func_arith_result
+ versuffix=$major.$age.$revision
;;
irix | nonstopux)
- if test "X$lt_irix_increment" = "Xno"; then
+ if test no = "$lt_irix_increment"; then
func_arith $current - $age
else
func_arith $current - $age + 1
@@ -7430,69 +8914,74 @@ func_mode_link ()
nonstopux) verstring_prefix=nonstopux ;;
*) verstring_prefix=sgi ;;
esac
- verstring="$verstring_prefix$major.$revision"
+ verstring=$verstring_prefix$major.$revision
# Add in all the interfaces that we are compatible with.
loop=$revision
- while test "$loop" -ne 0; do
+ while test 0 -ne "$loop"; do
func_arith $revision - $loop
iface=$func_arith_result
func_arith $loop - 1
loop=$func_arith_result
- verstring="$verstring_prefix$major.$iface:$verstring"
+ verstring=$verstring_prefix$major.$iface:$verstring
done
- # Before this point, $major must not contain `.'.
+ # Before this point, $major must not contain '.'.
major=.$major
- versuffix="$major.$revision"
+ versuffix=$major.$revision
;;
linux) # correct to gnu/linux during the next big refactor
func_arith $current - $age
major=.$func_arith_result
- versuffix="$major.$age.$revision"
+ versuffix=$major.$age.$revision
;;
osf)
func_arith $current - $age
major=.$func_arith_result
- versuffix=".$current.$age.$revision"
- verstring="$current.$age.$revision"
+ versuffix=.$current.$age.$revision
+ verstring=$current.$age.$revision
# Add in all the interfaces that we are compatible with.
loop=$age
- while test "$loop" -ne 0; do
+ while test 0 -ne "$loop"; do
func_arith $current - $loop
iface=$func_arith_result
func_arith $loop - 1
loop=$func_arith_result
- verstring="$verstring:${iface}.0"
+ verstring=$verstring:$iface.0
done
# Make executables depend on our current version.
- func_append verstring ":${current}.0"
+ func_append verstring ":$current.0"
;;
qnx)
- major=".$current"
- versuffix=".$current"
+ major=.$current
+ versuffix=.$current
+ ;;
+
+ sco)
+ major=.$current
+ versuffix=.$current
;;
sunos)
- major=".$current"
- versuffix=".$current.$revision"
+ major=.$current
+ versuffix=.$current.$revision
;;
windows)
# Use '-' rather than '.', since we only want one
- # extension on DOS 8.3 filesystems.
+ # extension on DOS 8.3 file systems.
func_arith $current - $age
major=$func_arith_result
- versuffix="-$major"
+ versuffix=-$major
;;
*)
- func_fatal_configuration "unknown library version type \`$version_type'"
+ func_fatal_configuration "unknown library version type '$version_type'"
;;
esac
@@ -7506,42 +8995,45 @@ func_mode_link ()
verstring=
;;
*)
- verstring="0.0"
+ verstring=0.0
;;
esac
- if test "$need_version" = no; then
+ if test no = "$need_version"; then
versuffix=
else
- versuffix=".0.0"
+ versuffix=.0.0
fi
fi
# Remove version info from name if versioning should be avoided
- if test "$avoid_version" = yes && test "$need_version" = no; then
+ if test yes,no = "$avoid_version,$need_version"; then
major=
versuffix=
- verstring=""
+ verstring=
fi
# Check to see if the archive will have undefined symbols.
- if test "$allow_undefined" = yes; then
- if test "$allow_undefined_flag" = unsupported; then
- func_warning "undefined symbols not allowed in $host shared libraries"
- build_libtool_libs=no
- build_old_libs=yes
+ if test yes = "$allow_undefined"; then
+ if test unsupported = "$allow_undefined_flag"; then
+ if test yes = "$build_old_libs"; then
+ func_warning "undefined symbols not allowed in $host shared libraries; building static only"
+ build_libtool_libs=no
+ else
+ func_fatal_error "can't build $host shared library unless -no-undefined is specified"
+ fi
fi
else
# Don't allow undefined symbols.
- allow_undefined_flag="$no_undefined_flag"
+ allow_undefined_flag=$no_undefined_flag
fi
fi
- func_generate_dlsyms "$libname" "$libname" "yes"
+ func_generate_dlsyms "$libname" "$libname" :
func_append libobjs " $symfileobj"
- test "X$libobjs" = "X " && libobjs=
+ test " " = "$libobjs" && libobjs=
- if test "$opt_mode" != relink; then
+ if test relink != "$opt_mode"; then
# Remove our outputs, but don't remove object files since they
# may have been created when compiling PIC objects.
removelist=
@@ -7550,8 +9042,8 @@ func_mode_link ()
case $p in
*.$objext | *.gcno)
;;
- $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
- if test "X$precious_files_regex" != "X"; then
+ $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*)
+ if test -n "$precious_files_regex"; then
if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
then
continue
@@ -7567,11 +9059,11 @@ func_mode_link ()
fi
# Now set the variables for building old libraries.
- if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
+ if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then
func_append oldlibs " $output_objdir/$libname.$libext"
# Transform .lo files to .o files.
- oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
+ oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP`
fi
# Eliminate all temporary directories.
@@ -7592,13 +9084,13 @@ func_mode_link ()
*) func_append finalize_rpath " $libdir" ;;
esac
done
- if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+ if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then
dependency_libs="$temp_xrpath $dependency_libs"
fi
fi
# Make sure dlfiles contains only unique files that won't be dlpreopened
- old_dlfiles="$dlfiles"
+ old_dlfiles=$dlfiles
dlfiles=
for lib in $old_dlfiles; do
case " $dlprefiles $dlfiles " in
@@ -7608,7 +9100,7 @@ func_mode_link ()
done
# Make sure dlprefiles contains only unique files
- old_dlprefiles="$dlprefiles"
+ old_dlprefiles=$dlprefiles
dlprefiles=
for lib in $old_dlprefiles; do
case "$dlprefiles " in
@@ -7617,7 +9109,7 @@ func_mode_link ()
esac
done
- if test "$build_libtool_libs" = yes; then
+ if test yes = "$build_libtool_libs"; then
if test -n "$rpath"; then
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
@@ -7641,7 +9133,7 @@ func_mode_link ()
;;
*)
# Add libc to deplibs on all other systems if necessary.
- if test "$build_libtool_need_lc" = "yes"; then
+ if test yes = "$build_libtool_need_lc"; then
func_append deplibs " -lc"
fi
;;
@@ -7657,9 +9149,9 @@ func_mode_link ()
# I'm not sure if I'm treating the release correctly. I think
# release should show up in the -l (ie -lgmp5) so we don't want to
# add it in twice. Is that correct?
- release=""
- versuffix=""
- major=""
+ release=
+ versuffix=
+ major=
newdeplibs=
droppeddeps=no
case $deplibs_check_method in
@@ -7688,20 +9180,20 @@ EOF
-l*)
func_stripname -l '' "$i"
name=$func_stripname_result
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
case " $predeps $postdeps " in
*" $i "*)
func_append newdeplibs " $i"
- i=""
+ i=
;;
esac
fi
- if test -n "$i" ; then
+ if test -n "$i"; then
libname=`eval "\\$ECHO \"$libname_spec\""`
deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
set dummy $deplib_matches; shift
deplib_match=$1
- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
func_append newdeplibs " $i"
else
droppeddeps=yes
@@ -7731,20 +9223,20 @@ EOF
$opt_dry_run || $RM conftest
if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
ldd_output=`ldd conftest`
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
case " $predeps $postdeps " in
*" $i "*)
func_append newdeplibs " $i"
- i=""
+ i=
;;
esac
fi
- if test -n "$i" ; then
+ if test -n "$i"; then
libname=`eval "\\$ECHO \"$libname_spec\""`
deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
set dummy $deplib_matches; shift
deplib_match=$1
- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
func_append newdeplibs " $i"
else
droppeddeps=yes
@@ -7781,24 +9273,24 @@ EOF
-l*)
func_stripname -l '' "$a_deplib"
name=$func_stripname_result
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
case " $predeps $postdeps " in
*" $a_deplib "*)
func_append newdeplibs " $a_deplib"
- a_deplib=""
+ a_deplib=
;;
esac
fi
- if test -n "$a_deplib" ; then
+ if test -n "$a_deplib"; then
libname=`eval "\\$ECHO \"$libname_spec\""`
if test -n "$file_magic_glob"; then
libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
else
libnameglob=$libname
fi
- test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
+ test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob`
for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
- if test "$want_nocaseglob" = yes; then
+ if test yes = "$want_nocaseglob"; then
shopt -s nocaseglob
potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
$nocaseglob
@@ -7816,25 +9308,25 @@ EOF
# We might still enter an endless loop, since a link
# loop can be closed while we follow links,
# but so what?
- potlib="$potent_lib"
+ potlib=$potent_lib
while test -h "$potlib" 2>/dev/null; do
- potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
+ potliblink=`ls -ld $potlib | $SED 's/.* -> //'`
case $potliblink in
- [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
- *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
+ [\\/]* | [A-Za-z]:[\\/]*) potlib=$potliblink;;
+ *) potlib=`$ECHO "$potlib" | $SED 's|[^/]*$||'`"$potliblink";;
esac
done
if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
$SED -e 10q |
$EGREP "$file_magic_regex" > /dev/null; then
func_append newdeplibs " $a_deplib"
- a_deplib=""
+ a_deplib=
break 2
fi
done
done
fi
- if test -n "$a_deplib" ; then
+ if test -n "$a_deplib"; then
droppeddeps=yes
echo
$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
@@ -7842,7 +9334,7 @@ EOF
echo "*** you link to this library. But I can only do this if you have a"
echo "*** shared version of the library, which you do not appear to have"
echo "*** because I did check the linker path looking for a file starting"
- if test -z "$potlib" ; then
+ if test -z "$potlib"; then
$ECHO "*** with $libname but no candidates were found. (...for file magic test)"
else
$ECHO "*** with $libname and none of the candidates passed a file format test"
@@ -7865,30 +9357,30 @@ EOF
-l*)
func_stripname -l '' "$a_deplib"
name=$func_stripname_result
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
case " $predeps $postdeps " in
*" $a_deplib "*)
func_append newdeplibs " $a_deplib"
- a_deplib=""
+ a_deplib=
;;
esac
fi
- if test -n "$a_deplib" ; then
+ if test -n "$a_deplib"; then
libname=`eval "\\$ECHO \"$libname_spec\""`
for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
for potent_lib in $potential_libs; do
- potlib="$potent_lib" # see symlink-check above in file_magic test
+ potlib=$potent_lib # see symlink-check above in file_magic test
if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
$EGREP "$match_pattern_regex" > /dev/null; then
func_append newdeplibs " $a_deplib"
- a_deplib=""
+ a_deplib=
break 2
fi
done
done
fi
- if test -n "$a_deplib" ; then
+ if test -n "$a_deplib"; then
droppeddeps=yes
echo
$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
@@ -7896,7 +9388,7 @@ EOF
echo "*** you link to this library. But I can only do this if you have a"
echo "*** shared version of the library, which you do not appear to have"
echo "*** because I did check the linker path looking for a file starting"
- if test -z "$potlib" ; then
+ if test -z "$potlib"; then
$ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
else
$ECHO "*** with $libname and none of the candidates passed a file format test"
@@ -7912,18 +9404,18 @@ EOF
done # Gone through all deplibs.
;;
none | unknown | *)
- newdeplibs=""
+ newdeplibs=
tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- for i in $predeps $postdeps ; do
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+ for i in $predeps $postdeps; do
# can't use Xsed below, because $i might contain '/'
- tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
+ tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s|$i||"`
done
fi
case $tmp_deplibs in
*[!\ \ ]*)
echo
- if test "X$deplibs_check_method" = "Xnone"; then
+ if test none = "$deplibs_check_method"; then
echo "*** Warning: inter-library dependencies are not supported in this platform."
else
echo "*** Warning: inter-library dependencies are not known to be supported."
@@ -7947,8 +9439,8 @@ EOF
;;
esac
- if test "$droppeddeps" = yes; then
- if test "$module" = yes; then
+ if test yes = "$droppeddeps"; then
+ if test yes = "$module"; then
echo
echo "*** Warning: libtool could not satisfy all declared inter-library"
$ECHO "*** dependencies of module $libname. Therefore, libtool will create"
@@ -7957,12 +9449,12 @@ EOF
if test -z "$global_symbol_pipe"; then
echo
echo "*** However, this would only work if libtool was able to extract symbol"
- echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+ echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
echo "*** not find such a program. So, this module is probably useless."
- echo "*** \`nm' from GNU binutils and a full rebuild may help."
+ echo "*** 'nm' from GNU binutils and a full rebuild may help."
fi
- if test "$build_old_libs" = no; then
- oldlibs="$output_objdir/$libname.$libext"
+ if test no = "$build_old_libs"; then
+ oldlibs=$output_objdir/$libname.$libext
build_libtool_libs=module
build_old_libs=yes
else
@@ -7973,14 +9465,14 @@ EOF
echo "*** automatically added whenever a program is linked with this library"
echo "*** or is declared to -dlopen it."
- if test "$allow_undefined" = no; then
+ if test no = "$allow_undefined"; then
echo
echo "*** Since this library must not contain undefined symbols,"
echo "*** because either the platform does not support them or"
echo "*** it was explicitly requested with -no-undefined,"
echo "*** libtool will only create a static version of it."
- if test "$build_old_libs" = no; then
- oldlibs="$output_objdir/$libname.$libext"
+ if test no = "$build_old_libs"; then
+ oldlibs=$output_objdir/$libname.$libext
build_libtool_libs=module
build_old_libs=yes
else
@@ -8026,7 +9518,7 @@ EOF
*) func_append new_libs " $deplib" ;;
esac
done
- deplibs="$new_libs"
+ deplibs=$new_libs
# All the library-specific variables (install_libdir is set above).
library_names=
@@ -8034,25 +9526,25 @@ EOF
dlname=
# Test again, we may have decided not to build it any more
- if test "$build_libtool_libs" = yes; then
- # Remove ${wl} instances when linking with ld.
+ if test yes = "$build_libtool_libs"; then
+ # Remove $wl instances when linking with ld.
# FIXME: should test the right _cmds variable.
case $archive_cmds in
*\$LD\ *) wl= ;;
esac
- if test "$hardcode_into_libs" = yes; then
+ if test yes = "$hardcode_into_libs"; then
# Hardcode the library paths
hardcode_libdirs=
dep_rpath=
- rpath="$finalize_rpath"
- test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
+ rpath=$finalize_rpath
+ test relink = "$opt_mode" || rpath=$compile_rpath$rpath
for libdir in $rpath; do
if test -n "$hardcode_libdir_flag_spec"; then
if test -n "$hardcode_libdir_separator"; then
func_replace_sysroot "$libdir"
libdir=$func_replace_sysroot_result
if test -z "$hardcode_libdirs"; then
- hardcode_libdirs="$libdir"
+ hardcode_libdirs=$libdir
else
# Just accumulate the unique libdirs.
case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
@@ -8077,7 +9569,7 @@ EOF
# Substitute the hardcoded libdirs into the rpath.
if test -n "$hardcode_libdir_separator" &&
test -n "$hardcode_libdirs"; then
- libdir="$hardcode_libdirs"
+ libdir=$hardcode_libdirs
eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
fi
if test -n "$runpath_var" && test -n "$perm_rpath"; then
@@ -8091,8 +9583,8 @@ EOF
test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
fi
- shlibpath="$finalize_shlibpath"
- test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+ shlibpath=$finalize_shlibpath
+ test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath
if test -n "$shlibpath"; then
eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
fi
@@ -8102,19 +9594,19 @@ EOF
eval library_names=\"$library_names_spec\"
set dummy $library_names
shift
- realname="$1"
+ realname=$1
shift
if test -n "$soname_spec"; then
eval soname=\"$soname_spec\"
else
- soname="$realname"
+ soname=$realname
fi
if test -z "$dlname"; then
dlname=$soname
fi
- lib="$output_objdir/$realname"
+ lib=$output_objdir/$realname
linknames=
for link
do
@@ -8128,7 +9620,7 @@ EOF
delfiles=
if test -n "$export_symbols" && test -n "$include_expsyms"; then
$opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
- export_symbols="$output_objdir/$libname.uexp"
+ export_symbols=$output_objdir/$libname.uexp
func_append delfiles " $export_symbols"
fi
@@ -8137,31 +9629,31 @@ EOF
cygwin* | mingw* | cegcc*)
if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
# exporting using user supplied symfile
- if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
+ func_dll_def_p "$export_symbols" || {
# and it's NOT already a .def file. Must figure out
# which of the given symbols are data symbols and tag
# them as such. So, trigger use of export_symbols_cmds.
# export_symbols gets reassigned inside the "prepare
# the list of exported symbols" if statement, so the
# include_expsyms logic still works.
- orig_export_symbols="$export_symbols"
+ orig_export_symbols=$export_symbols
export_symbols=
always_export_symbols=yes
- fi
+ }
fi
;;
esac
# Prepare the list of exported symbols
if test -z "$export_symbols"; then
- if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
- func_verbose "generating symbol list for \`$libname.la'"
- export_symbols="$output_objdir/$libname.exp"
+ if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then
+ func_verbose "generating symbol list for '$libname.la'"
+ export_symbols=$output_objdir/$libname.exp
$opt_dry_run || $RM $export_symbols
cmds=$export_symbols_cmds
- save_ifs="$IFS"; IFS='~'
+ save_ifs=$IFS; IFS='~'
for cmd1 in $cmds; do
- IFS="$save_ifs"
+ IFS=$save_ifs
# Take the normal branch if the nm_file_list_spec branch
# doesn't work or if tool conversion is not needed.
case $nm_file_list_spec~$to_tool_file_cmd in
@@ -8175,7 +9667,7 @@ EOF
try_normal_branch=no
;;
esac
- if test "$try_normal_branch" = yes \
+ if test yes = "$try_normal_branch" \
&& { test "$len" -lt "$max_cmd_len" \
|| test "$max_cmd_len" -le -1; }
then
@@ -8186,7 +9678,7 @@ EOF
output_la=$func_basename_result
save_libobjs=$libobjs
save_output=$output
- output=${output_objdir}/${output_la}.nm
+ output=$output_objdir/$output_la.nm
func_to_tool_file "$output"
libobjs=$nm_file_list_spec$func_to_tool_file_result
func_append delfiles " $output"
@@ -8209,8 +9701,8 @@ EOF
break
fi
done
- IFS="$save_ifs"
- if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
+ IFS=$save_ifs
+ if test -n "$export_symbols_regex" && test : != "$skipped_export"; then
func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
fi
@@ -8218,16 +9710,16 @@ EOF
fi
if test -n "$export_symbols" && test -n "$include_expsyms"; then
- tmp_export_symbols="$export_symbols"
- test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+ tmp_export_symbols=$export_symbols
+ test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
$opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
fi
- if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
+ if test : != "$skipped_export" && test -n "$orig_export_symbols"; then
# The given exports_symbols file has to be filtered, so filter it.
- func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+ func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
# FIXME: $output_objdir/$libname.filter potentially contains lots of
- # 's' commands which not all seds can handle. GNU sed should be fine
+ # 's' commands, which not all seds can handle. GNU sed should be fine
# though. Also, the filter scales superlinearly with the number of
# global variables. join(1) would be nice here, but unfortunately
# isn't a blessed tool.
@@ -8246,11 +9738,11 @@ EOF
;;
esac
done
- deplibs="$tmp_deplibs"
+ deplibs=$tmp_deplibs
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec" &&
- test "$compiler_needs_object" = yes &&
+ test yes = "$compiler_needs_object" &&
test -z "$libobjs"; then
# extract the archives, so we have objects to list.
# TODO: could optimize this to just extract one archive.
@@ -8261,7 +9753,7 @@ EOF
eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
test "X$libobjs" = "X " && libobjs=
else
- gentop="$output_objdir/${outputname}x"
+ gentop=$output_objdir/${outputname}x
func_append generated " $gentop"
func_extract_archives $gentop $convenience
@@ -8270,18 +9762,18 @@ EOF
fi
fi
- if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+ if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then
eval flag=\"$thread_safe_flag_spec\"
func_append linker_flags " $flag"
fi
# Make a backup of the uninstalled library when relinking
- if test "$opt_mode" = relink; then
+ if test relink = "$opt_mode"; then
$opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
fi
# Do each of the archive commands.
- if test "$module" = yes && test -n "$module_cmds" ; then
+ if test yes = "$module" && test -n "$module_cmds"; then
if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
eval test_cmds=\"$module_expsym_cmds\"
cmds=$module_expsym_cmds
@@ -8299,7 +9791,7 @@ EOF
fi
fi
- if test "X$skipped_export" != "X:" &&
+ if test : != "$skipped_export" &&
func_len " $test_cmds" &&
len=$func_len_result &&
test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
@@ -8332,8 +9824,8 @@ EOF
last_robj=
k=1
- if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
- output=${output_objdir}/${output_la}.lnkscript
+ if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then
+ output=$output_objdir/$output_la.lnkscript
func_verbose "creating GNU ld script: $output"
echo 'INPUT (' > $output
for obj in $save_libobjs
@@ -8345,14 +9837,14 @@ EOF
func_append delfiles " $output"
func_to_tool_file "$output"
output=$func_to_tool_file_result
- elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
- output=${output_objdir}/${output_la}.lnk
+ elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then
+ output=$output_objdir/$output_la.lnk
func_verbose "creating linker input file list: $output"
: > $output
set x $save_libobjs
shift
firstobj=
- if test "$compiler_needs_object" = yes; then
+ if test yes = "$compiler_needs_object"; then
firstobj="$1 "
shift
fi
@@ -8367,7 +9859,7 @@ EOF
else
if test -n "$save_libobjs"; then
func_verbose "creating reloadable object files..."
- output=$output_objdir/$output_la-${k}.$objext
+ output=$output_objdir/$output_la-$k.$objext
eval test_cmds=\"$reload_cmds\"
func_len " $test_cmds"
len0=$func_len_result
@@ -8379,13 +9871,13 @@ EOF
func_len " $obj"
func_arith $len + $func_len_result
len=$func_arith_result
- if test "X$objlist" = X ||
+ if test -z "$objlist" ||
test "$len" -lt "$max_cmd_len"; then
func_append objlist " $obj"
else
# The command $test_cmds is almost too long, add a
# command to the queue.
- if test "$k" -eq 1 ; then
+ if test 1 -eq "$k"; then
# The first file doesn't have a previous command to add.
reload_objs=$objlist
eval concat_cmds=\"$reload_cmds\"
@@ -8395,10 +9887,10 @@ EOF
reload_objs="$objlist $last_robj"
eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
fi
- last_robj=$output_objdir/$output_la-${k}.$objext
+ last_robj=$output_objdir/$output_la-$k.$objext
func_arith $k + 1
k=$func_arith_result
- output=$output_objdir/$output_la-${k}.$objext
+ output=$output_objdir/$output_la-$k.$objext
objlist=" $obj"
func_len " $last_robj"
func_arith $len0 + $func_len_result
@@ -8410,9 +9902,9 @@ EOF
# files will link in the last one created.
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
reload_objs="$objlist $last_robj"
- eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
+ eval concat_cmds=\"\$concat_cmds$reload_cmds\"
if test -n "$last_robj"; then
- eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
+ eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
fi
func_append delfiles " $output"
@@ -8420,9 +9912,9 @@ EOF
output=
fi
- if ${skipped_export-false}; then
- func_verbose "generating symbol list for \`$libname.la'"
- export_symbols="$output_objdir/$libname.exp"
+ ${skipped_export-false} && {
+ func_verbose "generating symbol list for '$libname.la'"
+ export_symbols=$output_objdir/$libname.exp
$opt_dry_run || $RM $export_symbols
libobjs=$output
# Append the command to create the export file.
@@ -8431,16 +9923,16 @@ EOF
if test -n "$last_robj"; then
eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
fi
- fi
+ }
test -n "$save_libobjs" &&
func_verbose "creating a temporary reloadable object file: $output"
# Loop through the commands generated above and execute them.
- save_ifs="$IFS"; IFS='~'
+ save_ifs=$IFS; IFS='~'
for cmd in $concat_cmds; do
- IFS="$save_ifs"
- $opt_silent || {
+ IFS=$save_ifs
+ $opt_quiet || {
func_quote_for_expand "$cmd"
eval "func_echo $func_quote_for_expand_result"
}
@@ -8448,7 +9940,7 @@ EOF
lt_exit=$?
# Restore the uninstalled library and exit
- if test "$opt_mode" = relink; then
+ if test relink = "$opt_mode"; then
( cd "$output_objdir" && \
$RM "${realname}T" && \
$MV "${realname}U" "$realname" )
@@ -8457,7 +9949,7 @@ EOF
exit $lt_exit
}
done
- IFS="$save_ifs"
+ IFS=$save_ifs
if test -n "$export_symbols_regex" && ${skipped_export-false}; then
func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
@@ -8465,18 +9957,18 @@ EOF
fi
fi
- if ${skipped_export-false}; then
+ ${skipped_export-false} && {
if test -n "$export_symbols" && test -n "$include_expsyms"; then
- tmp_export_symbols="$export_symbols"
- test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+ tmp_export_symbols=$export_symbols
+ test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
$opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
fi
if test -n "$orig_export_symbols"; then
# The given exports_symbols file has to be filtered, so filter it.
- func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+ func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
# FIXME: $output_objdir/$libname.filter potentially contains lots of
- # 's' commands which not all seds can handle. GNU sed should be fine
+ # 's' commands, which not all seds can handle. GNU sed should be fine
# though. Also, the filter scales superlinearly with the number of
# global variables. join(1) would be nice here, but unfortunately
# isn't a blessed tool.
@@ -8485,7 +9977,7 @@ EOF
export_symbols=$output_objdir/$libname.def
$opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
fi
- fi
+ }
libobjs=$output
# Restore the value of output.
@@ -8499,7 +9991,7 @@ EOF
# value of $libobjs for piecewise linking.
# Do each of the archive commands.
- if test "$module" = yes && test -n "$module_cmds" ; then
+ if test yes = "$module" && test -n "$module_cmds"; then
if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
cmds=$module_expsym_cmds
else
@@ -8521,7 +10013,7 @@ EOF
# Add any objects from preloaded convenience libraries
if test -n "$dlprefiles"; then
- gentop="$output_objdir/${outputname}x"
+ gentop=$output_objdir/${outputname}x
func_append generated " $gentop"
func_extract_archives $gentop $dlprefiles
@@ -8529,11 +10021,12 @@ EOF
test "X$libobjs" = "X " && libobjs=
fi
- save_ifs="$IFS"; IFS='~'
+ save_ifs=$IFS; IFS='~'
for cmd in $cmds; do
- IFS="$save_ifs"
+ IFS=$sp$nl
eval cmd=\"$cmd\"
- $opt_silent || {
+ IFS=$save_ifs
+ $opt_quiet || {
func_quote_for_expand "$cmd"
eval "func_echo $func_quote_for_expand_result"
}
@@ -8541,7 +10034,7 @@ EOF
lt_exit=$?
# Restore the uninstalled library and exit
- if test "$opt_mode" = relink; then
+ if test relink = "$opt_mode"; then
( cd "$output_objdir" && \
$RM "${realname}T" && \
$MV "${realname}U" "$realname" )
@@ -8550,10 +10043,10 @@ EOF
exit $lt_exit
}
done
- IFS="$save_ifs"
+ IFS=$save_ifs
# Restore the uninstalled library and exit
- if test "$opt_mode" = relink; then
+ if test relink = "$opt_mode"; then
$opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
if test -n "$convenience"; then
@@ -8573,39 +10066,39 @@ EOF
done
# If -module or -export-dynamic was specified, set the dlname.
- if test "$module" = yes || test "$export_dynamic" = yes; then
+ if test yes = "$module" || test yes = "$export_dynamic"; then
# On all known operating systems, these are identical.
- dlname="$soname"
+ dlname=$soname
fi
fi
;;
obj)
- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
- func_warning "\`-dlopen' is ignored for objects"
+ if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+ func_warning "'-dlopen' is ignored for objects"
fi
case " $deplibs" in
*\ -l* | *\ -L*)
- func_warning "\`-l' and \`-L' are ignored for objects" ;;
+ func_warning "'-l' and '-L' are ignored for objects" ;;
esac
test -n "$rpath" && \
- func_warning "\`-rpath' is ignored for objects"
+ func_warning "'-rpath' is ignored for objects"
test -n "$xrpath" && \
- func_warning "\`-R' is ignored for objects"
+ func_warning "'-R' is ignored for objects"
test -n "$vinfo" && \
- func_warning "\`-version-info' is ignored for objects"
+ func_warning "'-version-info' is ignored for objects"
test -n "$release" && \
- func_warning "\`-release' is ignored for objects"
+ func_warning "'-release' is ignored for objects"
case $output in
*.lo)
test -n "$objs$old_deplibs" && \
- func_fatal_error "cannot build library object \`$output' from non-libtool objects"
+ func_fatal_error "cannot build library object '$output' from non-libtool objects"
libobj=$output
func_lo2o "$libobj"
@@ -8613,7 +10106,7 @@ EOF
;;
*)
libobj=
- obj="$output"
+ obj=$output
;;
esac
@@ -8626,17 +10119,19 @@ EOF
# the extraction.
reload_conv_objs=
gentop=
- # reload_cmds runs $LD directly, so let us get rid of
- # -Wl from whole_archive_flag_spec and hope we can get by with
- # turning comma into space..
- wl=
-
+ # if reload_cmds runs $LD directly, get rid of -Wl from
+ # whole_archive_flag_spec and hope we can get by with turning comma
+ # into space.
+ case $reload_cmds in
+ *\$LD[\ \$]*) wl= ;;
+ esac
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
- reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+ test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+ reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags
else
- gentop="$output_objdir/${obj}x"
+ gentop=$output_objdir/${obj}x
func_append generated " $gentop"
func_extract_archives $gentop $convenience
@@ -8645,12 +10140,12 @@ EOF
fi
# If we're not building shared, we need to use non_pic_objs
- test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
+ test yes = "$build_libtool_libs" || libobjs=$non_pic_objects
# Create the old-style object.
- reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+ reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs
- output="$obj"
+ output=$obj
func_execute_cmds "$reload_cmds" 'exit $?'
# Exit if we aren't doing a library object file.
@@ -8662,7 +10157,7 @@ EOF
exit $EXIT_SUCCESS
fi
- if test "$build_libtool_libs" != yes; then
+ test yes = "$build_libtool_libs" || {
if test -n "$gentop"; then
func_show_eval '${RM}r "$gentop"'
fi
@@ -8672,12 +10167,12 @@ EOF
# $show "echo timestamp > $libobj"
# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
exit $EXIT_SUCCESS
- fi
+ }
- if test -n "$pic_flag" || test "$pic_mode" != default; then
+ if test -n "$pic_flag" || test default != "$pic_mode"; then
# Only do commands if we really have different PIC objects.
reload_objs="$libobjs $reload_conv_objs"
- output="$libobj"
+ output=$libobj
func_execute_cmds "$reload_cmds" 'exit $?'
fi
@@ -8694,16 +10189,14 @@ EOF
output=$func_stripname_result.exe;;
esac
test -n "$vinfo" && \
- func_warning "\`-version-info' is ignored for programs"
+ func_warning "'-version-info' is ignored for programs"
test -n "$release" && \
- func_warning "\`-release' is ignored for programs"
+ func_warning "'-release' is ignored for programs"
- test "$preload" = yes \
- && test "$dlopen_support" = unknown \
- && test "$dlopen_self" = unknown \
- && test "$dlopen_self_static" = unknown && \
- func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."
+ $preload \
+ && test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \
+ && func_warning "'LT_INIT([dlopen])' not used. Assuming no dlopen support."
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
@@ -8717,11 +10210,11 @@ EOF
*-*-darwin*)
# Don't allow lazy linking, it breaks C++ global constructors
# But is supposedly fixed on 10.4 or later (yay!).
- if test "$tagname" = CXX ; then
+ if test CXX = "$tagname"; then
case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
10.[0123])
- func_append compile_command " ${wl}-bind_at_load"
- func_append finalize_command " ${wl}-bind_at_load"
+ func_append compile_command " $wl-bind_at_load"
+ func_append finalize_command " $wl-bind_at_load"
;;
esac
fi
@@ -8757,7 +10250,7 @@ EOF
*) func_append new_libs " $deplib" ;;
esac
done
- compile_deplibs="$new_libs"
+ compile_deplibs=$new_libs
func_append compile_command " $compile_deplibs"
@@ -8781,7 +10274,7 @@ EOF
if test -n "$hardcode_libdir_flag_spec"; then
if test -n "$hardcode_libdir_separator"; then
if test -z "$hardcode_libdirs"; then
- hardcode_libdirs="$libdir"
+ hardcode_libdirs=$libdir
else
# Just accumulate the unique libdirs.
case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
@@ -8804,7 +10297,7 @@ EOF
fi
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
- testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
+ testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'`
case :$dllsearchpath: in
*":$libdir:"*) ;;
::) dllsearchpath=$libdir;;
@@ -8821,10 +10314,10 @@ EOF
# Substitute the hardcoded libdirs into the rpath.
if test -n "$hardcode_libdir_separator" &&
test -n "$hardcode_libdirs"; then
- libdir="$hardcode_libdirs"
+ libdir=$hardcode_libdirs
eval rpath=\" $hardcode_libdir_flag_spec\"
fi
- compile_rpath="$rpath"
+ compile_rpath=$rpath
rpath=
hardcode_libdirs=
@@ -8832,7 +10325,7 @@ EOF
if test -n "$hardcode_libdir_flag_spec"; then
if test -n "$hardcode_libdir_separator"; then
if test -z "$hardcode_libdirs"; then
- hardcode_libdirs="$libdir"
+ hardcode_libdirs=$libdir
else
# Just accumulate the unique libdirs.
case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
@@ -8857,45 +10350,43 @@ EOF
# Substitute the hardcoded libdirs into the rpath.
if test -n "$hardcode_libdir_separator" &&
test -n "$hardcode_libdirs"; then
- libdir="$hardcode_libdirs"
+ libdir=$hardcode_libdirs
eval rpath=\" $hardcode_libdir_flag_spec\"
fi
- finalize_rpath="$rpath"
+ finalize_rpath=$rpath
- if test -n "$libobjs" && test "$build_old_libs" = yes; then
+ if test -n "$libobjs" && test yes = "$build_old_libs"; then
# Transform all the library objects into standard objects.
compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
fi
- func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
+ func_generate_dlsyms "$outputname" "@PROGRAM@" false
# template prelinking step
if test -n "$prelink_cmds"; then
func_execute_cmds "$prelink_cmds" 'exit $?'
fi
- wrappers_required=yes
+ wrappers_required=:
case $host in
*cegcc* | *mingw32ce*)
# Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
- wrappers_required=no
+ wrappers_required=false
;;
*cygwin* | *mingw* )
- if test "$build_libtool_libs" != yes; then
- wrappers_required=no
- fi
+ test yes = "$build_libtool_libs" || wrappers_required=false
;;
*)
- if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
- wrappers_required=no
+ if test no = "$need_relink" || test yes != "$build_libtool_libs"; then
+ wrappers_required=false
fi
;;
esac
- if test "$wrappers_required" = no; then
+ $wrappers_required || {
# Replace the output file specification.
compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
- link_command="$compile_command$compile_rpath"
+ link_command=$compile_command$compile_rpath
# We have no uninstalled library dependencies, so finalize right now.
exit_status=0
@@ -8908,12 +10399,12 @@ EOF
fi
# Delete the generated files.
- if test -f "$output_objdir/${outputname}S.${objext}"; then
- func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
+ if test -f "$output_objdir/${outputname}S.$objext"; then
+ func_show_eval '$RM "$output_objdir/${outputname}S.$objext"'
fi
exit $exit_status
- fi
+ }
if test -n "$compile_shlibpath$finalize_shlibpath"; then
compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
@@ -8943,9 +10434,9 @@ EOF
fi
fi
- if test "$no_install" = yes; then
+ if test yes = "$no_install"; then
# We don't need to create a wrapper script.
- link_command="$compile_var$compile_command$compile_rpath"
+ link_command=$compile_var$compile_command$compile_rpath
# Replace the output file specification.
link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
# Delete the old output file.
@@ -8962,27 +10453,28 @@ EOF
exit $EXIT_SUCCESS
fi
- if test "$hardcode_action" = relink; then
- # Fast installation is not supported
- link_command="$compile_var$compile_command$compile_rpath"
- relink_command="$finalize_var$finalize_command$finalize_rpath"
+ case $hardcode_action,$fast_install in
+ relink,*)
+ # Fast installation is not supported
+ link_command=$compile_var$compile_command$compile_rpath
+ relink_command=$finalize_var$finalize_command$finalize_rpath
- func_warning "this platform does not like uninstalled shared libraries"
- func_warning "\`$output' will be relinked during installation"
- else
- if test "$fast_install" != no; then
- link_command="$finalize_var$compile_command$finalize_rpath"
- if test "$fast_install" = yes; then
- relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
- else
- # fast_install is set to needless
- relink_command=
- fi
- else
- link_command="$compile_var$compile_command$compile_rpath"
- relink_command="$finalize_var$finalize_command$finalize_rpath"
- fi
- fi
+ func_warning "this platform does not like uninstalled shared libraries"
+ func_warning "'$output' will be relinked during installation"
+ ;;
+ *,yes)
+ link_command=$finalize_var$compile_command$finalize_rpath
+ relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
+ ;;
+ *,no)
+ link_command=$compile_var$compile_command$compile_rpath
+ relink_command=$finalize_var$finalize_command$finalize_rpath
+ ;;
+ *,needless)
+ link_command=$finalize_var$compile_command$finalize_rpath
+ relink_command=
+ ;;
+ esac
# Replace the output file specification.
link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
@@ -9039,8 +10531,8 @@ EOF
func_dirname_and_basename "$output" "" "."
output_name=$func_basename_result
output_path=$func_dirname_result
- cwrappersource="$output_path/$objdir/lt-$output_name.c"
- cwrapper="$output_path/$output_name.exe"
+ cwrappersource=$output_path/$objdir/lt-$output_name.c
+ cwrapper=$output_path/$output_name.exe
$RM $cwrappersource $cwrapper
trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
@@ -9061,7 +10553,7 @@ EOF
trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
$opt_dry_run || {
# note: this script will not be executed, so do not chmod.
- if test "x$build" = "x$host" ; then
+ if test "x$build" = "x$host"; then
$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
else
func_emit_wrapper no > $func_ltwrapper_scriptname_result
@@ -9084,25 +10576,27 @@ EOF
# See if we need to build an old-fashioned archive.
for oldlib in $oldlibs; do
- if test "$build_libtool_libs" = convenience; then
- oldobjs="$libobjs_save $symfileobj"
- addlibs="$convenience"
- build_libtool_libs=no
- else
- if test "$build_libtool_libs" = module; then
- oldobjs="$libobjs_save"
+ case $build_libtool_libs in
+ convenience)
+ oldobjs="$libobjs_save $symfileobj"
+ addlibs=$convenience
build_libtool_libs=no
- else
+ ;;
+ module)
+ oldobjs=$libobjs_save
+ addlibs=$old_convenience
+ build_libtool_libs=no
+ ;;
+ *)
oldobjs="$old_deplibs $non_pic_objects"
- if test "$preload" = yes && test -f "$symfileobj"; then
- func_append oldobjs " $symfileobj"
- fi
- fi
- addlibs="$old_convenience"
- fi
+ $preload && test -f "$symfileobj" \
+ && func_append oldobjs " $symfileobj"
+ addlibs=$old_convenience
+ ;;
+ esac
if test -n "$addlibs"; then
- gentop="$output_objdir/${outputname}x"
+ gentop=$output_objdir/${outputname}x
func_append generated " $gentop"
func_extract_archives $gentop $addlibs
@@ -9110,13 +10604,13 @@ EOF
fi
# Do each command in the archive commands.
- if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+ if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then
cmds=$old_archive_from_new_cmds
else
# Add any objects from preloaded convenience libraries
if test -n "$dlprefiles"; then
- gentop="$output_objdir/${outputname}x"
+ gentop=$output_objdir/${outputname}x
func_append generated " $gentop"
func_extract_archives $gentop $dlprefiles
@@ -9137,7 +10631,7 @@ EOF
:
else
echo "copying selected object files to avoid basename conflicts..."
- gentop="$output_objdir/${outputname}x"
+ gentop=$output_objdir/${outputname}x
func_append generated " $gentop"
func_mkdir_p "$gentop"
save_oldobjs=$oldobjs
@@ -9146,7 +10640,7 @@ EOF
for obj in $save_oldobjs
do
func_basename "$obj"
- objbase="$func_basename_result"
+ objbase=$func_basename_result
case " $oldobjs " in
" ") oldobjs=$obj ;;
*[\ /]"$objbase "*)
@@ -9215,18 +10709,18 @@ EOF
else
# the above command should be used before it gets too long
oldobjs=$objlist
- if test "$obj" = "$last_oldobj" ; then
+ if test "$obj" = "$last_oldobj"; then
RANLIB=$save_RANLIB
fi
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
- eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+ eval concat_cmds=\"\$concat_cmds$old_archive_cmds\"
objlist=
len=$len0
fi
done
RANLIB=$save_RANLIB
oldobjs=$objlist
- if test "X$oldobjs" = "X" ; then
+ if test -z "$oldobjs"; then
eval cmds=\"\$concat_cmds\"
else
eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
@@ -9243,7 +10737,7 @@ EOF
case $output in
*.la)
old_library=
- test "$build_old_libs" = yes && old_library="$libname.$libext"
+ test yes = "$build_old_libs" && old_library=$libname.$libext
func_verbose "creating $output"
# Preserve any variables that may affect compiler behavior
@@ -9258,31 +10752,31 @@ EOF
fi
done
# Quote the link command for shipping.
- relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+ relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
- if test "$hardcode_automatic" = yes ; then
+ if test yes = "$hardcode_automatic"; then
relink_command=
fi
# Only create the output if not a dry run.
$opt_dry_run || {
for installed in no yes; do
- if test "$installed" = yes; then
+ if test yes = "$installed"; then
if test -z "$install_libdir"; then
break
fi
- output="$output_objdir/$outputname"i
+ output=$output_objdir/${outputname}i
# Replace all uninstalled libtool libraries with the installed ones
newdependency_libs=
for deplib in $dependency_libs; do
case $deplib in
*.la)
func_basename "$deplib"
- name="$func_basename_result"
+ name=$func_basename_result
func_resolve_sysroot "$deplib"
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
+ eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
test -z "$libdir" && \
- func_fatal_error "\`$deplib' is not a valid libtool archive"
+ func_fatal_error "'$deplib' is not a valid libtool archive"
func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
;;
-L*)
@@ -9298,23 +10792,23 @@ EOF
*) func_append newdependency_libs " $deplib" ;;
esac
done
- dependency_libs="$newdependency_libs"
+ dependency_libs=$newdependency_libs
newdlfiles=
for lib in $dlfiles; do
case $lib in
*.la)
func_basename "$lib"
- name="$func_basename_result"
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ name=$func_basename_result
+ eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
test -z "$libdir" && \
- func_fatal_error "\`$lib' is not a valid libtool archive"
+ func_fatal_error "'$lib' is not a valid libtool archive"
func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
;;
*) func_append newdlfiles " $lib" ;;
esac
done
- dlfiles="$newdlfiles"
+ dlfiles=$newdlfiles
newdlprefiles=
for lib in $dlprefiles; do
case $lib in
@@ -9324,34 +10818,34 @@ EOF
# didn't already link the preopened objects directly into
# the library:
func_basename "$lib"
- name="$func_basename_result"
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ name=$func_basename_result
+ eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
test -z "$libdir" && \
- func_fatal_error "\`$lib' is not a valid libtool archive"
+ func_fatal_error "'$lib' is not a valid libtool archive"
func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
;;
esac
done
- dlprefiles="$newdlprefiles"
+ dlprefiles=$newdlprefiles
else
newdlfiles=
for lib in $dlfiles; do
case $lib in
- [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
*) abs=`pwd`"/$lib" ;;
esac
func_append newdlfiles " $abs"
done
- dlfiles="$newdlfiles"
+ dlfiles=$newdlfiles
newdlprefiles=
for lib in $dlprefiles; do
case $lib in
- [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
*) abs=`pwd`"/$lib" ;;
esac
func_append newdlprefiles " $abs"
done
- dlprefiles="$newdlprefiles"
+ dlprefiles=$newdlprefiles
fi
$RM $output
# place dlname in correct position for cygwin
@@ -9367,10 +10861,9 @@ EOF
case $host,$output,$installed,$module,$dlname in
*cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
# If a -bindir argument was supplied, place the dll there.
- if test "x$bindir" != x ;
- then
+ if test -n "$bindir"; then
func_relative_path "$install_libdir" "$bindir"
- tdlname=$func_relative_path_result$dlname
+ tdlname=$func_relative_path_result/$dlname
else
# Otherwise fall back on heuristic.
tdlname=../bin/$dlname
@@ -9379,7 +10872,7 @@ EOF
esac
$ECHO > $output "\
# $outputname - a libtool library file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
#
# Please DO NOT delete this file!
# It is necessary for linking the library.
@@ -9393,7 +10886,7 @@ library_names='$library_names'
# The name of the static archive.
old_library='$old_library'
-# Linker flags that can not go in dependency_libs.
+# Linker flags that cannot go in dependency_libs.
inherited_linker_flags='$new_inherited_linker_flags'
# Libraries that this one depends upon.
@@ -9419,7 +10912,7 @@ dlpreopen='$dlprefiles'
# Directory that this library needs to be installed in:
libdir='$install_libdir'"
- if test "$installed" = no && test "$need_relink" = yes; then
+ if test no,yes = "$installed,$need_relink"; then
$ECHO >> $output "\
relink_command=\"$relink_command\""
fi
@@ -9434,27 +10927,29 @@ relink_command=\"$relink_command\""
exit $EXIT_SUCCESS
}
-{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
- func_mode_link ${1+"$@"}
+if test link = "$opt_mode" || test relink = "$opt_mode"; then
+ func_mode_link ${1+"$@"}
+fi
# func_mode_uninstall arg...
func_mode_uninstall ()
{
- $opt_debug
- RM="$nonopt"
+ $debug_cmd
+
+ RM=$nonopt
files=
- rmforce=
+ rmforce=false
exit_status=0
# This variable tells wrapper scripts just to set variables rather
# than running their programs.
- libtool_install_magic="$magic"
+ libtool_install_magic=$magic
for arg
do
case $arg in
- -f) func_append RM " $arg"; rmforce=yes ;;
+ -f) func_append RM " $arg"; rmforce=: ;;
-*) func_append RM " $arg" ;;
*) func_append files " $arg" ;;
esac
@@ -9467,18 +10962,18 @@ func_mode_uninstall ()
for file in $files; do
func_dirname "$file" "" "."
- dir="$func_dirname_result"
- if test "X$dir" = X.; then
- odir="$objdir"
+ dir=$func_dirname_result
+ if test . = "$dir"; then
+ odir=$objdir
else
- odir="$dir/$objdir"
+ odir=$dir/$objdir
fi
func_basename "$file"
- name="$func_basename_result"
- test "$opt_mode" = uninstall && odir="$dir"
+ name=$func_basename_result
+ test uninstall = "$opt_mode" && odir=$dir
# Remember odir for removal later, being careful to avoid duplicates
- if test "$opt_mode" = clean; then
+ if test clean = "$opt_mode"; then
case " $rmdirs " in
*" $odir "*) ;;
*) func_append rmdirs " $odir" ;;
@@ -9493,11 +10988,11 @@ func_mode_uninstall ()
elif test -d "$file"; then
exit_status=1
continue
- elif test "$rmforce" = yes; then
+ elif $rmforce; then
continue
fi
- rmfiles="$file"
+ rmfiles=$file
case $name in
*.la)
@@ -9511,7 +11006,7 @@ func_mode_uninstall ()
done
test -n "$old_library" && func_append rmfiles " $odir/$old_library"
- case "$opt_mode" in
+ case $opt_mode in
clean)
case " $library_names " in
*" $dlname "*) ;;
@@ -9522,12 +11017,12 @@ func_mode_uninstall ()
uninstall)
if test -n "$library_names"; then
# Do each command in the postuninstall commands.
- func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+ func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1'
fi
if test -n "$old_library"; then
# Do each command in the old_postuninstall commands.
- func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+ func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1'
fi
# FIXME: should reinstall the best remaining shared library.
;;
@@ -9543,21 +11038,19 @@ func_mode_uninstall ()
func_source $dir/$name
# Add PIC object to the list of files to remove.
- if test -n "$pic_object" &&
- test "$pic_object" != none; then
+ if test -n "$pic_object" && test none != "$pic_object"; then
func_append rmfiles " $dir/$pic_object"
fi
# Add non-PIC object to the list of files to remove.
- if test -n "$non_pic_object" &&
- test "$non_pic_object" != none; then
+ if test -n "$non_pic_object" && test none != "$non_pic_object"; then
func_append rmfiles " $dir/$non_pic_object"
fi
fi
;;
*)
- if test "$opt_mode" = clean ; then
+ if test clean = "$opt_mode"; then
noexename=$name
case $file in
*.exe)
@@ -9584,12 +11077,12 @@ func_mode_uninstall ()
# note $name still contains .exe if it was in $file originally
# as does the version of $file that was added into $rmfiles
- func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
- if test "$fast_install" = yes && test -n "$relink_command"; then
+ func_append rmfiles " $odir/$name $odir/${name}S.$objext"
+ if test yes = "$fast_install" && test -n "$relink_command"; then
func_append rmfiles " $odir/lt-$name"
fi
- if test "X$noexename" != "X$name" ; then
- func_append rmfiles " $odir/lt-${noexename}.c"
+ if test "X$noexename" != "X$name"; then
+ func_append rmfiles " $odir/lt-$noexename.c"
fi
fi
fi
@@ -9598,7 +11091,7 @@ func_mode_uninstall ()
func_show_eval "$RM $rmfiles" 'exit_status=1'
done
- # Try to remove the ${objdir}s in the directories where we deleted files
+ # Try to remove the $objdir's in the directories where we deleted files
for dir in $rmdirs; do
if test -d "$dir"; then
func_show_eval "rmdir $dir >/dev/null 2>&1"
@@ -9608,16 +11101,17 @@ func_mode_uninstall ()
exit $exit_status
}
-{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
- func_mode_uninstall ${1+"$@"}
+if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then
+ func_mode_uninstall ${1+"$@"}
+fi
test -z "$opt_mode" && {
- help="$generic_help"
+ help=$generic_help
func_fatal_help "you must specify a MODE"
}
test -z "$exec_cmd" && \
- func_fatal_help "invalid operation mode \`$opt_mode'"
+ func_fatal_help "invalid operation mode '$opt_mode'"
if test -n "$exec_cmd"; then
eval exec "$exec_cmd"
@@ -9628,7 +11122,7 @@ exit $exit_status
# The TAGs below are defined such that we never get into a situation
-# in which we disable both kinds of libraries. Given conflicting
+# where we disable both kinds of libraries. Given conflicting
# choices, we go for a static library, that is the most portable,
# since we can't tell whether shared libraries were disabled because
# the user asked for that or because the platform doesn't support
@@ -9651,5 +11145,3 @@ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
# mode:shell-script
# sh-indentation:2
# End:
-# vi:sw=2
-
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index bc28ccc..da4a4f6 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -1,8 +1,6 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is free software; the Free Software Foundation gives
@@ -10,36 +8,30 @@
# modifications, as long as this notice is preserved.
m4_define([_LT_COPYING], [dnl
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# Written by Gordon Matzigkeit, 1996
-#
-# This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
+# Copyright (C) 2014 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions. There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of of the License, or
+# (at your option) any later version.
#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program or library that is built
+# using GNU Libtool, you may include this file under the same
+# distribution terms that you use for the rest of that program.
#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# GNU Libtool is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING. If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
])
-# serial 57 LT_INIT
+# serial 58 LT_INIT
# LT_PREREQ(VERSION)
@@ -67,7 +59,7 @@ esac
# LT_INIT([OPTIONS])
# ------------------
AC_DEFUN([LT_INIT],
-[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK
AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
AC_BEFORE([$0], [LT_LANG])dnl
AC_BEFORE([$0], [LT_OUTPUT])dnl
@@ -91,7 +83,7 @@ dnl Parse OPTIONS
_LT_SET_OPTIONS([$0], [$1])
# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
+LIBTOOL_DEPS=$ltmain
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -111,26 +103,43 @@ dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
+# _LT_PREPARE_CC_BASENAME
+# -----------------------
+m4_defun([_LT_PREPARE_CC_BASENAME], [
+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+ for cc_temp in @S|@*""; do
+ case $cc_temp in
+ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+ \-*) ;;
+ *) break;;
+ esac
+ done
+ func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+])# _LT_PREPARE_CC_BASENAME
+
+
# _LT_CC_BASENAME(CC)
# -------------------
-# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
+# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME,
+# but that macro is also expanded into generated libtool script, which
+# arranges for $SED and $ECHO to be set by different means.
m4_defun([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
- case $cc_temp in
- compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
- distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
- \-*) ;;
- *) break;;
- esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+[m4_require([_LT_PREPARE_CC_BASENAME])dnl
+AC_REQUIRE([_LT_DECL_SED])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+func_cc_basename $1
+cc_basename=$func_cc_basename_result
])
# _LT_FILEUTILS_DEFAULTS
# ----------------------
# It is okay to use these file commands and assume they have been set
-# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
+# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'.
m4_defun([_LT_FILEUTILS_DEFAULTS],
[: ${CP="cp -f"}
: ${MV="mv -f"}
@@ -177,15 +186,16 @@ m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
m4_require([_LT_CMD_OLD_ARCHIVE])dnl
m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
m4_require([_LT_WITH_SYSROOT])dnl
+m4_require([_LT_CMD_TRUNCATE])dnl
_LT_CONFIG_LIBTOOL_INIT([
-# See if we are running on zsh, and set the options which allow our
+# See if we are running on zsh, and set the options that allow our
# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
+if test -n "\${ZSH_VERSION+set}"; then
setopt NO_GLOB_SUBST
fi
])
-if test -n "${ZSH_VERSION+set}" ; then
+if test -n "${ZSH_VERSION+set}"; then
setopt NO_GLOB_SUBST
fi
@@ -198,7 +208,7 @@ aix3*)
# AIX sometimes has problems with the GCC collect2 program. For some
# reason, if we set the COLLECT_NAMES environment variable, the problems
# vanish in a puff of smoke.
- if test "X${COLLECT_NAMES+set}" != Xset; then
+ if test set != "${COLLECT_NAMES+set}"; then
COLLECT_NAMES=
export COLLECT_NAMES
fi
@@ -209,14 +219,14 @@ esac
ofile=libtool
can_build_shared=yes
-# All known linkers require a `.a' archive for static linking (except MSVC,
+# All known linkers require a '.a' archive for static linking (except MSVC,
# which needs '.lib').
libext=a
-with_gnu_ld="$lt_cv_prog_gnu_ld"
+with_gnu_ld=$lt_cv_prog_gnu_ld
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
+old_CC=$CC
+old_CFLAGS=$CFLAGS
# Set sane defaults for various variables
test -z "$CC" && CC=cc
@@ -269,14 +279,14 @@ no_glob_subst='s/\*/\\\*/g'
# _LT_PROG_LTMAIN
# ---------------
-# Note that this code is called both from `configure', and `config.status'
+# Note that this code is called both from 'configure', and 'config.status'
# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably,
-# `config.status' has no value for ac_aux_dir unless we are using Automake,
+# 'config.status' has no value for ac_aux_dir unless we are using Automake,
# so we pass a copy along to make sure it has a sensible value anyway.
m4_defun([_LT_PROG_LTMAIN],
[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
-ltmain="$ac_aux_dir/ltmain.sh"
+ltmain=$ac_aux_dir/ltmain.sh
])# _LT_PROG_LTMAIN
@@ -286,7 +296,7 @@ ltmain="$ac_aux_dir/ltmain.sh"
# So that we can recreate a full libtool script including additional
# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
-# in macros and then make a single call at the end using the `libtool'
+# in macros and then make a single call at the end using the 'libtool'
# label.
@@ -421,8 +431,8 @@ m4_define([_lt_decl_all_varnames],
# _LT_CONFIG_STATUS_DECLARE([VARNAME])
# ------------------------------------
-# Quote a variable value, and forward it to `config.status' so that its
-# declaration there will have the same value as in `configure'. VARNAME
+# Quote a variable value, and forward it to 'config.status' so that its
+# declaration there will have the same value as in 'configure'. VARNAME
# must have a single quote delimited value for this to work.
m4_define([_LT_CONFIG_STATUS_DECLARE],
[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
@@ -446,7 +456,7 @@ m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
# Output comment and list of tags supported by the script
m4_defun([_LT_LIBTOOL_TAGS],
[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
-available_tags="_LT_TAGS"dnl
+available_tags='_LT_TAGS'dnl
])
@@ -474,7 +484,7 @@ m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
# _LT_LIBTOOL_CONFIG_VARS
# -----------------------
# Produce commented declarations of non-tagged libtool config variables
-# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
+# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool'
# script. Tagged libtool config variables (even for the LIBTOOL CONFIG
# section) are produced by _LT_LIBTOOL_TAG_VARS.
m4_defun([_LT_LIBTOOL_CONFIG_VARS],
@@ -500,8 +510,8 @@ m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of
# variables for single and double quote escaping we saved from calls
# to _LT_DECL, we can put quote escaped variables declarations
-# into `config.status', and then the shell code to quote escape them in
-# for loops in `config.status'. Finally, any additional code accumulated
+# into 'config.status', and then the shell code to quote escape them in
+# for loops in 'config.status'. Finally, any additional code accumulated
# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
m4_defun([_LT_CONFIG_COMMANDS],
[AC_PROVIDE_IFELSE([LT_OUTPUT],
@@ -547,7 +557,7 @@ for var in lt_decl_all_varnames([[ \
]], lt_decl_quote_varnames); do
case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[[\\\\\\\`\\"\\\$]]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -560,7 +570,7 @@ for var in lt_decl_all_varnames([[ \
]], lt_decl_dquote_varnames); do
case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[[\\\\\\\`\\"\\\$]]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -576,7 +586,7 @@ _LT_OUTPUT_LIBTOOL_INIT
# Generate a child script FILE with all initialization necessary to
# reuse the environment learned by the parent script, and make the
# file executable. If COMMENT is supplied, it is inserted after the
-# `#!' sequence but before initialization text begins. After this
+# '#!' sequence but before initialization text begins. After this
# macro, additional text can be appended to FILE to form the body of
# the child script. The macro ends with non-zero status if the
# file could not be fully written (such as if the disk is full).
@@ -598,7 +608,7 @@ AS_SHELL_SANITIZE
_AS_PREPARE
exec AS_MESSAGE_FD>&1
_ASEOF
-test $lt_write_fail = 0 && chmod +x $1[]dnl
+test 0 = "$lt_write_fail" && chmod +x $1[]dnl
m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
# LT_OUTPUT
@@ -621,7 +631,7 @@ exec AS_MESSAGE_LOG_FD>>config.log
} >&AS_MESSAGE_LOG_FD
lt_cl_help="\
-\`$as_me' creates a local libtool stub from the current configuration,
+'$as_me' creates a local libtool stub from the current configuration,
for use in further configure time tests before the real libtool is
generated.
@@ -643,7 +653,7 @@ Copyright (C) 2011 Free Software Foundation, Inc.
This config.lt script is free software; the Free Software Foundation
gives unlimited permision to copy, distribute and modify it."
-while test $[#] != 0
+while test 0 != $[#]
do
case $[1] in
--version | --v* | -V )
@@ -656,10 +666,10 @@ do
lt_cl_silent=: ;;
-*) AC_MSG_ERROR([unrecognized option: $[1]
-Try \`$[0] --help' for more information.]) ;;
+Try '$[0] --help' for more information.]) ;;
*) AC_MSG_ERROR([unrecognized argument: $[1]
-Try \`$[0] --help' for more information.]) ;;
+Try '$[0] --help' for more information.]) ;;
esac
shift
done
@@ -685,7 +695,7 @@ chmod +x "$CONFIG_LT"
# open by configure. Here we exec the FD to /dev/null, effectively closing
# config.log, so it can be properly (re)opened and appended to by config.lt.
lt_cl_success=:
-test "$silent" = yes &&
+test yes = "$silent" &&
lt_config_lt_args="$lt_config_lt_args --quiet"
exec AS_MESSAGE_LOG_FD>/dev/null
$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
@@ -705,27 +715,31 @@ m4_defun([_LT_CONFIG],
_LT_CONFIG_SAVE_COMMANDS([
m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
m4_if(_LT_TAG, [C], [
- # See if we are running on zsh, and set the options which allow our
+ # See if we are running on zsh, and set the options that allow our
# commands through without removal of \ escapes.
- if test -n "${ZSH_VERSION+set}" ; then
+ if test -n "${ZSH_VERSION+set}"; then
setopt NO_GLOB_SUBST
fi
- cfgfile="${ofile}T"
+ cfgfile=${ofile}T
trap "$RM \"$cfgfile\"; exit 1" 1 2 15
$RM "$cfgfile"
cat <<_LT_EOF >> "$cfgfile"
#! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Generated automatically by $as_me ($PACKAGE) $VERSION
# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
+
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit, 1996
+
_LT_COPYING
_LT_LIBTOOL_TAGS
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
+
# ### BEGIN LIBTOOL CONFIG
_LT_LIBTOOL_CONFIG_VARS
_LT_LIBTOOL_TAG_VARS
@@ -733,13 +747,24 @@ _LT_LIBTOOL_TAG_VARS
_LT_EOF
+ cat <<'_LT_EOF' >> "$cfgfile"
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_PREPARE_MUNGE_PATH_LIST
+_LT_PREPARE_CC_BASENAME
+
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_EOF
+
case $host_os in
aix3*)
cat <<\_LT_EOF >> "$cfgfile"
# AIX sometimes has problems with the GCC collect2 program. For some
# reason, if we set the COLLECT_NAMES environment variable, the problems
# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
+if test set != "${COLLECT_NAMES+set}"; then
COLLECT_NAMES=
export COLLECT_NAMES
fi
@@ -756,8 +781,6 @@ _LT_EOF
sed '$q' "$ltmain" >> "$cfgfile" \
|| (rm -f "$cfgfile"; exit 1)
- _LT_PROG_REPLACE_SHELLFNS
-
mv -f "$cfgfile" "$ofile" ||
(rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
chmod +x "$ofile"
@@ -775,7 +798,6 @@ _LT_EOF
[m4_if([$1], [], [
PACKAGE='$PACKAGE'
VERSION='$VERSION'
- TIMESTAMP='$TIMESTAMP'
RM='$RM'
ofile='$ofile'], [])
])dnl /_LT_CONFIG_SAVE_COMMANDS
@@ -974,7 +996,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
[lt_cv_apple_cc_single_mod=no
- if test -z "${LT_MULTI_MODULE}"; then
+ if test -z "$LT_MULTI_MODULE"; then
# By default we will add the -single_module flag. You can override
# by either setting the environment variable LT_MULTI_MODULE
# non-empty at configure time, or by adding -multi_module to the
@@ -992,7 +1014,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
cat conftest.err >&AS_MESSAGE_LOG_FD
# Otherwise, if the output was created with a 0 exit code from
# the compiler, it worked.
- elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+ elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
lt_cv_apple_cc_single_mod=yes
else
cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1010,7 +1032,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
[lt_cv_ld_exported_symbols_list=yes],
[lt_cv_ld_exported_symbols_list=no])
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS=$save_LDFLAGS
])
AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
@@ -1032,7 +1054,7 @@ _LT_EOF
_lt_result=$?
if test -s conftest.err && $GREP force_load conftest.err; then
cat conftest.err >&AS_MESSAGE_LOG_FD
- elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+ elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
lt_cv_ld_force_load=yes
else
cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1042,32 +1064,32 @@ _LT_EOF
])
case $host_os in
rhapsody* | darwin1.[[012]])
- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+ _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
darwin1.*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
darwin*) # darwin 5.x on
# if running on 10.5 or later, the deployment target defaults
# to the OS version, if on x86, and 10.4, the deployment
# target defaults to 10.4. Don't you love it?
case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
- 10.[[012]]*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+ 10.[[012]][[,.]]*)
+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
10.*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
esac
;;
esac
- if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+ if test yes = "$lt_cv_apple_cc_single_mod"; then
_lt_dar_single_mod='$single_module'
fi
- if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
- _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+ if test yes = "$lt_cv_ld_exported_symbols_list"; then
+ _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
else
- _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
fi
- if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+ if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
_lt_dsymutil='~$DSYMUTIL $lib || :'
else
_lt_dsymutil=
@@ -1087,29 +1109,29 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_automatic, $1)=yes
_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- if test "$lt_cv_ld_force_load" = "yes"; then
- _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+ if test yes = "$lt_cv_ld_force_load"; then
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
[FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes])
else
_LT_TAGVAR(whole_archive_flag_spec, $1)=''
fi
_LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+ _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined
case $cc_basename in
- ifort*) _lt_dar_can_shared=yes ;;
+ ifort*|nagfor*) _lt_dar_can_shared=yes ;;
*) _lt_dar_can_shared=$GCC ;;
esac
- if test "$_lt_dar_can_shared" = "yes"; then
+ if test yes = "$_lt_dar_can_shared"; then
output_verbose_link_cmd=func_echo_all
- _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
- _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
- _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
- _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+ _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+ _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
m4_if([$1], [CXX],
-[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
- _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
- _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+[ if test yes != "$lt_cv_apple_cc_single_mod"; then
+ _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
+ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
fi
],[])
else
@@ -1129,7 +1151,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
# Allow to override them for all tags through lt_cv_aix_libpath.
m4_defun([_LT_SYS_MODULE_PATH_AIX],
[m4_require([_LT_DECL_SED])dnl
-if test "${lt_cv_aix_libpath+set}" = set; then
+if test set = "${lt_cv_aix_libpath+set}"; then
aix_libpath=$lt_cv_aix_libpath
else
AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
@@ -1147,7 +1169,7 @@ else
_LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi],[])
if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
- _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib
fi
])
aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
@@ -1167,8 +1189,8 @@ m4_define([_LT_SHELL_INIT],
# -----------------------
# Find how we can fake an echo command that does not interpret backslash.
# In particular, with Autoconf 2.60 or later we add some code to the start
-# of the generated configure script which will find a shell with a builtin
-# printf (which we can use as an echo command).
+# of the generated configure script that will find a shell with a builtin
+# printf (that we can use as an echo command).
m4_defun([_LT_PROG_ECHO_BACKSLASH],
[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
@@ -1196,10 +1218,10 @@ fi
# Invoke $ECHO with all args, space-separated.
func_echo_all ()
{
- $ECHO "$*"
+ $ECHO "$*"
}
-case "$ECHO" in
+case $ECHO in
printf*) AC_MSG_RESULT([printf]) ;;
print*) AC_MSG_RESULT([print -r]) ;;
*) AC_MSG_RESULT([cat]) ;;
@@ -1225,16 +1247,17 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
AC_DEFUN([_LT_WITH_SYSROOT],
[AC_MSG_CHECKING([for sysroot])
AC_ARG_WITH([sysroot],
-[ --with-sysroot[=DIR] Search for dependent libraries within DIR
- (or the compiler's sysroot if not specified).],
+[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@],
+ [Search for dependent libraries within DIR (or the compiler's sysroot
+ if not specified).])],
[], [with_sysroot=no])
dnl lt_sysroot will always be passed unquoted. We quote it here
dnl in case the user passed a directory name.
lt_sysroot=
-case ${with_sysroot} in #(
+case $with_sysroot in #(
yes)
- if test "$GCC" = yes; then
+ if test yes = "$GCC"; then
lt_sysroot=`$CC --print-sysroot 2>/dev/null`
fi
;; #(
@@ -1244,14 +1267,14 @@ case ${with_sysroot} in #(
no|'')
;; #(
*)
- AC_MSG_RESULT([${with_sysroot}])
+ AC_MSG_RESULT([$with_sysroot])
AC_MSG_ERROR([The sysroot must be an absolute path.])
;;
esac
AC_MSG_RESULT([${lt_sysroot:-no}])
_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
-[dependent libraries, and in which our libraries should be installed.])])
+[dependent libraries, and where our libraries should be installed.])])
# _LT_ENABLE_LOCK
# ---------------
@@ -1259,31 +1282,33 @@ m4_defun([_LT_ENABLE_LOCK],
[AC_ARG_ENABLE([libtool-lock],
[AS_HELP_STRING([--disable-libtool-lock],
[avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+test no = "$enable_libtool_lock" || enable_libtool_lock=yes
# Some flags need to be propagated to the compiler or linker for good
# libtool support.
case $host in
ia64-*-hpux*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set mode
+ # options accordingly.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
- HPUX_IA64_MODE="32"
+ HPUX_IA64_MODE=32
;;
*ELF-64*)
- HPUX_IA64_MODE="64"
+ HPUX_IA64_MODE=64
;;
esac
fi
rm -rf conftest*
;;
*-*-irix6*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
- if test "$lt_cv_prog_gnu_ld" = yes; then
+ if test yes = "$lt_cv_prog_gnu_ld"; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
LD="${LD-ld} -melf32bsmip"
@@ -1312,9 +1337,46 @@ ia64-*-hpux*)
rm -rf conftest*
;;
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+mips64*-*linux*)
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
+ echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ emul=elf
+ case `/usr/bin/file conftest.$ac_objext` in
+ *32-bit*)
+ emul="${emul}32"
+ ;;
+ *64-bit*)
+ emul="${emul}64"
+ ;;
+ esac
+ case `/usr/bin/file conftest.$ac_objext` in
+ *MSB*)
+ emul="${emul}btsmip"
+ ;;
+ *LSB*)
+ emul="${emul}ltsmip"
+ ;;
+ esac
+ case `/usr/bin/file conftest.$ac_objext` in
+ *N32*)
+ emul="${emul}n32"
+ ;;
+ esac
+ LD="${LD-ld} -m $emul"
+ fi
+ rm -rf conftest*
+ ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly. Note that the listed cases only cover the
+ # situations where additional linker options are needed (such as when
+ # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+ # vice versa); the common cases where no linker options are needed do
+ # not appear in the list.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
case `/usr/bin/file conftest.o` in
@@ -1324,9 +1386,19 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
LD="${LD-ld} -m elf_i386_fbsd"
;;
x86_64-*linux*)
- LD="${LD-ld} -m elf_i386"
+ case `/usr/bin/file conftest.o` in
+ *x86-64*)
+ LD="${LD-ld} -m elf32_x86_64"
+ ;;
+ *)
+ LD="${LD-ld} -m elf_i386"
+ ;;
+ esac
+ ;;
+ powerpc64le-*linux*)
+ LD="${LD-ld} -m elf32lppclinux"
;;
- ppc64-*linux*|powerpc64-*linux*)
+ powerpc64-*linux*)
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
@@ -1345,7 +1417,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
- ppc*-*linux*|powerpc*-*linux*)
+ powerpcle-*linux*)
+ LD="${LD-ld} -m elf64lppc"
+ ;;
+ powerpc-*linux*)
LD="${LD-ld} -m elf64ppc"
;;
s390*-*linux*|s390*-*tpf*)
@@ -1363,19 +1438,20 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
*-*-sco3.2v5*)
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
- SAVE_CFLAGS="$CFLAGS"
+ SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -belf"
AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
[AC_LANG_PUSH(C)
AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
AC_LANG_POP])
- if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+ if test yes != "$lt_cv_cc_needs_belf"; then
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
- CFLAGS="$SAVE_CFLAGS"
+ CFLAGS=$SAVE_CFLAGS
fi
;;
*-*solaris*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
case `/usr/bin/file conftest.o` in
@@ -1383,7 +1459,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
case $lt_cv_prog_gnu_ld in
yes*)
case $host in
- i?86-*-solaris*)
+ i?86-*-solaris*|x86_64-*-solaris*)
LD="${LD-ld} -m elf_x86_64"
;;
sparc*-*-solaris*)
@@ -1392,7 +1468,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
esac
# GNU ld 2.21 introduced _sol2 emulations. Use them if available.
if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
- LD="${LD-ld}_sol2"
+ LD=${LD-ld}_sol2
fi
;;
*)
@@ -1408,7 +1484,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
;;
esac
-need_locks="$enable_libtool_lock"
+need_locks=$enable_libtool_lock
])# _LT_ENABLE_LOCK
@@ -1427,11 +1503,11 @@ AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
[echo conftest.$ac_objext > conftest.lst
lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
AC_TRY_EVAL([lt_ar_try])
- if test "$ac_status" -eq 0; then
+ if test 0 -eq "$ac_status"; then
# Ensure the archiver fails upon bogus file names.
rm -f conftest.$ac_objext libconftest.a
AC_TRY_EVAL([lt_ar_try])
- if test "$ac_status" -ne 0; then
+ if test 0 -ne "$ac_status"; then
lt_cv_ar_at_file=@
fi
fi
@@ -1439,7 +1515,7 @@ AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
])
])
-if test "x$lt_cv_ar_at_file" = xno; then
+if test no = "$lt_cv_ar_at_file"; then
archiver_list_spec=
else
archiver_list_spec=$lt_cv_ar_at_file
@@ -1470,7 +1546,7 @@ old_postuninstall_cmds=
if test -n "$RANLIB"; then
case $host_os in
- openbsd*)
+ bitrig* | openbsd*)
old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
;;
*)
@@ -1506,7 +1582,7 @@ AC_CACHE_CHECK([$1], [$2],
[$2=no
m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$3"
+ lt_compiler_flag="$3" ## exclude from sc_useless_quotes_in_assignment
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
# Note that $ac_compile itself does not contain backslashes and begins
@@ -1533,7 +1609,7 @@ AC_CACHE_CHECK([$1], [$2],
$RM conftest*
])
-if test x"[$]$2" = xyes; then
+if test yes = "[$]$2"; then
m4_if([$5], , :, [$5])
else
m4_if([$6], , :, [$6])
@@ -1555,7 +1631,7 @@ AC_DEFUN([_LT_LINKER_OPTION],
m4_require([_LT_DECL_SED])dnl
AC_CACHE_CHECK([$1], [$2],
[$2=no
- save_LDFLAGS="$LDFLAGS"
+ save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS $3"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -1574,10 +1650,10 @@ AC_CACHE_CHECK([$1], [$2],
fi
fi
$RM -r conftest*
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS=$save_LDFLAGS
])
-if test x"[$]$2" = xyes; then
+if test yes = "[$]$2"; then
m4_if([$4], , :, [$4])
else
m4_if([$5], , :, [$5])
@@ -1598,7 +1674,7 @@ AC_DEFUN([LT_CMD_MAX_LEN],
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
i=0
- teststring="ABCD"
+ teststring=ABCD
case $build_os in
msdosdjgpp*)
@@ -1638,7 +1714,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
lt_cv_sys_max_cmd_len=8192;
;;
- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+ bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
# This has been around since 386BSD, at least. Likely further.
if test -x /sbin/sysctl; then
lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -1688,22 +1764,23 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
;;
*)
lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
- if test -n "$lt_cv_sys_max_cmd_len"; then
+ if test -n "$lt_cv_sys_max_cmd_len" && \
+ test undefined != "$lt_cv_sys_max_cmd_len"; then
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
else
# Make teststring a little bigger before we do anything with it.
# a 1K string should be a reasonable start.
- for i in 1 2 3 4 5 6 7 8 ; do
+ for i in 1 2 3 4 5 6 7 8; do
teststring=$teststring$teststring
done
SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
- while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
+ while { test X`env echo "$teststring$teststring" 2>/dev/null` \
= "X$teststring$teststring"; } >/dev/null 2>&1 &&
- test $i != 17 # 1/2 MB should be enough
+ test 17 != "$i" # 1/2 MB should be enough
do
i=`expr $i + 1`
teststring=$teststring$teststring
@@ -1719,7 +1796,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
;;
esac
])
-if test -n $lt_cv_sys_max_cmd_len ; then
+if test -n "$lt_cv_sys_max_cmd_len"; then
AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
else
AC_MSG_RESULT(none)
@@ -1747,7 +1824,7 @@ m4_defun([_LT_HEADER_DLFCN],
# ----------------------------------------------------------------
m4_defun([_LT_TRY_DLOPEN_SELF],
[m4_require([_LT_HEADER_DLFCN])dnl
-if test "$cross_compiling" = yes; then :
+if test yes = "$cross_compiling"; then :
[$4]
else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
@@ -1794,9 +1871,9 @@ else
# endif
#endif
-/* When -fvisbility=hidden is used, assume the code has been annotated
+/* When -fvisibility=hidden is used, assume the code has been annotated
correspondingly for the symbols needed. */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
int fnord () __attribute__((visibility("default")));
#endif
@@ -1822,7 +1899,7 @@ int main ()
return status;
}]
_LT_EOF
- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+ if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then
(./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
lt_status=$?
case x$lt_status in
@@ -1843,7 +1920,7 @@ rm -fr conftest*
# ------------------
AC_DEFUN([LT_SYS_DLOPEN_SELF],
[m4_require([_LT_HEADER_DLFCN])dnl
-if test "x$enable_dlopen" != xyes; then
+if test yes != "$enable_dlopen"; then
enable_dlopen=unknown
enable_dlopen_self=unknown
enable_dlopen_self_static=unknown
@@ -1853,44 +1930,52 @@ else
case $host_os in
beos*)
- lt_cv_dlopen="load_add_on"
+ lt_cv_dlopen=load_add_on
lt_cv_dlopen_libs=
lt_cv_dlopen_self=yes
;;
mingw* | pw32* | cegcc*)
- lt_cv_dlopen="LoadLibrary"
+ lt_cv_dlopen=LoadLibrary
lt_cv_dlopen_libs=
;;
cygwin*)
- lt_cv_dlopen="dlopen"
+ lt_cv_dlopen=dlopen
lt_cv_dlopen_libs=
;;
darwin*)
- # if libdl is installed we need to link against it
+ # if libdl is installed we need to link against it
AC_CHECK_LIB([dl], [dlopen],
- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
- lt_cv_dlopen="dyld"
+ [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[
+ lt_cv_dlopen=dyld
lt_cv_dlopen_libs=
lt_cv_dlopen_self=yes
])
;;
+ tpf*)
+ # Don't try to run any link tests for TPF. We know it's impossible
+ # because TPF is a cross-compiler, and we know how we open DSOs.
+ lt_cv_dlopen=dlopen
+ lt_cv_dlopen_libs=
+ lt_cv_dlopen_self=no
+ ;;
+
*)
AC_CHECK_FUNC([shl_load],
- [lt_cv_dlopen="shl_load"],
+ [lt_cv_dlopen=shl_load],
[AC_CHECK_LIB([dld], [shl_load],
- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+ [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld],
[AC_CHECK_FUNC([dlopen],
- [lt_cv_dlopen="dlopen"],
+ [lt_cv_dlopen=dlopen],
[AC_CHECK_LIB([dl], [dlopen],
- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+ [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],
[AC_CHECK_LIB([svld], [dlopen],
- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+ [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld],
[AC_CHECK_LIB([dld], [dld_link],
- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+ [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld])
])
])
])
@@ -1899,21 +1984,21 @@ else
;;
esac
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
- else
+ if test no = "$lt_cv_dlopen"; then
enable_dlopen=no
+ else
+ enable_dlopen=yes
fi
case $lt_cv_dlopen in
dlopen)
- save_CPPFLAGS="$CPPFLAGS"
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+ save_CPPFLAGS=$CPPFLAGS
+ test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
- save_LDFLAGS="$LDFLAGS"
+ save_LDFLAGS=$LDFLAGS
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
- save_LIBS="$LIBS"
+ save_LIBS=$LIBS
LIBS="$lt_cv_dlopen_libs $LIBS"
AC_CACHE_CHECK([whether a program can dlopen itself],
@@ -1923,7 +2008,7 @@ else
lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
])
- if test "x$lt_cv_dlopen_self" = xyes; then
+ if test yes = "$lt_cv_dlopen_self"; then
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
lt_cv_dlopen_self_static, [dnl
@@ -1933,9 +2018,9 @@ else
])
fi
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
+ CPPFLAGS=$save_CPPFLAGS
+ LDFLAGS=$save_LDFLAGS
+ LIBS=$save_LIBS
;;
esac
@@ -2027,8 +2112,8 @@ m4_defun([_LT_COMPILER_FILE_LOCKS],
m4_require([_LT_FILEUTILS_DEFAULTS])dnl
_LT_COMPILER_C_O([$1])
-hard_links="nottested"
-if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+hard_links=nottested
+if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then
# do not overwrite the value of need_locks provided by the user
AC_MSG_CHECKING([if we can lock with hard links])
hard_links=yes
@@ -2038,8 +2123,8 @@ if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" !=
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
AC_MSG_RESULT([$hard_links])
- if test "$hard_links" = no; then
- AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
+ if test no = "$hard_links"; then
+ AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe])
need_locks=warn
fi
else
@@ -2066,8 +2151,8 @@ objdir=$lt_cv_objdir
_LT_DECL([], [objdir], [0],
[The name of the directory that contains temporary libtool files])dnl
m4_pattern_allow([LT_OBJDIR])dnl
-AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
- [Define to the sub-directory in which libtool stores uninstalled libraries.])
+AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/",
+ [Define to the sub-directory where libtool stores uninstalled libraries.])
])# _LT_CHECK_OBJDIR
@@ -2079,15 +2164,15 @@ m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
_LT_TAGVAR(hardcode_action, $1)=
if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
test -n "$_LT_TAGVAR(runpath_var, $1)" ||
- test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+ test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then
# We can hardcode non-existent directories.
- if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
+ if test no != "$_LT_TAGVAR(hardcode_direct, $1)" &&
# If the only mechanism to avoid hardcoding is shlibpath_var, we
# have to relink, otherwise we might link with an installed library
# when we should be linking with a yet-to-be-installed one
- ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
- test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
+ ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" &&
+ test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then
# Linking always hardcodes the temporary library directory.
_LT_TAGVAR(hardcode_action, $1)=relink
else
@@ -2101,12 +2186,12 @@ else
fi
AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
-if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
- test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
+if test relink = "$_LT_TAGVAR(hardcode_action, $1)" ||
+ test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then
# Fast installation is not supported
enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
+elif test yes = "$shlibpath_overrides_runpath" ||
+ test no = "$enable_shared"; then
# Fast installation is not necessary
enable_fast_install=needless
fi
@@ -2130,7 +2215,7 @@ else
# FIXME - insert some real tests, host_os isn't really good enough
case $host_os in
darwin*)
- if test -n "$STRIP" ; then
+ if test -n "$STRIP"; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
AC_MSG_RESULT([yes])
@@ -2148,6 +2233,47 @@ _LT_DECL([], [striplib], [1])
])# _LT_CMD_STRIPLIB
+# _LT_PREPARE_MUNGE_PATH_LIST
+# ---------------------------
+# Make sure func_munge_path_list() is defined correctly.
+m4_defun([_LT_PREPARE_MUNGE_PATH_LIST],
+[[# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+# string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+# string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+# string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+# "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+# VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+ case x at S|@2 in
+ x)
+ ;;
+ *:)
+ eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\"
+ ;;
+ x:*)
+ eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\"
+ ;;
+ *::*)
+ eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+ eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\"
+ ;;
+ *)
+ eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\"
+ ;;
+ esac
+}
+]])# _LT_PREPARE_PATH_LIST
+
+
# _LT_SYS_DYNAMIC_LINKER([TAG])
# -----------------------------
# PORTME Fill in your ld.so characteristics
@@ -2158,17 +2284,18 @@ m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_DECL_OBJDUMP])dnl
m4_require([_LT_DECL_SED])dnl
m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl
AC_MSG_CHECKING([dynamic linker characteristics])
m4_if([$1],
[], [
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
case $host_os in
- darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
- *) lt_awk_arg="/^libraries:/" ;;
+ darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
+ *) lt_awk_arg='/^libraries:/' ;;
esac
case $host_os in
- mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
- *) lt_sed_strip_eq="s,=/,/,g" ;;
+ mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;;
+ *) lt_sed_strip_eq='s|=/|/|g' ;;
esac
lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
case $lt_search_path_spec in
@@ -2184,28 +2311,35 @@ if test "$GCC" = yes; then
;;
esac
# Ok, now we have the path, separated by spaces, we can step through it
- # and add multilib dir if necessary.
+ # and add multilib dir if necessary...
lt_tmp_lt_search_path_spec=
- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ # ...but if some path component already ends with the multilib dir we assume
+ # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+ case "$lt_multi_os_dir; $lt_search_path_spec " in
+ "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+ lt_multi_os_dir=
+ ;;
+ esac
for lt_sys_path in $lt_search_path_spec; do
- if test -d "$lt_sys_path/$lt_multi_os_dir"; then
- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
- else
+ if test -d "$lt_sys_path$lt_multi_os_dir"; then
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
+ elif test -n "$lt_multi_os_dir"; then
test -d "$lt_sys_path" && \
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
fi
done
lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-BEGIN {RS=" "; FS="/|\n";} {
- lt_foo="";
- lt_count=0;
+BEGIN {RS = " "; FS = "/|\n";} {
+ lt_foo = "";
+ lt_count = 0;
for (lt_i = NF; lt_i > 0; lt_i--) {
if ($lt_i != "" && $lt_i != ".") {
if ($lt_i == "..") {
lt_count++;
} else {
if (lt_count == 0) {
- lt_foo="/" $lt_i lt_foo;
+ lt_foo = "/" $lt_i lt_foo;
} else {
lt_count--;
}
@@ -2219,7 +2353,7 @@ BEGIN {RS=" "; FS="/|\n";} {
# for these hosts.
case $host_os in
mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
- $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
+ $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;;
esac
sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
else
@@ -2228,7 +2362,7 @@ fi])
library_names_spec=
libname_spec='lib$name'
soname_spec=
-shrext_cmds=".so"
+shrext_cmds=.so
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
@@ -2245,14 +2379,17 @@ hardcode_into_libs=no
# flags to be left without arguments
need_version=unknown
+AC_ARG_VAR([LT_SYS_LIBRARY_PATH],
+[User-defined run-time library search path.])
+
case $host_os in
aix3*)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
shlibpath_var=LIBPATH
# AIX 3 has no versioning support, so we append a major version to the name.
- soname_spec='${libname}${release}${shared_ext}$major'
+ soname_spec='$libname$release$shared_ext$major'
;;
aix[[4-9]]*)
@@ -2260,41 +2397,91 @@ aix[[4-9]]*)
need_lib_prefix=no
need_version=no
hardcode_into_libs=yes
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 supports IA64
- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
else
# With GCC up to 2.95.x, collect2 would create an import file
# for dependence libraries. The import file would start with
- # the line `#! .'. This would cause the generated library to
- # depend on `.', always an invalid library. This was fixed in
+ # the line '#! .'. This would cause the generated library to
+ # depend on '.', always an invalid library. This was fixed in
# development snapshots of GCC prior to 3.0.
case $host_os in
aix4 | aix4.[[01]] | aix4.[[01]].*)
if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
echo ' yes '
- echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+ echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
:
else
can_build_shared=no
fi
;;
esac
- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+ # Using Import Files as archive members, it is possible to support
+ # filename-based versioning of shared library archives on AIX. While
+ # this would work for both with and without runtime linking, it will
+ # prevent static linking of such archives. So we do filename-based
+ # shared library versioning with .so extension only, which is used
+ # when both runtime linking and shared linking is enabled.
+ # Unfortunately, runtime linking may impact performance, so we do
+ # not want this to be the default eventually. Also, we use the
+ # versioned .so libs for executables only if there is the -brtl
+ # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+ # To allow for filename-based versioning support, we need to create
+ # libNAME.so.V as an archive file, containing:
+ # *) an Import File, referring to the versioned filename of the
+ # archive as well as the shared archive member, telling the
+ # bitwidth (32 or 64) of that shared object, and providing the
+ # list of exported symbols of that shared object, eventually
+ # decorated with the 'weak' keyword
+ # *) the shared object with the F_LOADONLY flag set, to really avoid
+ # it being seen by the linker.
+ # At run time we better use the real file rather than another symlink,
+ # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+ case $with_aix_soname,$aix_use_runtimelinking in
+ # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
# soname into executable. Probably we can add versioning support to
# collect2, so additional links can be useful in future.
- if test "$aix_use_runtimelinking" = yes; then
+ aix,yes) # traditional libtool
+ dynamic_linker='AIX unversionable lib.so'
# If using run time linking (on AIX 4.2 or later) use lib<name>.so
# instead of lib<name>.a to let people know that these are not
# typical AIX shared libraries.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- else
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ ;;
+ aix,no) # traditional AIX only
+ dynamic_linker='AIX lib.a[(]lib.so.V[)]'
# We preserve .a as extension for shared libraries through AIX4.2
# and later when we are not doing run time linking.
- library_names_spec='${libname}${release}.a $libname.a'
- soname_spec='${libname}${release}${shared_ext}$major'
- fi
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ ;;
+ svr4,*) # full svr4 only
+ dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,yes) # both, prefer svr4
+ dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # unpreferred sharedlib libNAME.a needs extra handling
+ postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+ postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,no) # both, prefer aix
+ dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]"
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+ postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+ postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+ ;;
+ esac
shlibpath_var=LIBPATH
fi
;;
@@ -2304,18 +2491,18 @@ amigaos*)
powerpc)
# Since July 2007 AmigaOS4 officially supports .so libraries.
# When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
;;
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
;;
esac
;;
beos*)
- library_names_spec='${libname}${shared_ext}'
+ library_names_spec='$libname$shared_ext'
dynamic_linker="$host_os ld.so"
shlibpath_var=LIBRARY_PATH
;;
@@ -2323,8 +2510,8 @@ beos*)
bsdi[[45]]*)
version_type=linux # correct to gnu/linux during the next big refactor
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
@@ -2336,7 +2523,7 @@ bsdi[[45]]*)
cygwin* | mingw* | pw32* | cegcc*)
version_type=windows
- shrext_cmds=".dll"
+ shrext_cmds=.dll
need_version=no
need_lib_prefix=no
@@ -2345,8 +2532,8 @@ cygwin* | mingw* | pw32* | cegcc*)
# gcc
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
$install_prog $dir/$dlname \$dldir/$dlname~
@@ -2362,17 +2549,17 @@ cygwin* | mingw* | pw32* | cegcc*)
case $host_os in
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
m4_if([$1], [],[
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
;;
esac
dynamic_linker='Win32 ld.exe'
@@ -2381,8 +2568,8 @@ m4_if([$1], [],[
*,cl*)
# Native MSVC
libname_spec='$name'
- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
- library_names_spec='${libname}.dll.lib'
+ soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+ library_names_spec='$libname.dll.lib'
case $build_os in
mingw*)
@@ -2409,7 +2596,7 @@ m4_if([$1], [],[
sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
;;
*)
- sys_lib_search_path_spec="$LIB"
+ sys_lib_search_path_spec=$LIB
if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
# It is most probably a Windows format PATH.
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
@@ -2422,8 +2609,8 @@ m4_if([$1], [],[
esac
# DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
$install_prog $dir/$dlname \$dldir/$dlname'
@@ -2436,7 +2623,7 @@ m4_if([$1], [],[
*)
# Assume MSVC wrapper
- library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+ library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib'
dynamic_linker='Win32 ld.exe'
;;
esac
@@ -2449,8 +2636,8 @@ darwin* | rhapsody*)
version_type=darwin
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
- soname_spec='${libname}${release}${major}$shared_ext'
+ library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+ soname_spec='$libname$release$major$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -2463,8 +2650,8 @@ dgux*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -2489,12 +2676,13 @@ freebsd* | dragonfly*)
case $version_type in
freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
need_version=no
need_lib_prefix=no
;;
freebsd-*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
need_version=yes
;;
linux)
@@ -2525,26 +2713,15 @@ freebsd* | dragonfly*)
esac
;;
-gnu*)
- version_type=linux # correct to gnu/linux during the next big refactor
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-
haiku*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
dynamic_linker="$host_os runtime_loader"
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LIBRARY_PATH
- shlibpath_overrides_runpath=yes
+ shlibpath_overrides_runpath=no
sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
hardcode_into_libs=yes
;;
@@ -2562,14 +2739,15 @@ hpux9* | hpux10* | hpux11*)
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- if test "X$HPUX_IA64_MODE" = X32; then
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
+ if test 32 = "$HPUX_IA64_MODE"; then
sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+ sys_lib_dlsearch_path_spec=/usr/lib/hpux32
else
sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+ sys_lib_dlsearch_path_spec=/usr/lib/hpux64
fi
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
shrext_cmds='.sl'
@@ -2577,8 +2755,8 @@ hpux9* | hpux10* | hpux11*)
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
@@ -2587,8 +2765,8 @@ hpux9* | hpux10* | hpux11*)
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
;;
esac
# HP-UX runs *really* slowly unless shared libraries are mode 555, ...
@@ -2601,8 +2779,8 @@ interix[[3-9]]*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -2613,7 +2791,7 @@ irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
*)
- if test "$lt_cv_prog_gnu_ld" = yes; then
+ if test yes = "$lt_cv_prog_gnu_ld"; then
version_type=linux # correct to gnu/linux during the next big refactor
else
version_type=irix
@@ -2621,8 +2799,8 @@ irix5* | irix6* | nonstopux*)
esac
need_lib_prefix=no
need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+ soname_spec='$libname$release$shared_ext$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
case $host_os in
irix5* | nonstopux*)
libsuff= shlibsuff=
@@ -2641,8 +2819,8 @@ irix5* | irix6* | nonstopux*)
esac
shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
shlibpath_overrides_runpath=no
- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+ sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+ sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
hardcode_into_libs=yes
;;
@@ -2651,13 +2829,33 @@ linux*oldld* | linux*aout* | linux*coff*)
dynamic_linker=no
;;
+linux*android*)
+ version_type=none # Android doesn't support versioned libraries.
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='$libname$release$shared_ext'
+ soname_spec='$libname$release$shared_ext'
+ finish_cmds=
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+
+ # This implies no fast_install, which is unacceptable.
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
+ dynamic_linker='Android linker'
+ # Don't embed -rpath directories since the linker doesn't support them.
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ ;;
+
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -2682,7 +2880,12 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
# before this can be enabled.
hardcode_into_libs=yes
- # Append ld.so.conf contents to the search path
+ # Ideally, we could use ldconfig to report *all* directores which are
+ # searched for libraries, however this is still not possible. Aside from not
+ # being certain /sbin/ldconfig is available, command
+ # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+ # even though it is searched at run-time. Try to do the best guess by
+ # appending ld.so.conf contents (and includes) to the search path.
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
@@ -2702,12 +2905,12 @@ netbsd*)
need_lib_prefix=no
need_version=no
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
dynamic_linker='NetBSD ld.elf_so'
fi
shlibpath_var=LD_LIBRARY_PATH
@@ -2717,7 +2920,7 @@ netbsd*)
newsos6)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
;;
@@ -2726,58 +2929,68 @@ newsos6)
version_type=qnx
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
dynamic_linker='ldqnx.so'
;;
-openbsd*)
+openbsd* | bitrig*)
version_type=sunos
- sys_lib_dlsearch_path_spec="/usr/lib"
+ sys_lib_dlsearch_path_spec=/usr/lib
need_lib_prefix=no
- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
- case $host_os in
- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
- *) need_version=no ;;
- esac
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- case $host_os in
- openbsd2.[[89]] | openbsd2.[[89]].*)
- shlibpath_overrides_runpath=no
- ;;
- *)
- shlibpath_overrides_runpath=yes
- ;;
- esac
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+ need_version=no
else
- shlibpath_overrides_runpath=yes
+ need_version=yes
fi
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
;;
os2*)
libname_spec='$name'
- shrext_cmds=".dll"
+ version_type=windows
+ shrext_cmds=.dll
+ need_version=no
need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
+ # OS/2 can only load a DLL with a base name of 8 characters or less.
+ soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+ v=$($ECHO $release$versuffix | tr -d .-);
+ n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+ $ECHO $n$v`$shared_ext'
+ library_names_spec='${libname}_dll.$libext'
dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
+ shlibpath_var=BEGINLIBPATH
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+ $install_prog $dir/$dlname \$dldir/$dlname~
+ chmod a+x \$dldir/$dlname~
+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+ fi'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $RM \$dlpath'
;;
osf3* | osf4* | osf5*)
version_type=osf
need_lib_prefix=no
need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='$libname$release$shared_ext$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
rdos*)
@@ -2788,8 +3001,8 @@ solaris*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
@@ -2799,11 +3012,11 @@ solaris*)
sunos4*)
version_type=sunos
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
need_lib_prefix=no
fi
need_version=yes
@@ -2811,8 +3024,8 @@ sunos4*)
sysv4 | sysv4.3*)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
case $host_vendor in
sni)
@@ -2833,24 +3046,24 @@ sysv4 | sysv4.3*)
;;
sysv4*MP*)
- if test -d /usr/nec ;then
+ if test -d /usr/nec; then
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
- soname_spec='$libname${shared_ext}.$major'
+ library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+ soname_spec='$libname$shared_ext.$major'
shlibpath_var=LD_LIBRARY_PATH
fi
;;
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- version_type=freebsd-elf
+ version_type=sco
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
else
sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
@@ -2868,7 +3081,7 @@ tpf*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -2876,8 +3089,8 @@ tpf*)
uts4*)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -2886,20 +3099,30 @@ uts4*)
;;
esac
AC_MSG_RESULT([$dynamic_linker])
-test "$dynamic_linker" = no && can_build_shared=no
+test no = "$dynamic_linker" && can_build_shared=no
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+ sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
- sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+ sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
fi
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
_LT_DECL([], [variables_saved_for_relink], [1],
[Variables whose values should be saved in libtool wrapper scripts and
restored at link time])
@@ -2932,39 +3155,41 @@ _LT_DECL([], [hardcode_into_libs], [0],
[Whether we should hardcode library paths into libraries])
_LT_DECL([], [sys_lib_search_path_spec], [2],
[Compile-time system search path for libraries])
-_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
- [Run-time system search path for libraries])
+_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2],
+ [Detected run-time system search path for libraries])
+_LT_DECL([], [configure_time_lt_sys_library_path], [2],
+ [Explicit LT_SYS_LIBRARY_PATH set during ./configure time])
])# _LT_SYS_DYNAMIC_LINKER
# _LT_PATH_TOOL_PREFIX(TOOL)
# --------------------------
-# find a file program which can recognize shared library
+# find a file program that can recognize shared library
AC_DEFUN([_LT_PATH_TOOL_PREFIX],
[m4_require([_LT_DECL_EGREP])dnl
AC_MSG_CHECKING([for $1])
AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
[case $MAGIC_CMD in
[[\\/*] | ?:[\\/]*])
- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+ lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
;;
*)
- lt_save_MAGIC_CMD="$MAGIC_CMD"
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_MAGIC_CMD=$MAGIC_CMD
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
dnl $ac_dummy forces splitting on constant user-supplied paths.
dnl POSIX.2 word splitting is done only on the output of word expansions,
dnl not every word. This closes a longstanding sh security hole.
ac_dummy="m4_if([$2], , $PATH, [$2])"
for ac_dir in $ac_dummy; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$1; then
- lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+ if test -f "$ac_dir/$1"; then
+ lt_cv_path_MAGIC_CMD=$ac_dir/"$1"
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ MAGIC_CMD=$lt_cv_path_MAGIC_CMD
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
:
@@ -2987,11 +3212,11 @@ _LT_EOF
break
fi
done
- IFS="$lt_save_ifs"
- MAGIC_CMD="$lt_save_MAGIC_CMD"
+ IFS=$lt_save_ifs
+ MAGIC_CMD=$lt_save_MAGIC_CMD
;;
esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
if test -n "$MAGIC_CMD"; then
AC_MSG_RESULT($MAGIC_CMD)
else
@@ -3009,7 +3234,7 @@ dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
# _LT_PATH_MAGIC
# --------------
-# find a file program which can recognize a shared library
+# find a file program that can recognize a shared library
m4_defun([_LT_PATH_MAGIC],
[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
if test -z "$lt_cv_path_MAGIC_CMD"; then
@@ -3036,16 +3261,16 @@ m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
AC_ARG_WITH([gnu-ld],
[AS_HELP_STRING([--with-gnu-ld],
[assume the C compiler uses GNU ld @<:@default=no@:>@])],
- [test "$withval" = no || with_gnu_ld=yes],
+ [test no = "$withval" || with_gnu_ld=yes],
[with_gnu_ld=no])dnl
ac_prog=ld
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
# Check if gcc -print-prog-name=ld gives a path.
AC_MSG_CHECKING([for ld used by $CC])
case $host in
*-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
+ # gcc leaves a trailing carriage return, which upsets mingw
ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
*)
ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
@@ -3059,7 +3284,7 @@ if test "$GCC" = yes; then
while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
done
- test -z "$LD" && LD="$ac_prog"
+ test -z "$LD" && LD=$ac_prog
;;
"")
# If it fails, then pretend we aren't using GCC.
@@ -3070,37 +3295,37 @@ if test "$GCC" = yes; then
with_gnu_ld=unknown
;;
esac
-elif test "$with_gnu_ld" = yes; then
+elif test yes = "$with_gnu_ld"; then
AC_MSG_CHECKING([for GNU ld])
else
AC_MSG_CHECKING([for non-GNU ld])
fi
AC_CACHE_VAL(lt_cv_path_LD,
[if test -z "$LD"; then
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
for ac_dir in $PATH; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
- lt_cv_path_LD="$ac_dir/$ac_prog"
+ lt_cv_path_LD=$ac_dir/$ac_prog
# Check to see if the program is GNU ld. I'd rather use --version,
# but apparently some variants of GNU ld only accept -v.
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
- test "$with_gnu_ld" != no && break
+ test no != "$with_gnu_ld" && break
;;
*)
- test "$with_gnu_ld" != yes && break
+ test yes != "$with_gnu_ld" && break
;;
esac
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
else
- lt_cv_path_LD="$LD" # Let the user override the test with a path.
+ lt_cv_path_LD=$LD # Let the user override the test with a path.
fi])
-LD="$lt_cv_path_LD"
+LD=$lt_cv_path_LD
if test -n "$LD"; then
AC_MSG_RESULT($LD)
else
@@ -3154,13 +3379,13 @@ esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
case $host_os in
cygwin* | mingw* | pw32* | cegcc*)
- if test "$GCC" != yes; then
+ if test yes != "$GCC"; then
reload_cmds=false
fi
;;
darwin*)
- if test "$GCC" = yes; then
- reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+ if test yes = "$GCC"; then
+ reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
else
reload_cmds='$LD$reload_flag -o $output$reload_objs'
fi
@@ -3171,6 +3396,43 @@ _LT_TAGDECL([], [reload_cmds], [2])dnl
])# _LT_CMD_RELOAD
+# _LT_PATH_DD
+# -----------
+# find a working dd
+m4_defun([_LT_PATH_DD],
+[AC_CACHE_CHECK([for a working dd], [ac_cv_path_lt_DD],
+[printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+: ${lt_DD:=$DD}
+AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd],
+[if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+ cmp -s conftest.i conftest.out \
+ && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+fi])
+rm -f conftest.i conftest2.i conftest.out])
+])# _LT_PATH_DD
+
+
+# _LT_CMD_TRUNCATE
+# ----------------
+# find command to truncate a binary pipe
+m4_defun([_LT_CMD_TRUNCATE],
+[m4_require([_LT_PATH_DD])
+AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin],
+[printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+lt_cv_truncate_bin=
+if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+ cmp -s conftest.i conftest.out \
+ && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+fi
+rm -f conftest.i conftest2.i conftest.out
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"])
+_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1],
+ [Command to truncate a binary pipe])
+])# _LT_CMD_TRUNCATE
+
+
# _LT_CHECK_MAGIC_METHOD
# ----------------------
# how to check for library dependencies
@@ -3186,13 +3448,13 @@ lt_cv_deplibs_check_method='unknown'
# Need to set the preceding variable on all platforms that support
# interlibrary dependencies.
# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
+# 'unknown' -- same as none, but documents that we really don't know.
# 'pass_all' -- all dependencies passed with no checks.
# 'test_compile' -- check by making test program.
# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
+# that responds to the $file_magic_cmd with a given extended regex.
+# If you have 'file' or equivalent on your system and you're not sure
+# whether 'pass_all' will *always* work, you probably want this one.
case $host_os in
aix[[4-9]]*)
@@ -3219,8 +3481,7 @@ mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
# func_win32_libid shell function, so use a weaker test based on 'objdump',
# unless we find 'file', for example because we are cross-compiling.
- # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
- if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+ if ( file / ) >/dev/null 2>&1; then
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
lt_cv_file_magic_cmd='func_win32_libid'
else
@@ -3256,10 +3517,6 @@ freebsd* | dragonfly*)
fi
;;
-gnu*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
haiku*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -3298,7 +3555,7 @@ irix5* | irix6* | nonstopux*)
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -3320,8 +3577,8 @@ newos6*)
lt_cv_deplibs_check_method=pass_all
;;
-openbsd*)
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+openbsd* | bitrig*)
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
else
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
@@ -3374,6 +3631,9 @@ sysv4 | sysv4.3*)
tpf*)
lt_cv_deplibs_check_method=pass_all
;;
+os2*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
esac
])
@@ -3414,33 +3674,38 @@ AC_DEFUN([LT_PATH_NM],
AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
[if test -n "$NM"; then
# Let the user override the test.
- lt_cv_path_NM="$NM"
+ lt_cv_path_NM=$NM
else
- lt_nm_to_check="${ac_tool_prefix}nm"
+ lt_nm_to_check=${ac_tool_prefix}nm
if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
lt_nm_to_check="$lt_nm_to_check nm"
fi
for lt_tmp_nm in $lt_nm_to_check; do
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
- tmp_nm="$ac_dir/$lt_tmp_nm"
- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+ tmp_nm=$ac_dir/$lt_tmp_nm
+ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
# Check to see if the nm accepts a BSD-compat flag.
- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+ # Adding the 'sed 1q' prevents false positives on HP-UX, which says:
# nm: unknown option "B" ignored
# Tru64's nm complains that /dev/null is an invalid object file
- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
- */dev/null* | *'Invalid file or object type'*)
+ # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+ case $build_os in
+ mingw*) lt_bad_file=conftest.nm/nofile ;;
+ *) lt_bad_file=/dev/null ;;
+ esac
+ case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+ *$lt_bad_file* | *'Invalid file or object type'*)
lt_cv_path_NM="$tmp_nm -B"
- break
+ break 2
;;
*)
case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
*/dev/null*)
lt_cv_path_NM="$tmp_nm -p"
- break
+ break 2
;;
*)
lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
@@ -3451,21 +3716,21 @@ else
esac
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
done
: ${lt_cv_path_NM=no}
fi])
-if test "$lt_cv_path_NM" != "no"; then
- NM="$lt_cv_path_NM"
+if test no != "$lt_cv_path_NM"; then
+ NM=$lt_cv_path_NM
else
# Didn't find any BSD compatible name lister, look for dumpbin.
if test -n "$DUMPBIN"; then :
# Let the user override the test.
else
AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
- case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+ case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
*COFF*)
- DUMPBIN="$DUMPBIN -symbols"
+ DUMPBIN="$DUMPBIN -symbols -headers"
;;
*)
DUMPBIN=:
@@ -3473,8 +3738,8 @@ else
esac
fi
AC_SUBST([DUMPBIN])
- if test "$DUMPBIN" != ":"; then
- NM="$DUMPBIN"
+ if test : != "$DUMPBIN"; then
+ NM=$DUMPBIN
fi
fi
test -z "$NM" && NM=nm
@@ -3520,8 +3785,8 @@ lt_cv_sharedlib_from_linklib_cmd,
case $host_os in
cygwin* | mingw* | pw32* | cegcc*)
- # two different shell functions defined in ltmain.sh
- # decide which to use based on capabilities of $DLLTOOL
+ # two different shell functions defined in ltmain.sh;
+ # decide which one to use based on capabilities of $DLLTOOL
case `$DLLTOOL --help 2>&1` in
*--identify-strict*)
lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
@@ -3533,7 +3798,7 @@ cygwin* | mingw* | pw32* | cegcc*)
;;
*)
# fallback: assume linklib IS sharedlib
- lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+ lt_cv_sharedlib_from_linklib_cmd=$ECHO
;;
esac
])
@@ -3560,13 +3825,28 @@ AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool
lt_cv_path_mainfest_tool=yes
fi
rm -f conftest*])
-if test "x$lt_cv_path_mainfest_tool" != xyes; then
+if test yes != "$lt_cv_path_mainfest_tool"; then
MANIFEST_TOOL=:
fi
_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
])# _LT_PATH_MANIFEST_TOOL
+# _LT_DLL_DEF_P([FILE])
+# ---------------------
+# True iff FILE is a Windows DLL '.def' file.
+# Keep in sync with func_dll_def_p in the libtool script
+AC_DEFUN([_LT_DLL_DEF_P],
+[dnl
+ test DEF = "`$SED -n dnl
+ -e '\''s/^[[ ]]*//'\'' dnl Strip leading whitespace
+ -e '\''/^\(;.*\)*$/d'\'' dnl Delete empty lines and comments
+ -e '\''s/^\(EXPORTS\|LIBRARY\)\([[ ]].*\)*$/DEF/p'\'' dnl
+ -e q dnl Only consider the first "real" line
+ $1`" dnl
+])# _LT_DLL_DEF_P
+
+
# LT_LIB_M
# --------
# check for math library
@@ -3578,11 +3858,11 @@ case $host in
# These system don't have libm, or don't need it
;;
*-ncr-sysv4.3*)
- AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+ AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw)
AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
;;
*)
- AC_CHECK_LIB(m, cos, LIBM="-lm")
+ AC_CHECK_LIB(m, cos, LIBM=-lm)
;;
esac
AC_SUBST([LIBM])
@@ -3601,7 +3881,7 @@ m4_defun([_LT_COMPILER_NO_RTTI],
_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
case $cc_basename in
nvcc*)
_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
@@ -3653,7 +3933,7 @@ cygwin* | mingw* | pw32* | cegcc*)
symcode='[[ABCDGISTW]]'
;;
hpux*)
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
symcode='[[ABCDEGRST]]'
fi
;;
@@ -3686,14 +3966,44 @@ case `$NM -V 2>&1` in
symcode='[[ABCDGIRSTW]]' ;;
esac
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+ # Gets list of data symbols to import.
+ lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
+ # Adjust the below global symbol transforms to fixup imported variables.
+ lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
+ lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'"
+ lt_c_name_lib_hook="\
+ -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\
+ -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'"
+else
+ # Disable hooks by default.
+ lt_cv_sys_global_symbol_to_import=
+ lt_cdecl_hook=
+ lt_c_name_hook=
+ lt_c_name_lib_hook=
+fi
+
# Transform an extracted symbol line into a proper C declaration.
# Some systems (esp. on ia64) link data and code symbols differently,
# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+lt_cv_sys_global_symbol_to_cdecl="sed -n"\
+$lt_cdecl_hook\
+" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
+$lt_c_name_hook\
+" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'"
+
+# Transform an extracted symbol line into symbol name with lib prefix and
+# symbol address.
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+$lt_c_name_lib_hook\
+" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'"
# Handle CRLF in mingw tool chain
opt_cr=
@@ -3711,21 +4021,24 @@ for ac_symprfx in "" "_"; do
# Write the raw and C identifiers.
if test "$lt_cv_nm_interface" = "MS dumpbin"; then
- # Fake it for dumpbin and say T for any non-static function
- # and D for any global variable.
+ # Fake it for dumpbin and say T for any non-static function,
+ # D for any global variable and I for any imported variable.
# Also find C++ and __fastcall symbols from MSVC++,
# which start with @ or ?.
lt_cv_sys_global_symbol_pipe="$AWK ['"\
" {last_section=section; section=\$ 3};"\
" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
+" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
+" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
" \$ 0!~/External *\|/{next};"\
" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
" {if(hide[section]) next};"\
-" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-" s[1]~/^[@?]/{print s[1], s[1]; next};"\
-" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
+" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
+" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
+" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
" ' prfx=^$ac_symprfx]"
else
lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
@@ -3765,11 +4078,11 @@ _LT_EOF
if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
cat <<_LT_EOF > conftest.$ac_ext
/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
relocations are performed -- see ld's documentation on pseudo-relocs. */
# define LT@&t at _DLSYM_CONST
-#elif defined(__osf__)
+#elif defined __osf__
/* This system does not cope well with relocations in const data. */
# define LT@&t at _DLSYM_CONST
#else
@@ -3795,7 +4108,7 @@ lt__PROGRAM__LTX_preloaded_symbols[[]] =
{
{ "@PROGRAM@", (void *) 0 },
_LT_EOF
- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+ $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
cat <<\_LT_EOF >> conftest.$ac_ext
{0, (void *) 0}
};
@@ -3815,9 +4128,9 @@ _LT_EOF
mv conftest.$ac_objext conftstm.$ac_objext
lt_globsym_save_LIBS=$LIBS
lt_globsym_save_CFLAGS=$CFLAGS
- LIBS="conftstm.$ac_objext"
+ LIBS=conftstm.$ac_objext
CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+ if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then
pipe_works=yes
fi
LIBS=$lt_globsym_save_LIBS
@@ -3838,7 +4151,7 @@ _LT_EOF
rm -rf conftest* conftst*
# Do not use the global_symbol_pipe unless it works.
- if test "$pipe_works" = yes; then
+ if test yes = "$pipe_works"; then
break
else
lt_cv_sys_global_symbol_pipe=
@@ -3865,12 +4178,16 @@ _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
[Take the output of nm and produce a listing of raw symbols and C names])
_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
[Transform the output of nm in a proper C declaration])
+_LT_DECL([global_symbol_to_import], [lt_cv_sys_global_symbol_to_import], [1],
+ [Transform the output of nm into a list of symbols to manually relocate])
_LT_DECL([global_symbol_to_c_name_address],
[lt_cv_sys_global_symbol_to_c_name_address], [1],
[Transform the output of nm in a C name address pair])
_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
[lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
[Transform the output of nm in a C name address pair when lib prefix is needed])
+_LT_DECL([nm_interface], [lt_cv_nm_interface], [1],
+ [The name lister interface])
_LT_DECL([], [nm_file_list_spec], [1],
[Specify filename containing input files for $NM])
]) # _LT_CMD_GLOBAL_SYMBOLS
@@ -3886,17 +4203,18 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)=
m4_if([$1], [CXX], [
# C++ specific cases for pic, static, wl, etc.
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
case $host_os in
aix*)
# All AIX code is PIC.
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
fi
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
amigaos*)
@@ -3907,8 +4225,8 @@ m4_if([$1], [CXX], [
;;
m68k)
# FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
+ # adding the '-m68020' flag to GCC prevents building anything better,
+ # like '-m68040'.
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
esac
@@ -3924,6 +4242,11 @@ m4_if([$1], [CXX], [
# (--disable-auto-import) libraries
m4_if([$1], [GCJ], [],
[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ case $host_os in
+ os2*)
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+ ;;
+ esac
;;
darwin* | rhapsody*)
# PIC is the default on this platform
@@ -3973,7 +4296,7 @@ m4_if([$1], [CXX], [
case $host_os in
aix[[4-9]]*)
# All AIX code is PIC.
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
else
@@ -4014,14 +4337,14 @@ m4_if([$1], [CXX], [
case $cc_basename in
CC*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
- if test "$host_cpu" != ia64; then
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
+ if test ia64 != "$host_cpu"; then
_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
fi
;;
aCC*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
case $host_cpu in
hppa*64*|ia64*)
# +Z the default
@@ -4050,7 +4373,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
KCC*)
# KAI C++ Compiler
@@ -4058,7 +4381,7 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
ecpc* )
- # old Intel C++ for x86_64 which still supported -KPIC.
+ # old Intel C++ for x86_64, which still supported -KPIC.
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
@@ -4203,17 +4526,18 @@ m4_if([$1], [CXX], [
fi
],
[
- if test "$GCC" = yes; then
+ if test yes = "$GCC"; then
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
case $host_os in
aix*)
# All AIX code is PIC.
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
fi
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
amigaos*)
@@ -4224,8 +4548,8 @@ m4_if([$1], [CXX], [
;;
m68k)
# FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
+ # adding the '-m68020' flag to GCC prevents building anything better,
+ # like '-m68040'.
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
esac
@@ -4242,6 +4566,11 @@ m4_if([$1], [CXX], [
# (--disable-auto-import) libraries
m4_if([$1], [GCJ], [],
[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ case $host_os in
+ os2*)
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+ ;;
+ esac
;;
darwin* | rhapsody*)
@@ -4312,7 +4641,7 @@ m4_if([$1], [CXX], [
case $host_os in
aix*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
else
@@ -4320,11 +4649,30 @@ m4_if([$1], [CXX], [
fi
;;
+ darwin* | rhapsody*)
+ # PIC is the default on this platform
+ # Common symbols not allowed in MH_DYLIB files
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+ case $cc_basename in
+ nagfor*)
+ # NAG Fortran compiler
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+ esac
+ ;;
+
mingw* | cygwin* | pw32* | os2* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
m4_if([$1], [GCJ], [],
[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ case $host_os in
+ os2*)
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+ ;;
+ esac
;;
hpux9* | hpux10* | hpux11*)
@@ -4340,7 +4688,7 @@ m4_if([$1], [CXX], [
;;
esac
# Is there a better lt_prog_compiler_static that works with the bundled CC?
- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
;;
irix5* | irix6* | nonstopux*)
@@ -4349,9 +4697,9 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
- # old Intel for x86_64 which still supported -KPIC.
+ # old Intel for x86_64, which still supported -KPIC.
ecc*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
@@ -4376,6 +4724,12 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
+ tcc*)
+ # Fabrice Bellard et al's Tiny C Compiler
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ ;;
pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
@@ -4473,7 +4827,7 @@ m4_if([$1], [CXX], [
;;
sysv4*MP*)
- if test -d /usr/nec ;then
+ if test -d /usr/nec; then
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
fi
@@ -4502,7 +4856,7 @@ m4_if([$1], [CXX], [
fi
])
case $host_os in
- # For platforms which do not support PIC, -DPIC is meaningless:
+ # For platforms that do not support PIC, -DPIC is meaningless:
*djgpp*)
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
;;
@@ -4568,17 +4922,21 @@ m4_if([$1], [CXX], [
case $host_os in
aix[[4-9]]*)
# If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- # Also, AIX nm treats weak defined symbols like other global defined
- # symbols, whereas GNU nm marks them as "W".
+ # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+ # Without the "-l" option, or with the "-B" option, AIX nm treats
+ # weak defined symbols like other global defined symbols, whereas
+ # GNU nm marks them as "W".
+ # While the 'weak' keyword is ignored in the Export File, we need
+ # it in the Import File for the 'aix-soname' feature, so we have
+ # to replace the "-B" option with "-P" for AIX nm.
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
else
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
fi
;;
pw32*)
- _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+ _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds
;;
cygwin* | mingw* | cegcc*)
case $cc_basename in
@@ -4624,9 +4982,9 @@ m4_if([$1], [CXX], [
# included in the symbol list
_LT_TAGVAR(include_expsyms, $1)=
# exclude_expsyms can be an extended regexp of symbols to exclude
- # it will be wrapped by ` (' and `)$', so one must not match beginning or
- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
- # as well as any symbol that contains `d'.
+ # it will be wrapped by ' (' and ')$', so one must not match beginning or
+ # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
+ # as well as any symbol that contains 'd'.
_LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
# platforms (ab)use it in PIC code, but their linkers get confused if
@@ -4642,7 +5000,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
# FIXME: the MSVC++ port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
- if test "$GCC" != yes; then
+ if test yes != "$GCC"; then
with_gnu_ld=no
fi
;;
@@ -4650,7 +5008,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
# we just hope/assume this is gcc and not c89 (= MSVC++)
with_gnu_ld=yes
;;
- openbsd*)
+ openbsd* | bitrig*)
with_gnu_ld=no
;;
esac
@@ -4660,7 +5018,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
# On some targets, GNU ld is compatible enough with the native linker
# that we're better off using the native interface for both.
lt_use_gnu_ld_interface=no
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
case $host_os in
aix*)
# The AIX port of GNU ld has always aspired to compatibility
@@ -4682,24 +5040,24 @@ dnl Note also adjust exclude_expsyms for C++ above.
esac
fi
- if test "$lt_use_gnu_ld_interface" = yes; then
+ if test yes = "$lt_use_gnu_ld_interface"; then
# If archive_cmds runs LD, not CC, wlarc should be empty
- wlarc='${wl}'
+ wlarc='$wl'
# Set some defaults for GNU ld with shared library support. These
# are reset later if shared libraries are not supported. Putting them
# here allows them to be overridden if necessary.
runpath_var=LD_RUN_PATH
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
# ancient GNU ld didn't support --whole-archive et. al.
if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
else
_LT_TAGVAR(whole_archive_flag_spec, $1)=
fi
supports_anon_versioning=no
- case `$LD -v 2>&1` in
+ case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in
*GNU\ gold*) supports_anon_versioning=yes ;;
*\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
@@ -4712,7 +5070,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
case $host_os in
aix[[3-9]]*)
# On AIX/PPC, the GNU linker is very broken
- if test "$host_cpu" != ia64; then
+ if test ia64 != "$host_cpu"; then
_LT_TAGVAR(ld_shlibs, $1)=no
cat <<_LT_EOF 1>&2
@@ -4731,7 +5089,7 @@ _LT_EOF
case $host_cpu in
powerpc)
# see comment about AmigaOS4 .so support
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)=''
;;
m68k)
@@ -4747,7 +5105,7 @@ _LT_EOF
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
- _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
@@ -4757,7 +5115,7 @@ _LT_EOF
# _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_TAGVAR(always_export_symbols, $1)=no
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -4765,61 +5123,89 @@ _LT_EOF
_LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is; otherwise, prepend...
- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- cp $export_symbols $output_objdir/$soname.def;
- else
- echo EXPORTS > $output_objdir/$soname.def;
- cat $export_symbols >> $output_objdir/$soname.def;
- fi~
- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ # If the export-symbols file already is a .def file, use it as
+ # is; otherwise, prepend EXPORTS...
+ _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+ cp $export_symbols $output_objdir/$soname.def;
+ else
+ echo EXPORTS > $output_objdir/$soname.def;
+ cat $export_symbols >> $output_objdir/$soname.def;
+ fi~
+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
;;
haiku*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
+ os2*)
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ shrext_cmds=.dll
+ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ ;;
+
interix[[3-9]]*)
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
# Instead, shared libraries are loaded at an image base (0x10000000 by
# default) and relocated if they conflict, which is a slow very memory
# consuming and fragmenting process. To avoid this, we pick a random,
# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
# time. Moving up from 0x10000000 also allows more sbrk(2) space.
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
tmp_diet=no
- if test "$host_os" = linux-dietlibc; then
+ if test linux-dietlibc = "$host_os"; then
case $cc_basename in
diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn)
esac
fi
if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
- && test "$tmp_diet" = no
+ && test no = "$tmp_diet"
then
tmp_addflag=' $pic_flag'
tmp_sharedflag='-shared'
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
tmp_addflag=' $pic_flag'
;;
pgf77* | pgf90* | pgf95* | pgfortran*)
# Portland Group f77 and f90 compilers
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
@@ -4830,42 +5216,47 @@ _LT_EOF
lf95*) # Lahey Fortran 8.1
_LT_TAGVAR(whole_archive_flag_spec, $1)=
tmp_sharedflag='--shared' ;;
+ nagfor*) # NAGFOR 5.3
+ tmp_sharedflag='-Wl,-shared' ;;
xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
tmp_sharedflag='-qmkshrobj'
tmp_addflag= ;;
nvcc*) # Cuda Compiler Driver 2.2
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
_LT_TAGVAR(compiler_needs_object, $1)=yes
;;
esac
case `$CC -V 2>&1 | sed 5q` in
*Sun\ C*) # Sun C 5.9
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
_LT_TAGVAR(compiler_needs_object, $1)=yes
tmp_sharedflag='-G' ;;
*Sun\ F*) # Sun Fortran 8.3
tmp_sharedflag='-G' ;;
esac
- _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
+ if test yes = "$supports_anon_versioning"; then
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
fi
case $cc_basename in
+ tcc*)
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic'
+ ;;
xlf* | bgf* | bgxlf* | mpixlf*)
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
_LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
_LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
+ if test yes = "$supports_anon_versioning"; then
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- echo "local: *; };" >> $output_objdir/$libname.ver~
- $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
fi
;;
esac
@@ -4879,8 +5270,8 @@ _LT_EOF
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
fi
;;
@@ -4898,8 +5289,8 @@ _LT_EOF
_LT_EOF
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
@@ -4911,7 +5302,7 @@ _LT_EOF
_LT_TAGVAR(ld_shlibs, $1)=no
cat <<_LT_EOF 1>&2
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
*** reliably create shared libraries on SCO systems. Therefore, libtool
*** is disabling shared libraries support. We urge you to upgrade GNU
*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
@@ -4926,9 +5317,9 @@ _LT_EOF
# DT_RUNPATH tag from executables and libraries. But doing so
# requires that you compile everything twice, which is a pain.
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
@@ -4945,15 +5336,15 @@ _LT_EOF
*)
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
;;
esac
- if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
+ if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then
runpath_var=
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
_LT_TAGVAR(export_dynamic_flag_spec, $1)=
@@ -4969,7 +5360,7 @@ _LT_EOF
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
_LT_TAGVAR(hardcode_minus_L, $1)=yes
- if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+ if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
_LT_TAGVAR(hardcode_direct, $1)=unsupported
@@ -4977,34 +5368,57 @@ _LT_EOF
;;
aix[[4-9]]*)
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
aix_use_runtimelinking=no
exp_sym_flag='-Bexport'
- no_entry_flag=""
+ no_entry_flag=
else
# If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- # Also, AIX nm treats weak defined symbols like other global
- # defined symbols, whereas GNU nm marks them as "W".
+ # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+ # Without the "-l" option, or with the "-B" option, AIX nm treats
+ # weak defined symbols like other global defined symbols, whereas
+ # GNU nm marks them as "W".
+ # While the 'weak' keyword is ignored in the Export File, we need
+ # it in the Import File for the 'aix-soname' feature, so we have
+ # to replace the "-B" option with "-P" for AIX nm.
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
else
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
fi
aix_use_runtimelinking=no
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
+ # have runtime linking enabled, and use it for executables.
+ # For shared libraries, we enable/disable runtime linking
+ # depending on the kind of the shared library created -
+ # when "with_aix_soname,aix_use_runtimelinking" is:
+ # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
+ # "aix,yes" lib.so shared, rtl:yes, for executables
+ # lib.a static archive
+ # "both,no" lib.so.V(shr.o) shared, rtl:yes
+ # lib.a(lib.so.V) shared, rtl:no, for executables
+ # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a(lib.so.V) shared, rtl:no
+ # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a static archive
case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
for ld_flag in $LDFLAGS; do
- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
aix_use_runtimelinking=yes
break
fi
done
+ if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+ # With aix-soname=svr4, we create the lib.so.V shared archives only,
+ # so we don't have lib.a shared libs to link our executables.
+ # We have to force runtime linking in this case.
+ aix_use_runtimelinking=yes
+ LDFLAGS="$LDFLAGS -Wl,-brtl"
+ fi
;;
esac
@@ -5023,13 +5437,21 @@ _LT_EOF
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
_LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+ _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+ case $with_aix_soname,$aix_use_runtimelinking in
+ aix,*) ;; # traditional, no import file
+ svr4,* | *,yes) # use import file
+ # The Import File defines what to hardcode.
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+ ;;
+ esac
- if test "$GCC" = yes; then
+ if test yes = "$GCC"; then
case $host_os in aix4.[[012]]|aix4.[[012]].*)
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
- collect2name=`${CC} -print-prog-name=collect2`
+ collect2name=`$CC -print-prog-name=collect2`
if test -f "$collect2name" &&
strings "$collect2name" | $GREP resolve_lib_name >/dev/null
then
@@ -5048,61 +5470,80 @@ _LT_EOF
;;
esac
shared_flag='-shared'
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag="$shared_flag "'${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag="$shared_flag "'$wl-G'
fi
+ # Need to ensure runtime linking is disabled for the traditional
+ # shared library, or the linker may eventually find shared libraries
+ # /with/ Import File - we do not want to mix them.
+ shared_flag_aix='-shared'
+ shared_flag_svr4='-shared $wl-G'
else
# not using gcc
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag='$wl-G'
else
- shared_flag='${wl}-bM:SRE'
+ shared_flag='$wl-bM:SRE'
fi
+ shared_flag_aix='$wl-bM:SRE'
+ shared_flag_svr4='$wl-G'
fi
fi
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
# It seems that -bexpall does not export symbols beginning with
# underscore (_), so it is better to generate a list of symbols to export.
_LT_TAGVAR(always_export_symbols, $1)=yes
- if test "$aix_use_runtimelinking" = yes; then
+ if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
_LT_SYS_MODULE_PATH_AIX([$1])
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
else
- if test "$host_cpu" = ia64; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+ if test ia64 = "$host_cpu"; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
_LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an
# empty executable.
_LT_SYS_MODULE_PATH_AIX([$1])
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
# Warning - without using the other run time loading flags,
# -berok will link without error, but may produce a broken library.
- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
- if test "$with_gnu_ld" = yes; then
+ _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
+ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
+ if test yes = "$with_gnu_ld"; then
# We only use this code for GNU lds that support --whole-archive.
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
else
# Exported symbols can be pulled into shared objects from archives
_LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
- # This is similar to how AIX traditionally builds its shared libraries.
- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+ # -brtl affects multiple linker settings, -berok does not and is overridden later
+ compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
+ if test svr4 != "$with_aix_soname"; then
+ # This is similar to how AIX traditionally builds its shared libraries.
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+ fi
+ if test aix != "$with_aix_soname"; then
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+ else
+ # used by -dlpreopen to get the symbols
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
+ fi
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
fi
fi
;;
@@ -5111,7 +5552,7 @@ _LT_EOF
case $host_cpu in
powerpc)
# see comment about AmigaOS4 .so support
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)=''
;;
m68k)
@@ -5141,16 +5582,17 @@ _LT_EOF
# Tell ltmain to make .lib files, not .a files.
libext=lib
# Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
+ shrext_cmds=.dll
# FIXME: Setting linknames here is a bad hack.
- _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
- else
- sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
- fi~
- $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
- linknames='
+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+ _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+ cp "$export_symbols" "$output_objdir/$soname.def";
+ echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+ else
+ $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+ fi~
+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+ linknames='
# The linker will not automatically build a static lib if we build a DLL.
# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -5159,18 +5601,18 @@ _LT_EOF
# Don't use ranlib
_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
- lt_tool_outputfile="@TOOL_OUTPUT@"~
- case $lt_outputfile in
- *.exe|*.EXE) ;;
- *)
- lt_outputfile="$lt_outputfile.exe"
- lt_tool_outputfile="$lt_tool_outputfile.exe"
- ;;
- esac~
- if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
- $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
- $RM "$lt_outputfile.manifest";
- fi'
+ lt_tool_outputfile="@TOOL_OUTPUT@"~
+ case $lt_outputfile in
+ *.exe|*.EXE) ;;
+ *)
+ lt_outputfile=$lt_outputfile.exe
+ lt_tool_outputfile=$lt_tool_outputfile.exe
+ ;;
+ esac~
+ if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+ $RM "$lt_outputfile.manifest";
+ fi'
;;
*)
# Assume MSVC wrapper
@@ -5179,7 +5621,7 @@ _LT_EOF
# Tell ltmain to make .lib files, not .a files.
libext=lib
# Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
+ shrext_cmds=.dll
# FIXME: Setting linknames here is a bad hack.
_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
# The linker will automatically build a .lib file if we build a DLL.
@@ -5229,33 +5671,33 @@ _LT_EOF
;;
hpux9*)
- if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
else
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
fi
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_TAGVAR(hardcode_direct, $1)=yes
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
_LT_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
;;
hpux10*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes,no = "$GCC,$with_gnu_ld"; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
else
_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
fi
- if test "$with_gnu_ld" = no; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ if test no = "$with_gnu_ld"; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
_LT_TAGVAR(hardcode_minus_L, $1)=yes
@@ -5263,25 +5705,25 @@ _LT_EOF
;;
hpux11*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+ if test yes,no = "$GCC,$with_gnu_ld"; then
case $host_cpu in
hppa*64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
ia64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
else
case $host_cpu in
hppa*64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
ia64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
m4_if($1, [], [
@@ -5289,14 +5731,14 @@ _LT_EOF
# (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
_LT_LINKER_OPTION([if $CC understands -b],
_LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
- [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
+ [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
[_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
- [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
+ [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
;;
esac
fi
- if test "$with_gnu_ld" = no; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ if test no = "$with_gnu_ld"; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
case $host_cpu in
@@ -5307,7 +5749,7 @@ _LT_EOF
*)
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
@@ -5318,16 +5760,16 @@ _LT_EOF
;;
irix5* | irix6* | nonstopux*)
- if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
# Try to use the -exported_symbol ld option, if it does not
# work, assume that -exports_file does not work either and
# implicitly export all symbols.
# This should be the same for all languages, so no per-tag cache variable.
AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
[lt_cv_irix_exported_symbol],
- [save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+ [save_LDFLAGS=$LDFLAGS
+ LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
AC_LINK_IFELSE(
[AC_LANG_SOURCE(
[AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
@@ -5340,21 +5782,31 @@ _LT_EOF
end]])])],
[lt_cv_irix_exported_symbol=yes],
[lt_cv_irix_exported_symbol=no])
- LDFLAGS="$save_LDFLAGS"])
- if test "$lt_cv_irix_exported_symbol" = yes; then
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+ LDFLAGS=$save_LDFLAGS])
+ if test yes = "$lt_cv_irix_exported_symbol"; then
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
fi
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)='no'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_TAGVAR(inherit_rpath, $1)=yes
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
+ linux*)
+ case $cc_basename in
+ tcc*)
+ # Fabrice Bellard et al's Tiny C Compiler
+ _LT_TAGVAR(ld_shlibs, $1)=yes
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ ;;
+
netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
@@ -5369,7 +5821,7 @@ _LT_EOF
newsos6)
_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
_LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
@@ -5377,27 +5829,19 @@ _LT_EOF
*nto* | *qnx*)
;;
- openbsd*)
+ openbsd* | bitrig*)
if test -f /usr/libexec/ld.so; then
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
else
- case $host_os in
- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- ;;
- *)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- ;;
- esac
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
fi
else
_LT_TAGVAR(ld_shlibs, $1)=no
@@ -5408,33 +5852,53 @@ _LT_EOF
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_TAGVAR(hardcode_minus_L, $1)=yes
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
- _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+ shrext_cmds=.dll
+ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
;;
osf3*)
- if test "$GCC" = yes; then
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
else
_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)='no'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
;;
osf4* | osf5*) # as osf3* with the addition of -msym flag
- if test "$GCC" = yes; then
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
else
_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+ $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
# Both c and cxx compiler support -rpath directly
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -5445,24 +5909,24 @@ _LT_EOF
solaris*)
_LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
- if test "$GCC" = yes; then
- wlarc='${wl}'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes = "$GCC"; then
+ wlarc='$wl'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
else
case `$CC -V 2>&1` in
*"Compilers 5.0"*)
wlarc=''
- _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+ $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
;;
*)
- wlarc='${wl}'
- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ wlarc='$wl'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
;;
esac
fi
@@ -5472,11 +5936,11 @@ _LT_EOF
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*)
# The compiler driver will combine and reorder linker options,
- # but understands `-z linker_flag'. GCC discards it without `$wl',
+ # but understands '-z linker_flag'. GCC discards it without '$wl',
# but is careful enough not to reorder.
# Supported since Solaris 2.6 (maybe 2.5.1?)
- if test "$GCC" = yes; then
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
else
_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
fi
@@ -5486,10 +5950,10 @@ _LT_EOF
;;
sunos4*)
- if test "x$host_vendor" = xsequent; then
+ if test sequent = "$host_vendor"; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
else
_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
@@ -5538,43 +6002,43 @@ _LT_EOF
;;
sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
runpath_var='LD_RUN_PATH'
- if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
fi
;;
sysv5* | sco3.2v5* | sco5v6*)
- # Note: We can NOT use -z defs as we might desire, because we do not
+ # Note: We CANNOT use -z defs as we might desire, because we do not
# link with -lc, and that would cause any symbols used from libc to
# always be unresolved, which means just about no library would
# ever link correctly. If we're not using GNU ld we use -z text
# though, which does catch some bad symbols but isn't as heavy-handed
# as -z defs.
- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
- _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+ _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+ _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
_LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
runpath_var='LD_RUN_PATH'
- if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
fi
;;
@@ -5589,17 +6053,17 @@ _LT_EOF
;;
esac
- if test x$host_vendor = xsni; then
+ if test sni = "$host_vendor"; then
case $host in
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym'
;;
esac
fi
fi
])
AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
@@ -5616,7 +6080,7 @@ x|xyes)
# Assume -lc should be added
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
- if test "$enable_shared" = yes && test "$GCC" = yes; then
+ if test yes,yes = "$GCC,$enable_shared"; then
case $_LT_TAGVAR(archive_cmds, $1) in
*'~'*)
# FIXME: we may have to deal with multi-command sequences.
@@ -5696,12 +6160,12 @@ _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
_LT_TAGDECL([], [hardcode_libdir_separator], [1],
[Whether we need a single "-rpath" flag with a separated argument])
_LT_TAGDECL([], [hardcode_direct], [0],
- [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+ [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
DIR into the resulting binary])
_LT_TAGDECL([], [hardcode_direct_absolute], [0],
- [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+ [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
DIR into the resulting binary and the resulting library dependency is
- "absolute", i.e impossible to change by setting ${shlibpath_var} if the
+ "absolute", i.e impossible to change by setting $shlibpath_var if the
library is relocated])
_LT_TAGDECL([], [hardcode_minus_L], [0],
[Set to "yes" if using the -LDIR flag during linking hardcodes DIR
@@ -5742,10 +6206,10 @@ dnl [Compiler flag to generate thread safe objects])
# ------------------------
# Ensure that the configuration variables for a C compiler are suitably
# defined. These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
+# the compiler configuration to 'libtool'.
m4_defun([_LT_LANG_C_CONFIG],
[m4_require([_LT_DECL_EGREP])dnl
-lt_save_CC="$CC"
+lt_save_CC=$CC
AC_LANG_PUSH(C)
# Source file extension for C test sources.
@@ -5785,18 +6249,18 @@ if test -n "$compiler"; then
LT_SYS_DLOPEN_SELF
_LT_CMD_STRIPLIB
- # Report which library types will actually be built
+ # Report what library types will actually be built
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
AC_MSG_CHECKING([whether to build shared libraries])
- test "$can_build_shared" = "no" && enable_shared=no
+ test no = "$can_build_shared" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
case $host_os in
aix3*)
- test "$enable_shared" = yes && enable_static=no
+ test yes = "$enable_shared" && enable_static=no
if test -n "$RANLIB"; then
archive_cmds="$archive_cmds~\$RANLIB \$lib"
postinstall_cmds='$RANLIB $lib'
@@ -5804,8 +6268,12 @@ if test -n "$compiler"; then
;;
aix[[4-9]]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
+ if test ia64 != "$host_cpu"; then
+ case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+ yes,aix,yes) ;; # shared object as lib.so file only
+ yes,svr4,*) ;; # shared object as lib.so archive member only
+ yes,*) enable_static=no ;; # shared object in lib.a archive as well
+ esac
fi
;;
esac
@@ -5813,13 +6281,13 @@ if test -n "$compiler"; then
AC_MSG_CHECKING([whether to build static libraries])
# Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
+ test yes = "$enable_shared" || enable_static=yes
AC_MSG_RESULT([$enable_static])
_LT_CONFIG($1)
fi
AC_LANG_POP
-CC="$lt_save_CC"
+CC=$lt_save_CC
])# _LT_LANG_C_CONFIG
@@ -5827,14 +6295,14 @@ CC="$lt_save_CC"
# --------------------------
# Ensure that the configuration variables for a C++ compiler are suitably
# defined. These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
+# the compiler configuration to 'libtool'.
m4_defun([_LT_LANG_CXX_CONFIG],
[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_DECL_EGREP])dnl
m4_require([_LT_PATH_MANIFEST_TOOL])dnl
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
- (test "X$CXX" != "Xg++"))) ; then
+if test -n "$CXX" && ( test no != "$CXX" &&
+ ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
+ (test g++ != "$CXX"))); then
AC_PROG_CXXCPP
else
_lt_caught_CXX_error=yes
@@ -5876,7 +6344,7 @@ _LT_TAGVAR(objext, $1)=$objext
# the CXX compiler isn't working. Some variables (like enable_shared)
# are currently assumed to apply to all compilers on this platform,
# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_caught_CXX_error" != yes; then
+if test yes != "$_lt_caught_CXX_error"; then
# Code to be used in simple compile tests
lt_simple_compile_test_code="int some_variable = 0;"
@@ -5918,35 +6386,35 @@ if test "$_lt_caught_CXX_error" != yes; then
if test -n "$compiler"; then
# We don't want -fno-exception when compiling C++ code, so set the
# no_builtin_flag separately
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
else
_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
fi
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
# Set up default GNU C++ configuration
LT_PATH_LD
# Check if GNU C++ uses GNU ld as the underlying linker, since the
# archiving commands below assume that GNU ld is being used.
- if test "$with_gnu_ld" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ if test yes = "$with_gnu_ld"; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
# If archive_cmds runs LD, not CC, wlarc should be empty
# XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
# investigate it a little bit more. (MM)
- wlarc='${wl}'
+ wlarc='$wl'
# ancient GNU ld didn't support --whole-archive et. al.
if eval "`$CC -print-prog-name=ld` --help 2>&1" |
$GREP 'no-whole-archive' > /dev/null; then
- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
else
_LT_TAGVAR(whole_archive_flag_spec, $1)=
fi
@@ -5982,18 +6450,30 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(ld_shlibs, $1)=no
;;
aix[[4-9]]*)
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
aix_use_runtimelinking=no
exp_sym_flag='-Bexport'
- no_entry_flag=""
+ no_entry_flag=
else
aix_use_runtimelinking=no
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
+ # have runtime linking enabled, and use it for executables.
+ # For shared libraries, we enable/disable runtime linking
+ # depending on the kind of the shared library created -
+ # when "with_aix_soname,aix_use_runtimelinking" is:
+ # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
+ # "aix,yes" lib.so shared, rtl:yes, for executables
+ # lib.a static archive
+ # "both,no" lib.so.V(shr.o) shared, rtl:yes
+ # lib.a(lib.so.V) shared, rtl:no, for executables
+ # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a(lib.so.V) shared, rtl:no
+ # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a static archive
case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
for ld_flag in $LDFLAGS; do
case $ld_flag in
@@ -6003,6 +6483,13 @@ if test "$_lt_caught_CXX_error" != yes; then
;;
esac
done
+ if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+ # With aix-soname=svr4, we create the lib.so.V shared archives only,
+ # so we don't have lib.a shared libs to link our executables.
+ # We have to force runtime linking in this case.
+ aix_use_runtimelinking=yes
+ LDFLAGS="$LDFLAGS -Wl,-brtl"
+ fi
;;
esac
@@ -6021,13 +6508,21 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
_LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+ _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+ case $with_aix_soname,$aix_use_runtimelinking in
+ aix,*) ;; # no import file
+ svr4,* | *,yes) # use import file
+ # The Import File defines what to hardcode.
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+ ;;
+ esac
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
case $host_os in aix4.[[012]]|aix4.[[012]].*)
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
- collect2name=`${CC} -print-prog-name=collect2`
+ collect2name=`$CC -print-prog-name=collect2`
if test -f "$collect2name" &&
strings "$collect2name" | $GREP resolve_lib_name >/dev/null
then
@@ -6045,64 +6540,84 @@ if test "$_lt_caught_CXX_error" != yes; then
fi
esac
shared_flag='-shared'
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag="$shared_flag "'${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag=$shared_flag' $wl-G'
fi
+ # Need to ensure runtime linking is disabled for the traditional
+ # shared library, or the linker may eventually find shared libraries
+ # /with/ Import File - we do not want to mix them.
+ shared_flag_aix='-shared'
+ shared_flag_svr4='-shared $wl-G'
else
# not using gcc
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag='$wl-G'
else
- shared_flag='${wl}-bM:SRE'
+ shared_flag='$wl-bM:SRE'
fi
+ shared_flag_aix='$wl-bM:SRE'
+ shared_flag_svr4='$wl-G'
fi
fi
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
# It seems that -bexpall does not export symbols beginning with
# underscore (_), so it is better to generate a list of symbols to
# export.
_LT_TAGVAR(always_export_symbols, $1)=yes
- if test "$aix_use_runtimelinking" = yes; then
+ if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
- _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+ # The "-G" linker flag allows undefined symbols.
+ _LT_TAGVAR(no_undefined_flag, $1)='-bernotok'
# Determine the default libpath from the value encoded in an empty
# executable.
_LT_SYS_MODULE_PATH_AIX([$1])
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
else
- if test "$host_cpu" = ia64; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+ if test ia64 = "$host_cpu"; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
_LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an
# empty executable.
_LT_SYS_MODULE_PATH_AIX([$1])
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
# Warning - without using the other run time loading flags,
# -berok will link without error, but may produce a broken library.
- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
- if test "$with_gnu_ld" = yes; then
+ _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
+ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
+ if test yes = "$with_gnu_ld"; then
# We only use this code for GNU lds that support --whole-archive.
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
else
# Exported symbols can be pulled into shared objects from archives
_LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
- # This is similar to how AIX traditionally builds its shared
- # libraries.
- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+ # -brtl affects multiple linker settings, -berok does not and is overridden later
+ compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
+ if test svr4 != "$with_aix_soname"; then
+ # This is similar to how AIX traditionally builds its shared
+ # libraries. Need -bnortl late, we may have -brtl in LDFLAGS.
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+ fi
+ if test aix != "$with_aix_soname"; then
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+ else
+ # used by -dlpreopen to get the symbols
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
+ fi
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
fi
fi
;;
@@ -6112,7 +6627,7 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
- _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
@@ -6140,57 +6655,58 @@ if test "$_lt_caught_CXX_error" != yes; then
# Tell ltmain to make .lib files, not .a files.
libext=lib
# Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
+ shrext_cmds=.dll
# FIXME: Setting linknames here is a bad hack.
- _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
- else
- $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
- fi~
- $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
- linknames='
+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+ _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+ cp "$export_symbols" "$output_objdir/$soname.def";
+ echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+ else
+ $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+ fi~
+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+ linknames='
# The linker will not automatically build a static lib if we build a DLL.
# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
# Don't use ranlib
_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
- lt_tool_outputfile="@TOOL_OUTPUT@"~
- case $lt_outputfile in
- *.exe|*.EXE) ;;
- *)
- lt_outputfile="$lt_outputfile.exe"
- lt_tool_outputfile="$lt_tool_outputfile.exe"
- ;;
- esac~
- func_to_tool_file "$lt_outputfile"~
- if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
- $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
- $RM "$lt_outputfile.manifest";
- fi'
+ lt_tool_outputfile="@TOOL_OUTPUT@"~
+ case $lt_outputfile in
+ *.exe|*.EXE) ;;
+ *)
+ lt_outputfile=$lt_outputfile.exe
+ lt_tool_outputfile=$lt_tool_outputfile.exe
+ ;;
+ esac~
+ func_to_tool_file "$lt_outputfile"~
+ if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+ $RM "$lt_outputfile.manifest";
+ fi'
;;
*)
# g++
# _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_TAGVAR(always_export_symbols, $1)=no
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is; otherwise, prepend...
- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- cp $export_symbols $output_objdir/$soname.def;
- else
- echo EXPORTS > $output_objdir/$soname.def;
- cat $export_symbols >> $output_objdir/$soname.def;
- fi~
- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ # If the export-symbols file already is a .def file, use it as
+ # is; otherwise, prepend EXPORTS...
+ _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+ cp $export_symbols $output_objdir/$soname.def;
+ else
+ echo EXPORTS > $output_objdir/$soname.def;
+ cat $export_symbols >> $output_objdir/$soname.def;
+ fi~
+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
@@ -6201,6 +6717,34 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_DARWIN_LINKER_FEATURES($1)
;;
+ os2*)
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ shrext_cmds=.dll
+ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ ;;
+
dgux*)
case $cc_basename in
ec++*)
@@ -6235,18 +6779,15 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(ld_shlibs, $1)=yes
;;
- gnu*)
- ;;
-
haiku*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
hpux9*)
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
# but as the default
@@ -6258,7 +6799,7 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(ld_shlibs, $1)=no
;;
aCC*)
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -6267,11 +6808,11 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
;;
*)
- if test "$GXX" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ if test yes = "$GXX"; then
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
else
# FIXME: insert proper C++ library support
_LT_TAGVAR(ld_shlibs, $1)=no
@@ -6281,15 +6822,15 @@ if test "$_lt_caught_CXX_error" != yes; then
;;
hpux10*|hpux11*)
- if test $with_gnu_ld = no; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ if test no = "$with_gnu_ld"; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
case $host_cpu in
hppa*64*|ia64*)
;;
*)
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
;;
esac
fi
@@ -6315,13 +6856,13 @@ if test "$_lt_caught_CXX_error" != yes; then
aCC*)
case $host_cpu in
hppa*64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
ia64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
esac
# Commands to make compiler produce verbose output that lists
@@ -6332,20 +6873,20 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
;;
*)
- if test "$GXX" = yes; then
- if test $with_gnu_ld = no; then
+ if test yes = "$GXX"; then
+ if test no = "$with_gnu_ld"; then
case $host_cpu in
hppa*64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
ia64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
esac
fi
@@ -6360,22 +6901,22 @@ if test "$_lt_caught_CXX_error" != yes; then
interix[[3-9]]*)
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
# Instead, shared libraries are loaded at an image base (0x10000000 by
# default) and relocated if they conflict, which is a slow very memory
# consuming and fragmenting process. To avoid this, we pick a random,
# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
# time. Moving up from 0x10000000 also allows more sbrk(2) space.
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
irix5* | irix6*)
case $cc_basename in
CC*)
# SGI C++
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
@@ -6384,22 +6925,22 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
;;
*)
- if test "$GXX" = yes; then
- if test "$with_gnu_ld" = no; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ if test yes = "$GXX"; then
+ if test no = "$with_gnu_ld"; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib'
fi
fi
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
esac
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_TAGVAR(inherit_rpath, $1)=yes
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -6407,8 +6948,8 @@ if test "$_lt_caught_CXX_error" != yes; then
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
- _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+ _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -6417,10 +6958,10 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
# Archives containing C++ object files must be created using
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
@@ -6434,59 +6975,59 @@ if test "$_lt_caught_CXX_error" != yes; then
# earlier do not add the objects themselves.
case `$CC -V 2>&1` in
*"Version 7."*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
;;
*) # Version 8.0 or newer
tmp_idyn=
case $host_cpu in
ia64*) tmp_idyn=' -i_dynamic';;
esac
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
;;
esac
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
;;
pgCC* | pgcpp*)
# Portland Group C++ compiler
case `$CC -V` in
*pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
_LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
- compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
_LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
- $RANLIB $oldlib'
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+ $RANLIB $oldlib'
_LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
;;
*) # Version 6 and above use weak symbols
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
;;
esac
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
;;
cxx*)
# Compaq C++
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols'
runpath_var=LD_RUN_PATH
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -6500,18 +7041,18 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
;;
xl* | mpixl* | bgxl*)
# IBM XL 8.0 on PPC, with GNU ld
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ if test yes = "$supports_anon_versioning"; then
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
fi
;;
*)
@@ -6519,10 +7060,10 @@ if test "$_lt_caught_CXX_error" != yes; then
*Sun\ C*)
# Sun C++ 5.9
_LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
_LT_TAGVAR(compiler_needs_object, $1)=yes
# Not sure whether something based on
@@ -6580,22 +7121,17 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(ld_shlibs, $1)=yes
;;
- openbsd2*)
- # C++ shared libraries are fairly broken
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
-
- openbsd*)
+ openbsd* | bitrig*)
if test -f /usr/libexec/ld.so; then
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
fi
output_verbose_link_cmd=func_echo_all
else
@@ -6611,9 +7147,9 @@ if test "$_lt_caught_CXX_error" != yes; then
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
- _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
# Archives containing C++ object files must be created using
@@ -6631,17 +7167,17 @@ if test "$_lt_caught_CXX_error" != yes; then
cxx*)
case $host in
osf3*)
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
;;
*)
_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
- echo "-hidden">> $lib.exp~
- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
- $RM $lib.exp'
+ echo "-hidden">> $lib.exp~
+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~
+ $RM $lib.exp'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
;;
esac
@@ -6656,21 +7192,21 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
;;
*)
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+ if test yes,no = "$GXX,$with_gnu_ld"; then
+ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
case $host in
osf3*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
;;
esac
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
# Commands to make compiler produce verbose output that lists
@@ -6716,9 +7252,9 @@ if test "$_lt_caught_CXX_error" != yes; then
# Sun C++ 4.2, 5.x and Centerline C++
_LT_TAGVAR(archive_cmds_need_lc,$1)=yes
_LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+ $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -6726,7 +7262,7 @@ if test "$_lt_caught_CXX_error" != yes; then
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*)
# The compiler driver will combine and reorder linker options,
- # but understands `-z linker_flag'.
+ # but understands '-z linker_flag'.
# Supported since Solaris 2.6 (maybe 2.5.1?)
_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
;;
@@ -6743,30 +7279,30 @@ if test "$_lt_caught_CXX_error" != yes; then
;;
gcx*)
# Green Hills C++ Compiler
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
# The C++ compiler must be used to create the archive.
_LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
;;
*)
# GNU C++ compiler with Solaris linker
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+ if test yes,no = "$GXX,$with_gnu_ld"; then
+ _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs'
if $CC --version | $GREP -v '^2\.7' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+ $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
else
- # g++ 2.7 appears to require `-G' NOT `-shared' on this
+ # g++ 2.7 appears to require '-G' NOT '-shared' on this
# platform.
- _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+ $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
@@ -6774,11 +7310,11 @@ if test "$_lt_caught_CXX_error" != yes; then
output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
fi
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*)
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
;;
esac
fi
@@ -6787,52 +7323,52 @@ if test "$_lt_caught_CXX_error" != yes; then
;;
sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
runpath_var='LD_RUN_PATH'
case $cc_basename in
CC*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
;;
sysv5* | sco3.2v5* | sco5v6*)
- # Note: We can NOT use -z defs as we might desire, because we do not
+ # Note: We CANNOT use -z defs as we might desire, because we do not
# link with -lc, and that would cause any symbols used from libc to
# always be unresolved, which means just about no library would
# ever link correctly. If we're not using GNU ld we use -z text
# though, which does catch some bad symbols but isn't as heavy-handed
# as -z defs.
- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
- _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+ _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+ _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
_LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
runpath_var='LD_RUN_PATH'
case $cc_basename in
CC*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
_LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
- '"$_LT_TAGVAR(old_archive_cmds, $1)"
+ '"$_LT_TAGVAR(old_archive_cmds, $1)"
_LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
- '"$_LT_TAGVAR(reload_cmds, $1)"
+ '"$_LT_TAGVAR(reload_cmds, $1)"
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
;;
@@ -6863,10 +7399,10 @@ if test "$_lt_caught_CXX_error" != yes; then
esac
AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
- test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+ test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
- _LT_TAGVAR(GCC, $1)="$GXX"
- _LT_TAGVAR(LD, $1)="$LD"
+ _LT_TAGVAR(GCC, $1)=$GXX
+ _LT_TAGVAR(LD, $1)=$LD
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
@@ -6893,7 +7429,7 @@ if test "$_lt_caught_CXX_error" != yes; then
lt_cv_path_LD=$lt_save_path_LD
lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-fi # test "$_lt_caught_CXX_error" != yes
+fi # test yes != "$_lt_caught_CXX_error"
AC_LANG_POP
])# _LT_LANG_CXX_CONFIG
@@ -6915,13 +7451,14 @@ AC_REQUIRE([_LT_DECL_SED])
AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
func_stripname_cnf ()
{
- case ${2} in
- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+ case @S|@2 in
+ .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;;
+ *) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;;
esac
} # func_stripname_cnf
])# _LT_FUNC_STRIPNAME_CNF
+
# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
# ---------------------------------
# Figure out "hidden" library dependencies from verbose
@@ -7005,13 +7542,13 @@ if AC_TRY_EVAL(ac_compile); then
pre_test_object_deps_done=no
for p in `eval "$output_verbose_link_cmd"`; do
- case ${prev}${p} in
+ case $prev$p in
-L* | -R* | -l*)
# Some compilers place space between "-{L,R}" and the path.
# Remove the space.
- if test $p = "-L" ||
- test $p = "-R"; then
+ if test x-L = "$p" ||
+ test x-R = "$p"; then
prev=$p
continue
fi
@@ -7027,16 +7564,16 @@ if AC_TRY_EVAL(ac_compile); then
case $p in
=*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
esac
- if test "$pre_test_object_deps_done" = no; then
- case ${prev} in
+ if test no = "$pre_test_object_deps_done"; then
+ case $prev in
-L | -R)
# Internal compiler library paths should come after those
# provided the user. The postdeps already come after the
# user supplied libs so there is no need to process them.
if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
- _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+ _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p
else
- _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+ _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p"
fi
;;
# The "-l" case would never come before the object being
@@ -7044,9 +7581,9 @@ if AC_TRY_EVAL(ac_compile); then
esac
else
if test -z "$_LT_TAGVAR(postdeps, $1)"; then
- _LT_TAGVAR(postdeps, $1)="${prev}${p}"
+ _LT_TAGVAR(postdeps, $1)=$prev$p
else
- _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
+ _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p"
fi
fi
prev=
@@ -7061,15 +7598,15 @@ if AC_TRY_EVAL(ac_compile); then
continue
fi
- if test "$pre_test_object_deps_done" = no; then
+ if test no = "$pre_test_object_deps_done"; then
if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
- _LT_TAGVAR(predep_objects, $1)="$p"
+ _LT_TAGVAR(predep_objects, $1)=$p
else
_LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
fi
else
if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
- _LT_TAGVAR(postdep_objects, $1)="$p"
+ _LT_TAGVAR(postdep_objects, $1)=$p
else
_LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
fi
@@ -7100,51 +7637,6 @@ interix[[3-9]]*)
_LT_TAGVAR(postdep_objects,$1)=
_LT_TAGVAR(postdeps,$1)=
;;
-
-linux*)
- case `$CC -V 2>&1 | sed 5q` in
- *Sun\ C*)
- # Sun C++ 5.9
-
- # The more standards-conforming stlport4 library is
- # incompatible with the Cstd library. Avoid specifying
- # it if it's in CXXFLAGS. Ignore libCrun as
- # -library=stlport4 depends on it.
- case " $CXX $CXXFLAGS " in
- *" -library=stlport4 "*)
- solaris_use_stlport4=yes
- ;;
- esac
-
- if test "$solaris_use_stlport4" != yes; then
- _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
- fi
- ;;
- esac
- ;;
-
-solaris*)
- case $cc_basename in
- CC* | sunCC*)
- # The more standards-conforming stlport4 library is
- # incompatible with the Cstd library. Avoid specifying
- # it if it's in CXXFLAGS. Ignore libCrun as
- # -library=stlport4 depends on it.
- case " $CXX $CXXFLAGS " in
- *" -library=stlport4 "*)
- solaris_use_stlport4=yes
- ;;
- esac
-
- # Adding this requires a known-good setup of shared libraries for
- # Sun compiler versions before 5.6, else PIC objects from an old
- # archive will be linked into the output, leading to subtle bugs.
- if test "$solaris_use_stlport4" != yes; then
- _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
- fi
- ;;
- esac
- ;;
esac
])
@@ -7153,7 +7645,7 @@ case " $_LT_TAGVAR(postdeps, $1) " in
esac
_LT_TAGVAR(compiler_lib_search_dirs, $1)=
if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'`
fi
_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
[The directories searched by this compiler when creating a shared library])
@@ -7173,10 +7665,10 @@ _LT_TAGDECL([], [compiler_lib_search_path], [1],
# --------------------------
# Ensure that the configuration variables for a Fortran 77 compiler are
# suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
+# to write the compiler configuration to 'libtool'.
m4_defun([_LT_LANG_F77_CONFIG],
[AC_LANG_PUSH(Fortran 77)
-if test -z "$F77" || test "X$F77" = "Xno"; then
+if test -z "$F77" || test no = "$F77"; then
_lt_disable_F77=yes
fi
@@ -7213,7 +7705,7 @@ _LT_TAGVAR(objext, $1)=$objext
# the F77 compiler isn't working. Some variables (like enable_shared)
# are currently assumed to apply to all compilers on this platform,
# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_F77" != yes; then
+if test yes != "$_lt_disable_F77"; then
# Code to be used in simple compile tests
lt_simple_compile_test_code="\
subroutine t
@@ -7235,7 +7727,7 @@ if test "$_lt_disable_F77" != yes; then
_LT_LINKER_BOILERPLATE
# Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
+ lt_save_CC=$CC
lt_save_GCC=$GCC
lt_save_CFLAGS=$CFLAGS
CC=${F77-"f77"}
@@ -7249,21 +7741,25 @@ if test "$_lt_disable_F77" != yes; then
AC_MSG_RESULT([$can_build_shared])
AC_MSG_CHECKING([whether to build shared libraries])
- test "$can_build_shared" = "no" && enable_shared=no
+ test no = "$can_build_shared" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
case $host_os in
aix3*)
- test "$enable_shared" = yes && enable_static=no
+ test yes = "$enable_shared" && enable_static=no
if test -n "$RANLIB"; then
archive_cmds="$archive_cmds~\$RANLIB \$lib"
postinstall_cmds='$RANLIB $lib'
fi
;;
aix[[4-9]]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
+ if test ia64 != "$host_cpu"; then
+ case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+ yes,aix,yes) ;; # shared object as lib.so file only
+ yes,svr4,*) ;; # shared object as lib.so archive member only
+ yes,*) enable_static=no ;; # shared object in lib.a archive as well
+ esac
fi
;;
esac
@@ -7271,11 +7767,11 @@ if test "$_lt_disable_F77" != yes; then
AC_MSG_CHECKING([whether to build static libraries])
# Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
+ test yes = "$enable_shared" || enable_static=yes
AC_MSG_RESULT([$enable_static])
- _LT_TAGVAR(GCC, $1)="$G77"
- _LT_TAGVAR(LD, $1)="$LD"
+ _LT_TAGVAR(GCC, $1)=$G77
+ _LT_TAGVAR(LD, $1)=$LD
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
@@ -7292,9 +7788,9 @@ if test "$_lt_disable_F77" != yes; then
fi # test -n "$compiler"
GCC=$lt_save_GCC
- CC="$lt_save_CC"
- CFLAGS="$lt_save_CFLAGS"
-fi # test "$_lt_disable_F77" != yes
+ CC=$lt_save_CC
+ CFLAGS=$lt_save_CFLAGS
+fi # test yes != "$_lt_disable_F77"
AC_LANG_POP
])# _LT_LANG_F77_CONFIG
@@ -7304,11 +7800,11 @@ AC_LANG_POP
# -------------------------
# Ensure that the configuration variables for a Fortran compiler are
# suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
+# to write the compiler configuration to 'libtool'.
m4_defun([_LT_LANG_FC_CONFIG],
[AC_LANG_PUSH(Fortran)
-if test -z "$FC" || test "X$FC" = "Xno"; then
+if test -z "$FC" || test no = "$FC"; then
_lt_disable_FC=yes
fi
@@ -7345,7 +7841,7 @@ _LT_TAGVAR(objext, $1)=$objext
# the FC compiler isn't working. Some variables (like enable_shared)
# are currently assumed to apply to all compilers on this platform,
# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_FC" != yes; then
+if test yes != "$_lt_disable_FC"; then
# Code to be used in simple compile tests
lt_simple_compile_test_code="\
subroutine t
@@ -7367,7 +7863,7 @@ if test "$_lt_disable_FC" != yes; then
_LT_LINKER_BOILERPLATE
# Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
+ lt_save_CC=$CC
lt_save_GCC=$GCC
lt_save_CFLAGS=$CFLAGS
CC=${FC-"f95"}
@@ -7383,21 +7879,25 @@ if test "$_lt_disable_FC" != yes; then
AC_MSG_RESULT([$can_build_shared])
AC_MSG_CHECKING([whether to build shared libraries])
- test "$can_build_shared" = "no" && enable_shared=no
+ test no = "$can_build_shared" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
case $host_os in
aix3*)
- test "$enable_shared" = yes && enable_static=no
+ test yes = "$enable_shared" && enable_static=no
if test -n "$RANLIB"; then
archive_cmds="$archive_cmds~\$RANLIB \$lib"
postinstall_cmds='$RANLIB $lib'
fi
;;
aix[[4-9]]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
+ if test ia64 != "$host_cpu"; then
+ case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+ yes,aix,yes) ;; # shared object as lib.so file only
+ yes,svr4,*) ;; # shared object as lib.so archive member only
+ yes,*) enable_static=no ;; # shared object in lib.a archive as well
+ esac
fi
;;
esac
@@ -7405,11 +7905,11 @@ if test "$_lt_disable_FC" != yes; then
AC_MSG_CHECKING([whether to build static libraries])
# Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
+ test yes = "$enable_shared" || enable_static=yes
AC_MSG_RESULT([$enable_static])
- _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
- _LT_TAGVAR(LD, $1)="$LD"
+ _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu
+ _LT_TAGVAR(LD, $1)=$LD
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
@@ -7429,7 +7929,7 @@ if test "$_lt_disable_FC" != yes; then
GCC=$lt_save_GCC
CC=$lt_save_CC
CFLAGS=$lt_save_CFLAGS
-fi # test "$_lt_disable_FC" != yes
+fi # test yes != "$_lt_disable_FC"
AC_LANG_POP
])# _LT_LANG_FC_CONFIG
@@ -7439,7 +7939,7 @@ AC_LANG_POP
# --------------------------
# Ensure that the configuration variables for the GNU Java Compiler compiler
# are suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
+# to write the compiler configuration to 'libtool'.
m4_defun([_LT_LANG_GCJ_CONFIG],
[AC_REQUIRE([LT_PROG_GCJ])dnl
AC_LANG_SAVE
@@ -7473,7 +7973,7 @@ CC=${GCJ-"gcj"}
CFLAGS=$GCJFLAGS
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
+_LT_TAGVAR(LD, $1)=$LD
_LT_CC_BASENAME([$compiler])
# GCJ did not exist at the time GCC didn't implicitly link libc in.
@@ -7510,7 +8010,7 @@ CFLAGS=$lt_save_CFLAGS
# --------------------------
# Ensure that the configuration variables for the GNU Go compiler
# are suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
+# to write the compiler configuration to 'libtool'.
m4_defun([_LT_LANG_GO_CONFIG],
[AC_REQUIRE([LT_PROG_GO])dnl
AC_LANG_SAVE
@@ -7544,7 +8044,7 @@ CC=${GOC-"gccgo"}
CFLAGS=$GOFLAGS
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
+_LT_TAGVAR(LD, $1)=$LD
_LT_CC_BASENAME([$compiler])
# Go did not exist at the time GCC didn't implicitly link libc in.
@@ -7581,7 +8081,7 @@ CFLAGS=$lt_save_CFLAGS
# -------------------------
# Ensure that the configuration variables for the Windows resource compiler
# are suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
+# to write the compiler configuration to 'libtool'.
m4_defun([_LT_LANG_RC_CONFIG],
[AC_REQUIRE([LT_PROG_RC])dnl
AC_LANG_SAVE
@@ -7597,7 +8097,7 @@ _LT_TAGVAR(objext, $1)=$objext
lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
+lt_simple_link_test_code=$lt_simple_compile_test_code
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_TAG_COMPILER
@@ -7607,7 +8107,7 @@ _LT_COMPILER_BOILERPLATE
_LT_LINKER_BOILERPLATE
# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
+lt_save_CC=$CC
lt_save_CFLAGS=$CFLAGS
lt_save_GCC=$GCC
GCC=
@@ -7636,7 +8136,7 @@ AC_DEFUN([LT_PROG_GCJ],
[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
[m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
[AC_CHECK_TOOL(GCJ, gcj,)
- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+ test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2"
AC_SUBST(GCJFLAGS)])])[]dnl
])
@@ -7747,7 +8247,7 @@ lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
# along with /bin/sed that truncates output.
for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
- test ! -f $lt_ac_sed && continue
+ test ! -f "$lt_ac_sed" && continue
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
@@ -7764,9 +8264,9 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
$lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
cmp -s conftest.out conftest.nl || break
# 10000 chars as input seems more than enough
- test $lt_ac_count -gt 10 && break
+ test 10 -lt "$lt_ac_count" && break
lt_ac_count=`expr $lt_ac_count + 1`
- if test $lt_ac_count -gt $lt_ac_max; then
+ if test "$lt_ac_count" -gt "$lt_ac_max"; then
lt_ac_max=$lt_ac_count
lt_cv_path_SED=$lt_ac_sed
fi
@@ -7790,27 +8290,7 @@ dnl AC_DEFUN([LT_AC_PROG_SED], [])
# Find out whether the shell is Bourne or XSI compatible,
# or has some other useful features.
m4_defun([_LT_CHECK_SHELL_FEATURES],
-[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
- test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
- = c,a/b,b/c, \
- && eval 'test $(( 1 + 1 )) -eq 2 \
- && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
- && xsi_shell=yes
-AC_MSG_RESULT([$xsi_shell])
-_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
-
-AC_MSG_CHECKING([whether the shell understands "+="])
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
- >/dev/null 2>&1 \
- && lt_shell_append=yes
-AC_MSG_RESULT([$lt_shell_append])
-_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
lt_unset=unset
else
lt_unset=false
@@ -7834,102 +8314,9 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
])# _LT_CHECK_SHELL_FEATURES
-# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
-# ------------------------------------------------------
-# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
-# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
-m4_defun([_LT_PROG_FUNCTION_REPLACE],
-[dnl {
-sed -e '/^$1 ()$/,/^} # $1 /c\
-$1 ()\
-{\
-m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1])
-} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-])
-
-
-# _LT_PROG_REPLACE_SHELLFNS
-# -------------------------
-# Replace existing portable implementations of several shell functions with
-# equivalent extended shell implementations where those features are available..
-m4_defun([_LT_PROG_REPLACE_SHELLFNS],
-[if test x"$xsi_shell" = xyes; then
- _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
- esac])
-
- _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
- func_basename_result="${1##*/}"])
-
- _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
- esac
- func_basename_result="${1##*/}"])
-
- _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
- # positional parameters, so assign one to ordinary parameter first.
- func_stripname_result=${3}
- func_stripname_result=${func_stripname_result#"${1}"}
- func_stripname_result=${func_stripname_result%"${2}"}])
-
- _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
- func_split_long_opt_name=${1%%=*}
- func_split_long_opt_arg=${1#*=}])
-
- _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
- func_split_short_opt_arg=${1#??}
- func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
-
- _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
- case ${1} in
- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
- *) func_lo2o_result=${1} ;;
- esac])
-
- _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo])
-
- _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))])
-
- _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}])
-fi
-
-if test x"$lt_shell_append" = xyes; then
- _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])
-
- _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
- func_quote_for_eval "${2}"
-dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
- eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
-
- # Save a `func_append' function call where possible by direct use of '+='
- sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- test 0 -eq $? || _lt_function_replace_fail=:
-else
- # Save a `func_append' function call even when '+=' is not available
- sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- test 0 -eq $? || _lt_function_replace_fail=:
-fi
-
-if test x"$_lt_function_replace_fail" = x":"; then
- AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
-fi
-])
-
# _LT_PATH_CONVERSION_FUNCTIONS
# -----------------------------
-# Determine which file name conversion functions should be used by
+# Determine what file name conversion functions should be used by
# func_to_host_file (and, implicitly, by func_to_host_path). These are needed
# for certain cross-compile configurations and native mingw.
m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4
index 5d9acd8..94b0829 100644
--- a/m4/ltoptions.m4
+++ b/m4/ltoptions.m4
@@ -1,14 +1,14 @@
# Helper functions for option handling. -*- Autoconf -*-
#
-# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software
+# Foundation, Inc.
# Written by Gary V. Vaughan, 2004
#
# This file is free software; the Free Software Foundation gives
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
-# serial 7 ltoptions.m4
+# serial 8 ltoptions.m4
# This is to help aclocal find these macros, as it can't see m4_define.
AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
@@ -29,7 +29,7 @@ m4_define([_LT_SET_OPTION],
[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
_LT_MANGLE_DEFUN([$1], [$2]),
- [m4_warning([Unknown $1 option `$2'])])[]dnl
+ [m4_warning([Unknown $1 option '$2'])])[]dnl
])
@@ -75,13 +75,15 @@ m4_if([$1],[LT_INIT],[
dnl
dnl If no reference was made to various pairs of opposing options, then
dnl we run the default mode handler for the pair. For example, if neither
- dnl `shared' nor `disable-shared' was passed, we enable building of shared
+ dnl 'shared' nor 'disable-shared' was passed, we enable building of shared
dnl archives by default:
_LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
_LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
_LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
_LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
- [_LT_ENABLE_FAST_INSTALL])
+ [_LT_ENABLE_FAST_INSTALL])
+ _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4],
+ [_LT_WITH_AIX_SONAME([aix])])
])
])# _LT_SET_OPTIONS
@@ -112,7 +114,7 @@ AU_DEFUN([AC_LIBTOOL_DLOPEN],
[_LT_SET_OPTION([LT_INIT], [dlopen])
AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `dlopen' option into LT_INIT's first parameter.])
+put the 'dlopen' option into LT_INIT's first parameter.])
])
dnl aclocal-1.4 backwards compatibility:
@@ -148,7 +150,7 @@ AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
_LT_SET_OPTION([LT_INIT], [win32-dll])
AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `win32-dll' option into LT_INIT's first parameter.])
+put the 'win32-dll' option into LT_INIT's first parameter.])
])
dnl aclocal-1.4 backwards compatibility:
@@ -157,9 +159,9 @@ dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
# _LT_ENABLE_SHARED([DEFAULT])
# ----------------------------
-# implement the --enable-shared flag, and supports the `shared' and
-# `disable-shared' LT_INIT options.
-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
+# implement the --enable-shared flag, and supports the 'shared' and
+# 'disable-shared' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
m4_define([_LT_ENABLE_SHARED],
[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
AC_ARG_ENABLE([shared],
@@ -172,14 +174,14 @@ AC_ARG_ENABLE([shared],
*)
enable_shared=no
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_shared=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac],
[enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
@@ -211,9 +213,9 @@ dnl AC_DEFUN([AM_DISABLE_SHARED], [])
# _LT_ENABLE_STATIC([DEFAULT])
# ----------------------------
-# implement the --enable-static flag, and support the `static' and
-# `disable-static' LT_INIT options.
-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
+# implement the --enable-static flag, and support the 'static' and
+# 'disable-static' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
m4_define([_LT_ENABLE_STATIC],
[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
AC_ARG_ENABLE([static],
@@ -226,14 +228,14 @@ AC_ARG_ENABLE([static],
*)
enable_static=no
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_static=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac],
[enable_static=]_LT_ENABLE_STATIC_DEFAULT)
@@ -265,9 +267,9 @@ dnl AC_DEFUN([AM_DISABLE_STATIC], [])
# _LT_ENABLE_FAST_INSTALL([DEFAULT])
# ----------------------------------
-# implement the --enable-fast-install flag, and support the `fast-install'
-# and `disable-fast-install' LT_INIT options.
-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
+# implement the --enable-fast-install flag, and support the 'fast-install'
+# and 'disable-fast-install' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
m4_define([_LT_ENABLE_FAST_INSTALL],
[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
AC_ARG_ENABLE([fast-install],
@@ -280,14 +282,14 @@ AC_ARG_ENABLE([fast-install],
*)
enable_fast_install=no
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_fast_install=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac],
[enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
@@ -304,14 +306,14 @@ AU_DEFUN([AC_ENABLE_FAST_INSTALL],
[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `fast-install' option into LT_INIT's first parameter.])
+the 'fast-install' option into LT_INIT's first parameter.])
])
AU_DEFUN([AC_DISABLE_FAST_INSTALL],
[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `disable-fast-install' option into LT_INIT's first parameter.])
+the 'disable-fast-install' option into LT_INIT's first parameter.])
])
dnl aclocal-1.4 backwards compatibility:
@@ -319,11 +321,64 @@ dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
+# _LT_WITH_AIX_SONAME([DEFAULT])
+# ----------------------------------
+# implement the --with-aix-soname flag, and support the `aix-soname=aix'
+# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT
+# is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'.
+m4_define([_LT_WITH_AIX_SONAME],
+[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl
+shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[[5-9]]*,yes)
+ AC_MSG_CHECKING([which variant of shared library versioning to provide])
+ AC_ARG_WITH([aix-soname],
+ [AS_HELP_STRING([--with-aix-soname=aix|svr4|both],
+ [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])],
+ [case $withval in
+ aix|svr4|both)
+ ;;
+ *)
+ AC_MSG_ERROR([Unknown argument to --with-aix-soname])
+ ;;
+ esac
+ lt_cv_with_aix_soname=$with_aix_soname],
+ [AC_CACHE_VAL([lt_cv_with_aix_soname],
+ [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT)
+ with_aix_soname=$lt_cv_with_aix_soname])
+ AC_MSG_RESULT([$with_aix_soname])
+ if test aix != "$with_aix_soname"; then
+ # For the AIX way of multilib, we name the shared archive member
+ # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+ # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+ # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+ # the AIX toolchain works better with OBJECT_MODE set (default 32).
+ if test 64 = "${OBJECT_MODE-32}"; then
+ shared_archive_member_spec=shr_64
+ else
+ shared_archive_member_spec=shr
+ fi
+ fi
+ ;;
+*)
+ with_aix_soname=aix
+ ;;
+esac
+
+_LT_DECL([], [shared_archive_member_spec], [0],
+ [Shared archive member basename, for filename based shared library versioning on AIX])dnl
+])# _LT_WITH_AIX_SONAME
+
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])])
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])])
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])])
+
+
# _LT_WITH_PIC([MODE])
# --------------------
-# implement the --with-pic flag, and support the `pic-only' and `no-pic'
+# implement the --with-pic flag, and support the 'pic-only' and 'no-pic'
# LT_INIT options.
-# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
+# MODE is either 'yes' or 'no'. If omitted, it defaults to 'both'.
m4_define([_LT_WITH_PIC],
[AC_ARG_WITH([pic],
[AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
@@ -334,19 +389,17 @@ m4_define([_LT_WITH_PIC],
*)
pic_mode=default
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for lt_pkg in $withval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$lt_pkg" = "X$lt_p"; then
pic_mode=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac],
- [pic_mode=default])
-
-test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
+ [pic_mode=m4_default([$1], [default])])
_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
])# _LT_WITH_PIC
@@ -359,7 +412,7 @@ AU_DEFUN([AC_LIBTOOL_PICMODE],
[_LT_SET_OPTION([LT_INIT], [pic-only])
AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `pic-only' option into LT_INIT's first parameter.])
+put the 'pic-only' option into LT_INIT's first parameter.])
])
dnl aclocal-1.4 backwards compatibility:
diff --git a/m4/ltsugar.m4 b/m4/ltsugar.m4
index 9000a05..48bc934 100644
--- a/m4/ltsugar.m4
+++ b/m4/ltsugar.m4
@@ -1,6 +1,7 @@
# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
#
-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software
+# Foundation, Inc.
# Written by Gary V. Vaughan, 2004
#
# This file is free software; the Free Software Foundation gives
@@ -33,7 +34,7 @@ m4_define([_lt_join],
# ------------
# Manipulate m4 lists.
# These macros are necessary as long as will still need to support
-# Autoconf-2.59 which quotes differently.
+# Autoconf-2.59, which quotes differently.
m4_define([lt_car], [[$1]])
m4_define([lt_cdr],
[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
@@ -44,7 +45,7 @@ m4_define([lt_unquote], $1)
# lt_append(MACRO-NAME, STRING, [SEPARATOR])
# ------------------------------------------
-# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
+# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'.
# Note that neither SEPARATOR nor STRING are expanded; they are appended
# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
# No SEPARATOR is output if MACRO-NAME was previously undefined (different
diff --git a/m4/ltversion.m4 b/m4/ltversion.m4
index 07a8602..fa04b52 100644
--- a/m4/ltversion.m4
+++ b/m4/ltversion.m4
@@ -1,6 +1,6 @@
# ltversion.m4 -- version numbers -*- Autoconf -*-
#
-# Copyright (C) 2004 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc.
# Written by Scott James Remnant, 2004
#
# This file is free software; the Free Software Foundation gives
@@ -9,15 +9,15 @@
# @configure_input@
-# serial 3337 ltversion.m4
+# serial 4179 ltversion.m4
# This file is part of GNU Libtool
-m4_define([LT_PACKAGE_VERSION], [2.4.2])
-m4_define([LT_PACKAGE_REVISION], [1.3337])
+m4_define([LT_PACKAGE_VERSION], [2.4.6])
+m4_define([LT_PACKAGE_REVISION], [2.4.6])
AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4.2'
-macro_revision='1.3337'
+[macro_version='2.4.6'
+macro_revision='2.4.6'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4
index c573da9..c6b26f8 100644
--- a/m4/lt~obsolete.m4
+++ b/m4/lt~obsolete.m4
@@ -1,6 +1,7 @@
# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
#
-# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software
+# Foundation, Inc.
# Written by Scott James Remnant, 2004.
#
# This file is free software; the Free Software Foundation gives
@@ -11,7 +12,7 @@
# These exist entirely to fool aclocal when bootstrapping libtool.
#
-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN),
# which have later been changed to m4_define as they aren't part of the
# exported API, or moved to Autoconf or Automake where they belong.
#
@@ -25,7 +26,7 @@
# included after everything else. This provides aclocal with the
# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
# because those macros already exist, or will be overwritten later.
-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
#
# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
# Yes, that means every name once taken will need to remain here until
diff --git a/man/Makefile.in b/man/Makefile.in
index e86c34a..1be27c2 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -242,6 +242,7 @@ EXEEXT = @EXEEXT@
EXT = @EXT@
FGREP = @FGREP@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GIT_PROG_EXISTS = @GIT_PROG_EXISTS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
GMSGFMT = @GMSGFMT@
@@ -299,6 +300,7 @@ LN_S = @LN_S@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
diff --git a/man/fr/Makefile.am b/man/fr/Makefile.am
index f153ac8..8bfac63 100644
--- a/man/fr/Makefile.am
+++ b/man/fr/Makefile.am
@@ -6,7 +6,6 @@ SUFFIXES = .1_ .1
dist_noinst_DATA = $(SOURCES) $(COMMON)
nodist_man_MANS = $(TARGETS)
-man1dir = ${mandir}/fr/man1
$(TARGETS) : $(COMMON) Makefile.am
diff --git a/man/fr/Makefile.in b/man/fr/Makefile.in
index 9c4d5da..f7b0f4c 100644
--- a/man/fr/Makefile.in
+++ b/man/fr/Makefile.in
@@ -142,6 +142,7 @@ am__uninstall_files_from_dir = { \
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
+man1dir = $(mandir)/man1
am__installdirs = "$(DESTDIR)$(man1dir)"
NROFF = nroff
MANS = $(nodist_man_MANS)
@@ -199,6 +200,7 @@ EXEEXT = @EXEEXT@
EXT = @EXT@
FGREP = @FGREP@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GIT_PROG_EXISTS = @GIT_PROG_EXISTS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
GMSGFMT = @GMSGFMT@
@@ -256,6 +258,7 @@ LN_S = @LN_S@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
@@ -374,7 +377,6 @@ COMMON = reporting_bugs.part see_also.part
SUFFIXES = .1_ .1
dist_noinst_DATA = $(SOURCES) $(COMMON)
nodist_man_MANS = $(TARGETS)
-man1dir = ${mandir}/fr/man1
all: all-am
.SUFFIXES:
diff --git a/man/fr/idjc-auto.1_ b/man/fr/idjc-auto.1_
index c69edf1..ce3f574 100644
--- a/man/fr/idjc-auto.1_
+++ b/man/fr/idjc-auto.1_
@@ -5,7 +5,7 @@ idjc\-auto \- Rendre un profile automatique
.P
idjc auto [\-h] nom_de_profile
.SH DESCRIPTION
-Lorsqu'un profile est rendu automatique, la fenêtre du Gestionnaire de Profiles n'apparait pas au démarrage, au lieu de ça, le profile est chargé. Un seul et unique profile peut être défini comme automatique.
+Lorsqu'un profile est rendu automatique, la fenêtre du Gestionnaire de Profiles n'apparait pas au démarrage, au lieu de ça, le profile est chargé. Un seul et unique profile peut être défini comme étant automatique.
.SS Options
.B \-h, \-\-help
.RS
diff --git a/man/fr/idjc-new.1_ b/man/fr/idjc-new.1_
index a6a815f..8952b4c 100644
--- a/man/fr/idjc-new.1_
+++ b/man/fr/idjc-new.1_
@@ -23,23 +23,23 @@ PROFILE=un profile existant à dupliquer.
.PP
.BR "\-i, \-\-icon\-pathname" =ICONE
.RS
-ICON=le chemin vers un fichier image ex.: un fichier .png
+ICON=le chemin vers un fichier image ex. : un fichier .png
.RE
.PP
.BR "\-n, \-\-nickname" =PSEUDO
.RS
-PSEUDO=un nom alternatif pour le profile. Contrairement au profile n'importe quel caractère unicode est autorisé.
+PSEUDO=un nom alternatif pour le profile. Contrairement au profile, n'importe quel caractère unicode est autorisé.
.RE
.PP
.BR "\-d, \-\-description" =DESC
.RS
-DESC=un texte de description. Un texte pour votre profile décrivant ce pourquoi il est destiné.
+DESC=un texte de description. Un texte pour décrivant votre profile, ce à quoi il est destiné.
.RE
.PP
.SS Obligatoire
.B nom_de_profile
.RS
-Le nom du nouveau profile. Limité aux lettres et chiffres du jeu ASCII et '_' le sous-ligné.
+Le nom du nouveau profile. Limité aux lettres et chiffres du jeu ASCII et «_» le sous-ligné.
.RE
.SH RAPPORTER DES BOGUESS
.SH VOIR AUSSI
diff --git a/man/fr/idjc-noauto.1_ b/man/fr/idjc-noauto.1_
index 531e599..5dfd8e0 100644
--- a/man/fr/idjc-noauto.1_
+++ b/man/fr/idjc-noauto.1_
@@ -5,7 +5,7 @@ idjc-noauto \- Pas de profile automatique
.P
idjc noauto [\-h]
.SH DESCRIPTION
-Supprime le profile automatique lors du démarrage
+Supprime le profile automatique lors du démarrage de
.B idjc
si aucun profile n'est choisi sur la ligne de commande, le Gestionnaire de Profiles apparaitra de façon à en choisir un manuellement.
.SS Options
diff --git a/man/fr/idjc-rm.1_ b/man/fr/idjc-rm.1_
index 1d89aff..6da2382 100644
--- a/man/fr/idjc-rm.1_
+++ b/man/fr/idjc-rm.1_
@@ -1,13 +1,13 @@
.TH "IDJC-RM" 1 "2012-02-06" "VERSION" "Internet DJ Console"
.SH NOM
-idjc\-rm \- Remove a profile
+idjc\-rm \- Supprimer des profiles
.SH SYNOPSIS
.P
-idjc rm [\-h] nom_de_profile [nom_de_profile...]
+idjc rm [\-h] nom_de_profile [nom_de_profile…]
.SH DESCRIPTION
-Supprime un ou des profiles
+Supprime un ou des profiles
.B idjc
-du dossier de configuration correspondant.
+du dossier de configuration correspondant
.SS Options
.B \-h, \-\-help
.RS
diff --git a/man/fr/idjc-run.1_ b/man/fr/idjc-run.1_
index 6dd0178..11aa21e 100644
--- a/man/fr/idjc-run.1_
+++ b/man/fr/idjc-run.1_
@@ -6,8 +6,8 @@ idjc\-run \- Lance l'application principale de
.P
idjc run [\-h] [\-d {true,false}] [\-p profile_choisi] [\-j nom_de_serveur]
[\-S detaild_de_session] [\-\-no\-jack\-connections] [\-C]
- [\-c c [c ...]] [\-V {off,private,public}] [\-P p [p ...]]
- [\-s s [s ...]] [\-x {1,2}]
+ [\-c c [c …]] [\-V {off,private,public}] [\-P p [p …]]
+ [\-s s [s …]] [\-x {1,2}]
.SH DESCRIPTION
.SS Options generales
.B \-h, \-\-help
@@ -17,12 +17,12 @@ Affiche un message d'aide
.PP
.BR "\-d, \-\-dialog" "={true,false}"
.RS
-S'il faut ou pas afficher le dialogue de choix de profile.
+S'il faut ou non afficher le dialogue de sélection de profile.
.RE
.PP
.BR "\-p, \-\-profile" =PROFILE
.RS
-Quel profile à exécuter. N'importe quel autre que celui par défaut doit exister.
+Quel profile à exécuter. Tout autre que celui par défaut doit déjà exister.
.RE
.PP
.BR "\-j, \-\-jackserver" =SERVER
@@ -37,14 +37,14 @@ Voir la section support de session ci\-dessous pour plus de détails.
.PP
.B \-\-no\-jack\-connections
.RS
-Une option potentiellement utils si vous utilisez un quelconque gestionnaire de sessions. Au démarrage
+Une option potentiellement utile si vous utilisez un quelconque gestionnaire de sessions. Au démarrage,
.B idjc
ne tentera pas de gérer lui même ses connexions.
.RE
.PP
.B \-\-no\-default\-jack\-connections
.RS
-Aucun port JACK autre que ceux spécifiés dans la session ne sera connecté. Bien entendu, cela implique que si la session spécifiée n'existe pas, aucune connections ne sera effectuée.
+Aucun port JACK autre que ceux spécifiés dans la session ne sera connecté. Bien entendu, cela implique que, si la session spécifiée n'existe pas, aucune connection ne sera effectuée.
.RE
.PP
.SS Options de l'interface utilisateur
@@ -80,20 +80,21 @@ n'existe pas, à moins qu'il n'ait été configuré autrement grâce à un outil
.I ladiconf
ou
.I QjackCtl
+,
.B idjc
-démarrera mais sera configuré avec une vitesse d'échantillonnage de 48000 ce qui est trop pour streamer des CD audio. Il est recommendé de créer ce fichier avec la méthode suivante en console ou en utilisant les outils sus\-nommés qui peuvent nécessiter une installation.
+démarrera mais sera configuré avec une vitesse d'échantillonnage de 48000 ce qui est trop pour streamer des CD audio. Il est recommendé de créer ce fichier avec la méthode suivante, en mode console ou en utilisant les outils sus\-nommés qui peuvent nécessiter une installation spécifique :
.PP
.B $
echo "/usr/bin/jackd \-d alsa \-r 44100 \-p 2048" > ~/.jackdrc
.PP
-Si vous préférez lancer le serveur audio JACK manuellement vous pouvez le faire de cette manière :
+Si vous préférez lancer le serveur audio JACK manuellement, vous pouvez le faire de cette manière :
.PP
.BR $ " jackd \-d alsa \-r 44100 \-p 2048"
.PP
-.RB Référez\-vous\ à\ jackd (1)\ pour\ plus\ de\ détails.
+.RB Référez\-vous\ à\ jackd (1)\ pour\ plus\ de\ détails.
.PP
.B idjc
-possède un support des langues natif et tient compte des variables d'environnement
+possède un support des langues en natif et tient compte des variables d'environnement
.I LANG
et
.I LANGUAGE
@@ -102,7 +103,7 @@ et
supporte les modes de sessions Ladish [L0] et [L1]. A la demande en ligne de commande vous pouvez spécifier \-\-session=L1, \-\-session=L1:session\-name, ou \-\-session=L1:session\-name:/path/to/savedir. Si un path de sauvegarde est fournis, IDJC opère en mode session plutôt qu'en mode profile.
Le mode par défaut est L0:default qui effectue des sauvegardes périodiques et à la fermeture. Il est aussi possible de spécifier un nom ou un chemin alternatif pour le mode L0.
.PP
-Lorsque vous utilisez le mode L1 dans Gladish si vous choisissez "Studio/Save Studio" ou "Project/Save Project" dans le menu principal
+Lorsque vous utilisez le mode L1 dans Gladish si vous choisissez «Studio/Sauvegarder» ou «Project/Sauvegarder» dans le menu principal
.B idjc
sauvegardera la configuration des connexions JACK dans le fichier de session.
.SH RAPPORTER DES BOGUES
diff --git a/man/fr/idjc.1_ b/man/fr/idjc.1_
index 9aa528e..f7a5e08 100644
--- a/man/fr/idjc.1_
+++ b/man/fr/idjc.1_
@@ -5,9 +5,9 @@ idjc \- Devenez dj sur internet
idjc [\-h] [\-v] {run,new,rm,auto,noauto,ls}
.SH DESCRIPTION
.B idjc
-est une puissante et simple application pour les individus intéressés dans le streaming shows radio en direct sur Internet par des serveurs Shoutcast ou Icecast ou par la création dde podcasts.
+est application une puissante et simple pour les personnes intéressées par le streaming de radio en direct sur Internet utilisant des serveurs Shoutcast et Icecast ou par la création de podcasts.
-Les fonctionalités incluent deux lecteurs média principaux avec crossfader, un lecteur de jingles, un traitement de signal microphone (limiter, noise gate, etc.), des anonces IRC, le démarrage/arret automatique du stream et la reconnection, le striming simultané en mp3 et Ogg, jusqu'à 12 canaux d'entrées mono ou 6 stéréo, a DSP interface, une intégration VoIP, le support du contrôle par surfaces MIDI, et des vumètres de niveau audio.
+Les fonctionalités incluent deux lecteurs média principaux avec crossfader, un lecteur de jingles, un traitement de signal microphone (limiteur, noise gate, etc.), des anonces IRC, le démarrage/arret automatique du flux et la reconnection, le streaming simultané en mp3 et Ogg, jusqu'à 12 canaux d'entrées mono ou 6 stéréo, une interface DSP, l'intégration de la VoIP, le support du contrôle par surfaces MIDI et des vumètres de niveaux audio.
Il utilise GTK+ pour son interface et JACK Audio Connection Kit pour faciliter l'inclusion d'applications tierces supportant JACK dans leur chaine audio.
.SS Options
@@ -21,7 +21,7 @@ Affiche un message d'aide
Affiche le numéro de version et quite.
.RE
.SS
-.BR Sous\-commandes " (chacunes possède sa propre page de manuel)"
+.BR Sous\-commandes " (chacune possède sa propre page de manuel)"
.B run
.RS
Exécute l'application principale
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 79c9e2d..80a55a8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -14,3 +14,4 @@ python/songdb.py
python/playergui.py
python/preferences.py
python/sourceclientgui.py
+python/format.py
diff --git a/po/fr.gmo b/po/fr.gmo
index 73405a2..fe64361 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index f597ebd..1c1ec47 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: putidjcinthesubjectline at bethere.co.uk\n"
-"POT-Creation-Date: 2014-02-17 19:31+0000\n"
+"POT-Creation-Date: 2015-07-27 07:47+0100\n"
"PO-Revision-Date: 2013-11-07 16:47+0000\n"
"Last-Translator: \n"
"Language-Team: English <team at example.com>\n"
@@ -27,8 +27,8 @@ msgid ""
"run command"
msgstr ""
"Afficher ce message d'aide et quitter -- plus d'aide est disponible pour "
-"chacune des sous-commandes, par exemple : « %(prog)s run --help » "
-"affichel'aide concernant la commande run"
+"chacune des sous-commandes, par exemple : « %(prog)s run --help » affiche "
+"l'aide concernant la commande run"
#. TC: a command line option help string.
#: python/prelims/__init__.py:108
@@ -130,7 +130,7 @@ msgstr "nom_du_serveur"
#: python/prelims/__init__.py:166
msgid "the named jack sound-server to connect with"
-msgstr "Nom du serveur Jack auqel se connecter"
+msgstr "Nom du serveur Jack auquel se connecter"
#. TC: command line help placeholder.
#: python/prelims/__init__.py:170
@@ -181,7 +181,7 @@ msgid ""
"kick sources on servers -- note that this will be\n"
" done before any server connection attempts are made"
msgstr ""
-"Balancer les soureces sur les serveurs -- notee que ceci sera fait\n"
+"Balancer les sources sur les serveurs -- notez que ceci sera fait\n"
" avant que toute tentative de connection ne soit effectuée"
#: python/prelims/__init__.py:203
@@ -284,7 +284,7 @@ msgstr "le profil «%s» n'existe pas"
#: python/prelims/__init__.py:479
#, python-format
msgid "profile %s is already running"
-msgstr "le profil %s est en cours d'utilisation"
+msgstr "le profil «%s» est en cours d'utilisation"
#: python/prelims/__init__.py:492
#, python-format
@@ -312,6 +312,7 @@ msgstr ""
#. TC: text appears in the title bar when in session mode.
#: python/prelims/__init__.py:590
+#, python-brace-format
msgid "session={type}:{name}"
msgstr "session={type}:{name}"
@@ -346,14 +347,17 @@ msgid "Profile %s is active."
msgstr "Le profil %s est actif."
#: python/prelims/__init__.py:791
+#, python-brace-format
msgid "Cannot rename profile {0} to {1}, {1} currently exists."
msgstr "Impossible de renommer le profil {0} en {1}, {1} existe déjà."
#: python/prelims/__init__.py:795
+#, python-brace-format
msgid "Error during attempt to rename {0} to {1}."
msgstr "Erreur lors de la tentative de renommage de {0} en {1}."
#: python/prelims/__init__.py:805
+#, python-brace-format
msgid ""
"<span weight='bold' size='12000'>Error while editing profile: {0}.</span>\n"
"\n"
@@ -365,6 +369,7 @@ msgstr ""
"{1}"
#: python/prelims/__init__.py:824
+#, python-brace-format
msgid "could not get a lock on profile {0}: {1}"
msgstr "impossible d'obtenir le vérouillage du profil {0} : {1}"
@@ -434,7 +439,7 @@ msgstr "Le modèle de profil «%s» n'existe pas."
#: python/prelims/__init__.py:933
#, python-format
msgid "could not write file %s"
-msgstr "impossible d'écrire le fichier %s"
+msgstr "impossible d'écrire le fichier «%s»"
#: python/prelims/__init__.py:934
#, python-format
@@ -466,54 +471,54 @@ msgid "The default profile"
msgstr "Profil par défaut"
#. TC: data entry dialog window title text. %s = profile name
-#: python/prelims/profiledialog.py:97
+#: python/prelims/profiledialog.py:98
#, python-format
msgid "Edit profile %s"
msgstr "Modifier le profil %s"
#. TC: data entry dialog window title text. %s = profile name
-#: python/prelims/profiledialog.py:100
+#: python/prelims/profiledialog.py:101
#, python-format
msgid "New profile based upon %s"
-msgstr "Nouveau profil basé sur %s"
+msgstr "Nouveau profil basé sur «%s»"
#. TC: data entry dialog window title text.
-#: python/prelims/profiledialog.py:104
+#: python/prelims/profiledialog.py:105
msgid "New profile details"
msgstr "Détails du nouveau profil"
#. TC: profile dialog window title text.
-#: python/prelims/profiledialog.py:242
+#: python/prelims/profiledialog.py:243
msgid "IDJC Profile Manager"
msgstr "Gestionaire de profils IDJC"
-#: python/prelims/profiledialog.py:276
+#: python/prelims/profiledialog.py:277
msgid "Profile"
msgstr "Profil"
#. TC: column heading. The profile nicknames.
#. TC: IRC nickname data entry label.
-#: python/prelims/profiledialog.py:284 python/irc.py:446
+#: python/prelims/profiledialog.py:285 python/irc.py:452
msgid "Nickname"
msgstr "Pseudo"
#. TC: column heading.
#. TC: Station description.
-#: python/prelims/profiledialog.py:287 python/irc.py:90
-#: python/playergui.py:306 python/sourceclientgui.py:1640
+#: python/prelims/profiledialog.py:288 python/irc.py:96
+#: python/playergui.py:307 python/sourceclientgui.py:1697
msgid "Description"
msgstr "Description"
#. TC: column heading. The time a particular profile has been running.
-#: python/prelims/profiledialog.py:291
+#: python/prelims/profiledialog.py:292
msgid "Up-time"
msgstr "Durée d'activité"
-#: python/prelims/profiledialog.py:305
+#: python/prelims/profiledialog.py:306
msgid "_Auto"
msgstr "_Auto"
-#: python/prelims/profiledialog.py:364
+#: python/prelims/profiledialog.py:365
#, python-format
msgid ""
"<span weight='bold' size='12000'>Delete the data of profile '%s'?</span>\n"
@@ -525,7 +530,7 @@ msgstr ""
"\n"
"Le profil restera disponible avec les paramêtres initiaux."
-#: python/prelims/profiledialog.py:368
+#: python/prelims/profiledialog.py:369
#, python-format
msgid ""
"<span weight='bold' size='12000'>Delete profile '%s' and all its data?</"
@@ -540,6 +545,7 @@ msgstr ""
#. TC: The contents of <> and {} must not be changed.
#: python/dialogs.py:198
+#, python-brace-format
msgid ""
"<span weight=\"bold\" size=\"12000\">The connection to the server in tab "
"{servertab} has failed.</span>\n"
@@ -570,141 +576,152 @@ msgid "Released under the GNU General Public License V2.0+."
msgstr "Distribué selon les termes de la Licence Publique Générale GNU, V2.0+"
#. TC: IRC message subcategory, triggers on new track announcements.
-#: python/irc.py:78
+#: python/irc.py:82
msgid "Track announce"
msgstr "Annonce des pistes"
#. TC: IRC message subcategory, triggered by a timer.
-#: python/irc.py:80
+#: python/irc.py:84
msgid "Timer"
msgstr "Timer"
#. TC: IRC message subcategory, triggered once when the stream starts.
-#: python/irc.py:82
+#: python/irc.py:86
msgid "On stream up"
msgstr "En début de flux"
#. TC: IRC message subcategory, triggered once at the stream's end.
-#: python/irc.py:84
+#: python/irc.py:88
msgid "On stream down"
msgstr "En fin de flux"
+#. TC: IRC message subcategory, triggered once at the stream's end.
+#: python/irc.py:90
+#, fuzzy
+msgid "Operations"
+msgstr "Autres options"
+
#. TC: Track artist.
-#: python/irc.py:89 python/mutagentagger.py:375 python/songdb.py:785
-#: python/songdb.py:1157 python/sourceclientgui.py:92
+#: python/irc.py:95 python/mutagentagger.py:375 python/songdb.py:902
+#: python/songdb.py:1290 python/sourceclientgui.py:94
msgid "Artist"
msgstr "Artiste"
-#: python/irc.py:89 python/mutagentagger.py:375 python/songdb.py:1161
-#: python/sourceclientgui.py:92
+#: python/irc.py:95 python/mutagentagger.py:375 python/songdb.py:1292
+#: python/sourceclientgui.py:94
msgid "Title"
msgstr "Titre"
-#: python/irc.py:89 python/mutagentagger.py:376 python/songdb.py:1158
-#: python/sourceclientgui.py:92
+#: python/irc.py:95 python/mutagentagger.py:376 python/songdb.py:1291
+#: python/sourceclientgui.py:94
msgid "Album"
msgstr "Album"
-#: python/irc.py:89 python/sourceclientgui.py:93
+#: python/irc.py:95 python/sourceclientgui.py:95
msgid "Song name"
msgstr "Chanson"
#. TC: The DJ or Stream name.
-#: python/irc.py:90 python/sourceclientgui.py:1637
+#: python/irc.py:96 python/sourceclientgui.py:1694
msgid "DJ name"
msgstr "Nom du DJ"
-#: python/irc.py:90 python/sourceclientgui.py:1638
+#: python/irc.py:96 python/sourceclientgui.py:1695
msgid "Listen URL"
msgstr "URL d'écoute"
+#: python/irc.py:96
+#, fuzzy
+msgid "Source URI"
+msgstr "Source"
+
#. TC: Popup menu item for a GTK text entry widget.
-#: python/irc.py:133
+#: python/irc.py:139
msgid "Insert Attribute or Colour Code"
msgstr "Insérer un attribut ou un code couleur"
#. TC: Text formatting style.
-#: python/irc.py:170
+#: python/irc.py:176
msgid "<b>Bold</b>"
msgstr "<b>Gras</b>"
#. TC: Text formatting style.
-#: python/irc.py:172
+#: python/irc.py:178
msgid "<u>Underline</u>"
msgstr "<u>Sous-ligné</u>"
#. TC: Text formatting style.
-#: python/irc.py:174
+#: python/irc.py:180
msgid "Normal"
msgstr "Normal"
-#: python/irc.py:180
+#: python/irc.py:186
msgid "Colours"
msgstr "Couleurs"
-#: python/irc.py:397
+#: python/irc.py:403
msgid "Optional data entry field for information only."
msgstr "Champ de donnée optionelle pour information uniquement."
#. TC: Tab heading text.
-#: python/irc.py:400
+#: python/irc.py:406
msgid "IRC server"
msgstr "Serveur IRC"
-#: python/irc.py:412
+#: python/irc.py:418
msgid "Manual start"
msgstr "Départ manuel"
-#: python/irc.py:414
+#: python/irc.py:420
msgid "Off when restarting IDJC and off initially."
msgstr "Arrêté au redémarrage de IDJC et Arrêté au départ"
#. TC: The IRC network e.g. EFnet.
-#: python/irc.py:438
+#: python/irc.py:444
msgid "Network"
msgstr "Réseau"
#. TC: label for hostname entry.
-#: python/irc.py:440 python/sourceclientgui.py:206
+#: python/irc.py:446 python/sourceclientgui.py:208
msgid "Hostname"
msgstr "Nom de l'hôte"
#. TC: TCP/IP port number label.
#. TC: TCP port number.
-#: python/irc.py:442 python/sourceclientgui.py:678
+#: python/irc.py:448 python/sourceclientgui.py:704
msgid "Port"
msgstr "Port"
-#: python/irc.py:443
+#: python/irc.py:449
msgid "User name"
msgstr "Nom utilisateur"
-#: python/irc.py:444 python/songdb.py:339 python/sourceclientgui.py:207
+#: python/irc.py:450 python/songdb.py:343 python/sourceclientgui.py:209
msgid "Password"
msgstr "Mot de passe"
#. TC: Second choice of IRC nickname.
-#: python/irc.py:448
+#: python/irc.py:454
msgid "Second choice"
msgstr "Second choix"
#. TC: Third choice of IRC nickname.
-#: python/irc.py:450
+#: python/irc.py:456
msgid "Third choice"
msgstr "Troixième choix"
#. TC: The IRC user's 'real' name.
-#: python/irc.py:452
+#: python/irc.py:458
msgid "Real name"
msgstr "Nom réel"
#. TC: The NickServ password.
-#: python/irc.py:454
+#: python/irc.py:460
msgid "NickServ p/w"
msgstr "MdP NickServ"
#. TC: Tooltip to IRC 'User name' field.
-#: python/irc.py:459
+#: python/irc.py:465
msgid ""
"Ideally set this to something even on servers that allow public anonymous "
"access."
@@ -713,7 +730,7 @@ msgstr ""
"anonyme ou public."
#. TC: tooltip to all IRC nicknames entry fields.
-#: python/irc.py:469
+#: python/irc.py:475
msgid ""
"When a nickname is in use on the target IRC network, during connection these "
"IRC nicknames are cycled through, then twice again after appending an "
@@ -725,7 +742,7 @@ msgstr ""
"ligné jusqu'à ce la fin. Cela donne à IDJC un maximum de neuf pseudos à "
"tenter."
-#: python/irc.py:474
+#: python/irc.py:480
msgid ""
"The real name you want to use which will be available regardless of whether "
"the network connection was made with the primary nickname or not.\n"
@@ -737,7 +754,7 @@ msgstr ""
"\n"
"Remplissez le par quelque chose."
-#: python/irc.py:477
+#: python/irc.py:483
msgid ""
"If this value is set an attempt will be made to acquire your first choice "
"IRC nickname (if needed) and log in with NickServ at services.\n"
@@ -751,7 +768,7 @@ msgstr ""
"L'utilisation des services NickServ nécessitent qu'un enregistrement "
"préalable du pseudo ait été effectué avec un client IRC standard."
-#: python/irc.py:505
+#: python/irc.py:511
msgid ""
"<span weight='bold' size='12000'>Permanently delete this server?</span>\n"
"\n"
@@ -763,11 +780,11 @@ msgstr ""
"Cette action effacera aussi tous les messages associés."
#. TC: An IRC channel #chan or user name entry box label.
-#: python/irc.py:552
+#: python/irc.py:559
msgid "Channels/Users"
msgstr "Canaux/Utilisateurs"
-#: python/irc.py:556
+#: python/irc.py:563
msgid ""
"The comma or space separated list of channels and/or users to whom the "
"message will be sent.\n"
@@ -782,11 +799,11 @@ msgstr ""
"#canal:motclef"
#. TC: Message text to send to an IRC channel. Widget label.
-#: python/irc.py:563
+#: python/irc.py:616
msgid "Message"
msgstr "Message"
-#: python/irc.py:567
+#: python/irc.py:620
msgid ""
"The message to send.\n"
"\n"
@@ -798,23 +815,23 @@ msgstr ""
"Le message à envoyer.\n"
"\n"
"Dans la fenêtre de pop-up (clic droit) se trouvent quelques options utiles "
-"pour les métadonnées et le formataze du texte.\n"
+"pour les métadonnées et le formatage du texte.\n"
"\n"
"La fenêtre ci-dessous affiche comment le message apparaitra aux utilisateurs "
"de XChat XChat2 ou HexChat."
#. TC: Dialog window title text.
-#: python/irc.py:638
+#: python/irc.py:673
msgid "IRC track announce"
msgstr "Annonce de pistes IRC"
#. TC: Spinbutton label for a delay value.
-#: python/irc.py:645
+#: python/irc.py:680
msgid "Delay"
msgstr "Délais"
#. TC: tooltip on a spinbutton widget.
-#: python/irc.py:647
+#: python/irc.py:682
msgid ""
"The delay time of this message.\n"
"\n"
@@ -836,230 +853,234 @@ msgstr ""
"message."
#. TC: Dialog window title text.
-#: python/irc.py:675
+#: python/irc.py:710
msgid "IRC timed message"
msgstr "Message IRC temporisé"
#. TC: Spinbutton time offset value label.
-#: python/irc.py:684
+#: python/irc.py:719
msgid "Offset"
msgstr "Offset"
#. TC: Spinbutton timed interval duration value label.
-#: python/irc.py:686
+#: python/irc.py:721
msgid "Interval"
msgstr "Interval"
#. TC: spinbutton tooltip
-#: python/irc.py:689
+#: python/irc.py:724
msgid ""
"The time offset within the below specified interval at which the message "
"will be issued."
msgstr ""
"Offset de temps dans l'interval spécifié après lequel le message sera envoyé."
-#: python/irc.py:693
+#: python/irc.py:728
msgid "The interval in seconds of the timed message."
msgstr "Interval en secondes des messages temporisés."
-#: python/irc.py:930
-#, fuzzy
+#: python/irc.py:967
msgid "This feature requires the installation of python-irc."
msgstr "Cette fonctionalité nécessite l'installation de python-irclib"
#. TC: Indicator text: We used a password.
-#: python/irc.py:1021
+#: python/irc.py:1058
msgid "PASSWORD"
msgstr "MOT DE PASSE"
#. TC: Indicator text: We interact with NickServ.
-#: python/irc.py:1024
+#: python/irc.py:1061
msgid "NICKSERV"
msgstr "NICKSERV"
#. TC: Indicator text: Server connection started manually.
-#: python/irc.py:1027
+#: python/irc.py:1064
msgid "MANUAL"
msgstr "MANUEL"
-#. TC: Expander text encapsulating messages that play when stream goes up.
-#: python/irc.py:1048
+#. TC: Dialog title text.
+#: python/irc.py:1089
msgid "IRC stream up message"
msgstr "Messages IRC vers le haut"
-#. TC: Expander text encapsulating messages that play when stream goes down.
-#: python/irc.py:1050
+#. TC: Dialog title text.
+#: python/irc.py:1091
msgid "IRC stream down message"
msgstr "Messages IRC vers le bas"
-#: python/jingles.py:95
+#. TC: Dialog title text.
+#: python/irc.py:1093
+msgid "IRC station operations"
+msgstr ""
+
+#: python/jingles.py:96
msgid "Stop"
msgstr "Stopper"
#. TC: Column heading, whether to play.
-#: python/jingles.py:113 python/playergui.py:298
+#: python/jingles.py:114 python/playergui.py:299
msgid "Play"
msgstr "Lire"
-#: python/jingles.py:122 python/sourceclientgui.py:1025
+#: python/jingles.py:123 python/sourceclientgui.py:1051
msgid "Repeat"
msgstr "Répéter"
-#: python/jingles.py:135
+#: python/jingles.py:136
msgid "Configure"
msgstr "Configurer"
-#: python/jingles.py:326 python/playergui.py:4052
+#: python/jingles.py:327 python/playergui.py:4135
msgid "Supported media"
msgstr "Média supportaté"
-#: python/jingles.py:333
+#: python/jingles.py:334
#, python-format
msgid "Effect %d Config"
msgstr "Config effet %d"
-#: python/jingles.py:348
+#: python/jingles.py:349
msgid "Trigger text"
msgstr "Texte Trigger"
-#: python/jingles.py:349
+#: python/jingles.py:350
msgid "No Name"
msgstr "Sans nom"
-#: python/jingles.py:356
+#: python/jingles.py:357
msgid "Level adjustment (dB)"
msgstr "Ajustement des niveaux (dB)"
-#: python/jingles.py:431
+#: python/jingles.py:432
msgid "Effects volume."
msgstr "Volume des effets"
-#: python/jingles.py:438
+#: python/jingles.py:439
msgid "Player headroom that is applied when an effect is playing."
msgstr "Headroom appliqué au lecteur quand un effet est lu."
-#: python/jingles.py:501
+#: python/jingles.py:502
msgid "Alternative"
msgstr "Alternatif"
-#: python/jingles.py:502
+#: python/jingles.py:503
msgid "Default"
msgstr "Défaut"
-#: python/jingles.py:547
+#: python/jingles.py:548
msgid "Effects"
msgstr "Effets"
-#: python/jingles.py:590
+#: python/jingles.py:591
#, python-format
msgid "Effects %d"
msgstr "Effet %d"
-#: python/jingles.py:598 python/maingui.py:188
+#: python/jingles.py:599 python/maingui.py:189
msgid "Background Tracks"
msgstr "Pistes de fond"
-#: python/jingles.py:617
+#: python/jingles.py:618
msgid "Background Tracks volume."
msgstr "Volume des pistes de fond"
-#: python/maingui.py:92
+#: python/maingui.py:93
msgid "Show a JACK freewheel control on the main panel"
msgstr "Afficher le contrôle rouelibre de JACK en page principale"
-#: python/maingui.py:94
+#: python/maingui.py:95
msgid "Toggle JACK freewheel mode."
msgstr "Commutateur du mode rouelibre de JACK"
-#: python/maingui.py:167
+#: python/maingui.py:168
msgid "File"
msgstr "Fichier"
-#: python/maingui.py:167 python/preferences.py:1127
+#: python/maingui.py:168 python/preferences.py:1130
msgid "View"
msgstr "Voir"
-#: python/maingui.py:168
+#: python/maingui.py:169
msgid "JACK Ports"
msgstr "Ports JACK"
-#: python/maingui.py:168
+#: python/maingui.py:169
msgid "Help"
msgstr "Aide"
-#: python/maingui.py:170 python/maingui.py:3653
+#: python/maingui.py:171 python/maingui.py:3689
msgid "Streams"
msgstr "Flux"
-#: python/maingui.py:171
+#: python/maingui.py:172
msgid "Recorders"
msgstr "Enregistreurs"
-#: python/maingui.py:184 python/maingui.py:223
+#: python/maingui.py:185 python/maingui.py:224
msgid "Output"
msgstr "Sortie"
-#: python/maingui.py:184
+#: python/maingui.py:185
msgid "Preferences"
-msgstr "Preferences"
+msgstr "Préférences"
-#: python/maingui.py:184
+#: python/maingui.py:185
msgid "Profiles"
-msgstr "Profils"
+msgstr "Profiles"
-#: python/maingui.py:187 python/songdb.py:405
+#: python/maingui.py:188 python/songdb.py:409
msgid "Music Database"
msgstr "Base de donnée musicale"
-#: python/maingui.py:187
+#: python/maingui.py:188
msgid "Channel Meters"
msgstr "Canal Mêtres"
-#: python/maingui.py:187
+#: python/maingui.py:188
msgid "Output Meters"
msgstr "Sortie Mêtres"
-#: python/maingui.py:188
+#: python/maingui.py:189
msgid "Tabbed Area"
msgstr "Zone tabulée"
-#: python/maingui.py:188
+#: python/maingui.py:189
msgid "Button Bar"
msgstr "Barre de boutons"
-#: python/maingui.py:222 python/preferences.py:1482
+#: python/maingui.py:223 python/preferences.py:1485
msgid "Channels"
msgstr "Canaux"
-#: python/maingui.py:222
+#: python/maingui.py:223
msgid "Players"
msgstr "Lecteur"
-#: python/maingui.py:223
+#: python/maingui.py:224
msgid "VoIP"
msgstr "VoIP"
-#: python/maingui.py:223 python/maingui.py:3093
+#: python/maingui.py:224 python/maingui.py:3129
msgid "DSP"
msgstr "DSP"
-#: python/maingui.py:223
+#: python/maingui.py:224
msgid "Mix"
msgstr "Mix"
-#: python/maingui.py:223
+#: python/maingui.py:224
msgid "Misc"
msgstr "Divers"
-#: python/maingui.py:268
+#: python/maingui.py:269
msgid "Reset"
msgstr "RàZ"
-#: python/maingui.py:271
+#: python/maingui.py:272
msgid "Reset the JACK port connections to the default settings."
msgstr "Forcer toutes les connexions aux ports JACK à leur valeurs par défaut."
-#: python/maingui.py:276
+#: python/maingui.py:277
msgid ""
"<span size=\"12000\" weight=\"bold\">Reset all JACK port connections?</"
"span>\n"
@@ -1070,35 +1091,37 @@ msgstr ""
"<span size=\"12000\" weight=\"bold\">RàZ de toutes les connexions aux ports "
"JACK et remise aux paramêtres par défaut."
-#: python/maingui.py:320
+#: python/maingui.py:321
msgid "No compatible ports available."
msgstr "Aucun port compatible n'est disponible"
-#: python/maingui.py:363
+#: python/maingui.py:364
+#, python-brace-format
msgid "{0} profile={1}:{2} settings saved."
msgstr "{0} profil={1}:{2} paramêtres sauvegardés."
-#: python/maingui.py:366
+#: python/maingui.py:367
+#, python-brace-format
msgid "{0} session={1}:{2} settings saved."
msgstr "{0} session={1}:{2} paramêtres sauvegardés."
-#: python/maingui.py:670
+#: python/maingui.py:671
msgid "Text"
msgstr "Texte"
-#: python/maingui.py:673
+#: python/maingui.py:674
msgid "The opener button's text."
msgstr "Texte des boutons d'ouverture"
-#: python/maingui.py:681
+#: python/maingui.py:682
msgid "Icon"
msgstr "Icône"
-#: python/maingui.py:689
+#: python/maingui.py:690
msgid "The opener button's icon."
msgstr "L'icône d'ouverture."
-#: python/maingui.py:697
+#: python/maingui.py:698
msgid ""
"The headroom is the amount by which to reduce player volume when this opener "
"is active. Note that the actual amount will be the largest value of all the "
@@ -1108,15 +1131,15 @@ msgstr ""
"quand ce lanceur est activé. Notez que la valeur utilisée sera la plus "
"élevée parmis celles des bouttons activés."
-#: python/maingui.py:702
+#: python/maingui.py:703
msgid "The amount of headroom required (dB)"
msgstr "Le taux de headroom nécessaire (dB)"
-#: python/maingui.py:711
+#: python/maingui.py:712
msgid "This button will flash as a reminder to close"
msgstr "Ce bouton clignottera pour rappeler de le fermer"
-#: python/maingui.py:712
+#: python/maingui.py:713
msgid ""
"After a number of seconds where a main player is active this button's status "
"indicator will start to flash and will continue to do so until the button is "
@@ -1126,11 +1149,11 @@ msgstr ""
"l'indicateur de status de ce bouton commence à clignotter jusqu'à ce que le "
"bouton soit fermé ou le lecteur arrêté."
-#: python/maingui.py:720
+#: python/maingui.py:721
msgid "This button is to be treated as a microphone opener"
msgstr "Ce bouton doit être utilisé comme ouvreur de micro"
-#: python/maingui.py:722
+#: python/maingui.py:723
msgid ""
"The button will be grouped with the other microphone opener buttons. It will "
"be affected by signals to close microphone buttons. Channels associated with "
@@ -1140,7 +1163,11 @@ msgstr ""
"par les signaux de fermeture de micro. Les canaux associés à ce bouton "
"seront mixés différamment lors de l'utilisation des modes VoIP."
-#: python/maingui.py:733
+#: python/maingui.py:732
+msgid "This button will automatically cancel JACK freewheel mode"
+msgstr ""
+
+#: python/maingui.py:734
msgid ""
"This should be set for all buttons that control input from a live sound "
"source or device."
@@ -1148,75 +1175,75 @@ msgstr ""
"Doit être configuré pour chacun des boutons contrôlant l'entrée du son en "
"direct d'une source ou d'un périphérique."
-#: python/maingui.py:736
+#: python/maingui.py:737
msgid "Button Open Triggers"
msgstr "Bouton Trieurs"
-#: python/maingui.py:743
+#: python/maingui.py:744
msgid "Playlist advance button"
msgstr "Bouton d'avance dans la liste de lecture"
-#: python/maingui.py:744 python/maingui.py:745
+#: python/maingui.py:745 python/maingui.py:746
#, python-format
msgid "'%s' control"
msgstr "contrôle «%s»"
#. TC: Insert playlist control to stop the player.
-#: python/maingui.py:744 python/playergui.py:4310
+#: python/maingui.py:745 python/playergui.py:4393
msgid "Player Stop"
msgstr "Arret lecteur"
#. TC: Insert playlist control to stop the player.
-#: python/maingui.py:745 python/playergui.py:4317
+#: python/maingui.py:746 python/playergui.py:4400
msgid "Player Stop 2"
msgstr "Arret Lecteur 2"
-#: python/maingui.py:746
+#: python/maingui.py:747
msgid "Announcements"
msgstr "Annonces"
-#: python/maingui.py:758
+#: python/maingui.py:759
msgid "When opened close these other buttons"
msgstr "Quand il est ouvert, ferme les autres boutons"
-#: python/maingui.py:769
+#: python/maingui.py:770
msgid "Shell Command"
msgstr "Commande Shell"
-#: python/maingui.py:770
+#: python/maingui.py:771
msgid ""
"Mostly useful issuing 'amixer' commands, in particular for setting capture."
msgstr ""
"Pratique principalement avec les commandes de «amixer», en particulier pour "
"configurer la capture."
-#: python/maingui.py:790
+#: python/maingui.py:791
msgid "On open"
msgstr "A l'ouverture"
-#: python/maingui.py:791
+#: python/maingui.py:792
msgid "On close"
msgstr "A la fermeture"
-#: python/maingui.py:835
+#: python/maingui.py:836
msgid "Main Panel Opener Buttons"
msgstr "Panneau principal des boutons d'ouvreurs"
-#: python/maingui.py:847
+#: python/maingui.py:848
msgid "Indicate button numbers and associated channel numbers"
msgstr "Indique le numéro de boutton et les numéros de canaux associés"
-#: python/maingui.py:849
+#: python/maingui.py:850
msgid "A useful feature to have switched on while allocating channel openers."
msgstr ""
"Une fonctionalité utile à avoir activée lorsque l'on alloue des ouvreurs de "
"canaux."
-#: python/maingui.py:855
+#: python/maingui.py:856
msgid "Status Indicator Appearance"
msgstr "Apparence de l'indicateur d'état"
-#: python/maingui.py:858
+#: python/maingui.py:859
msgid ""
"Each opener button has two vertical bars at the side to make the button "
"state more apparent. These settings control their appearance."
@@ -1224,28 +1251,28 @@ msgstr ""
"Chaque bouton d'ouverture possède une barre verticale pour le rendre plus "
"visible. Ces paramêtre contrôlent cette apparence."
-#: python/maingui.py:867
+#: python/maingui.py:868 python/format.py:827
msgid "Width"
msgstr "Largeur"
-#: python/maingui.py:874
+#: python/maingui.py:875
msgid "Opened"
msgstr "Ouvert"
-#: python/maingui.py:878 python/preferences.py:500 python/preferences.py:502
+#: python/maingui.py:879 python/preferences.py:503 python/preferences.py:505
msgid "Closed"
msgstr "Fermé"
-#: python/maingui.py:883
+#: python/maingui.py:884
msgid "Remind"
msgstr "Se rappeler"
#. TC: A placeholder text for when there are no opener buttons.
-#: python/maingui.py:1064
+#: python/maingui.py:1065
msgid "No Channel Opener Buttons"
msgstr "Aucun bouton d'ouverture de canal"
-#: python/maingui.py:1353
+#: python/maingui.py:1354
msgid ""
"This indicates the state of the various streams. Flashing means stream "
"packets are being discarded because of network congestion. Partial red means "
@@ -1255,55 +1282,55 @@ msgstr ""
"Indique l'état des différents flux. Clignottant indique que des paquets du "
"flux sont écartés à cause d'une congestion du réseau. Partiellement rouge "
"signifie que le tampon d'émission est partiellement plein, indiquant des "
-"difficultés de comunication avec le serveur. Vert indque que tout va bien."
+"difficultés de comunication avec le serveur. Vert indique que tout va bien."
-#: python/maingui.py:1376
+#: python/maingui.py:1377
msgid "The combined total number of listeners in all server tabs."
msgstr "Le nombre total d'auditeurs dans tous les onglets de serveurs."
#. TC: Record as in, to make a recording.
-#: python/maingui.py:1824 python/sourceclientgui.py:2702
+#: python/maingui.py:1825 python/sourceclientgui.py:2784
msgid "Record"
msgstr "Enregistrer"
-#: python/maingui.py:2620
+#: python/maingui.py:2647
msgid "Confirmation to quit IDJC is required."
msgstr "Une confirmation est nécessaire pour quitter IDJC."
-#: python/maingui.py:2624
+#: python/maingui.py:2651
msgid "All active recordings and radio streams will terminate."
msgstr "Tous les entregistrements et flux radio seront arrêtés."
-#: python/maingui.py:2626
+#: python/maingui.py:2653
msgid "All of the active radio streams will terminate."
msgstr "Tous les flux radio en cours seront arrêtés."
-#: python/maingui.py:2628
+#: python/maingui.py:2655
msgid "All active recordings will cease."
msgstr "Tous les enregistrements sen cours seront arrêtés."
#. TC: Popup menu item, wipes away the tracks played history text.
-#: python/maingui.py:2885 python/maingui.py:3317
+#: python/maingui.py:2921 python/maingui.py:3353
msgid "Remove Contents"
msgstr "Supprimer le contenu"
-#: python/maingui.py:3040
+#: python/maingui.py:3076
msgid "Renameable Labels"
msgstr "Labels renommables"
-#: python/maingui.py:3064
+#: python/maingui.py:3100
msgid "Main Players"
msgstr "Lecteur principal"
-#: python/maingui.py:3117
+#: python/maingui.py:3153
msgid "Mix voice over IP audio to the output stream."
msgstr "Mixe l'audio VoIP au flux de sortie"
-#: python/maingui.py:3130
+#: python/maingui.py:3166
msgid "Mix voice over IP audio to the DJ only."
msgstr "Mixe l'audio VoIP uniquement au DJ"
-#: python/maingui.py:3157
+#: python/maingui.py:3193
msgid ""
"This button steps through the active playlist, pausing between tracks. The "
"active playlist is defined by the placement of the crossfader."
@@ -1311,44 +1338,45 @@ msgstr ""
"Ce bouton avance dans la liste de lecture en s'arrêtant entre chaque piste. "
"La liste de lecture en cours est définie par l'emplacement du crossfader."
-#: python/maingui.py:3202 python/preferences.py:870
+#: python/maingui.py:3238 python/preferences.py:873
msgid "The volume control shared by both music players."
msgstr "Le contrôle de volume partagé par les deux lecteurs."
-#: python/maingui.py:3213
+#: python/maingui.py:3249
msgid "The volume control for the right music player."
msgstr "Le Volume du lecteur de droite."
-#: python/maingui.py:3241
+#: python/maingui.py:3277
msgid "VoIP level adjustment. 0dB gain is at the mid point."
msgstr "Ajustement du niveau VoIP. 0dB est le point milieu."
-#: python/maingui.py:3264
+#: python/maingui.py:3300
msgid "The stream volume level to send to the voice over IP connection."
msgstr "Le niveau de volume à envoyer à la connexion VoIP."
-#: python/maingui.py:3291 python/preferences.py:1410
+#: python/maingui.py:3327 python/preferences.py:1413
msgid "Tracks Played"
msgstr "Pistes lues"
-#: python/maingui.py:3362 python/maingui.py:3364 python/maingui.py:3388
+#: python/maingui.py:3398 python/maingui.py:3400 python/maingui.py:3424
msgid "Monitor Mix"
msgstr "Monitor Mix"
-#: python/maingui.py:3371 python/maingui.py:3388 python/playergui.py:4251
+#: python/maingui.py:3407 python/maingui.py:3424 python/playergui.py:4334
msgid "DJ"
msgstr "DJ"
#. TC: binding editor, action pane, first row, toplevel menu.
-#: python/maingui.py:3374 python/maingui.py:3388 python/midicontrols.py:154
-#: python/midicontrols.py:1506 python/playergui.py:4243
-#: python/sourceclientgui.py:2710
+#: python/maingui.py:3410 python/maingui.py:3424 python/midicontrols.py:155
+#: python/midicontrols.py:1507 python/playergui.py:4326
+#: python/sourceclientgui.py:2792
msgid "Stream"
msgstr "Flux"
#. TC: Context {0}, {1}, {2} = Monitor Mix, Stream, DJ
#. TC: Or whatever they become translated to.
-#: python/maingui.py:3384
+#: python/maingui.py:3420
+#, python-brace-format
msgid ""
"In IDJC there are are two audio paths and this '{0}' control toggles between "
"them. When '{1}' is active you can hear what the listeners are hearing "
@@ -1361,82 +1389,82 @@ msgstr ""
"pour pouvoir utiliser la fonctionalité VoIP"
#. TC: Dropdown box title text widget.
-#: python/maingui.py:3397 python/maingui.py:3399
+#: python/maingui.py:3433 python/maingui.py:3435
msgid "Metadata Source"
msgstr "Source de métadonnées"
#. TC: The chosen source of track metadata.
-#: python/maingui.py:3405 python/playergui.py:3961
+#: python/maingui.py:3441 python/playergui.py:4044
msgid "Playlist 1"
msgstr "Liste de lecture 1"
#. TC: The chosen source of track metadata.
-#: python/maingui.py:3407 python/playergui.py:3962
+#: python/maingui.py:3443 python/playergui.py:4045
msgid "Playlist 2"
msgstr "Liste de lecture 2"
#. TC: The chosen source of track metadata.
-#: python/maingui.py:3409
+#: python/maingui.py:3445 python/songdb.py:909 python/songdb.py:1293
msgid "Last Played"
msgstr "Dernière lue"
#. TC: The chosen source of track metadata.
-#: python/maingui.py:3411 python/maingui.py:3448 python/maingui.py:3450
+#: python/maingui.py:3447 python/maingui.py:3484 python/maingui.py:3486
msgid "Crossfader"
msgstr "Crossfader"
#. TC: The chosen source of track metadata. In this case no metadata.
#. TC: Fade time is zero. No fade, none.
-#: python/maingui.py:3413 python/playergui.py:4226
+#: python/maingui.py:3449 python/playergui.py:4309
msgid "None"
msgstr "Aucune"
#. TC: The chosen source of track metadata. In this case no metadata.
-#: python/maingui.py:3415
+#: python/maingui.py:3451
msgid "Playlist 3"
msgstr "Liste de lecture 3"
-#: python/maingui.py:3420
+#: python/maingui.py:3456
msgid "Select the origin for the playing track metadata on the stream."
msgstr "Sélectionner l'origine pour la piste de métadonnées"
#. TC: Abbreviation of left.
-#: python/maingui.py:3430 python/maingui.py:3432
+#: python/maingui.py:3466 python/maingui.py:3468
msgid "L"
msgstr "G"
-#: python/maingui.py:3442
+#: python/maingui.py:3478
msgid "Move the crossfader fully left."
msgstr "Déplacer le crossfader totalement à gauche"
-#: python/maingui.py:3462
+#: python/maingui.py:3498
msgid "The crossfader."
msgstr "Le crossfader"
#. TC: Abbreviation of right.
-#: python/maingui.py:3466 python/maingui.py:3468
+#: python/maingui.py:3502 python/maingui.py:3504
msgid "R"
msgstr "D"
-#: python/maingui.py:3478
+#: python/maingui.py:3514
msgid "Move the crossfader fully right."
msgstr "Déplacer le crossfader totalement à droite"
#. TC: Describes a mid point.
-#: python/maingui.py:3487 python/maingui.py:3489
+#: python/maingui.py:3523 python/maingui.py:3525
msgid "Middle"
msgstr "Milieu"
-#: python/maingui.py:3506 python/maingui.py:3513
+#: python/maingui.py:3542 python/maingui.py:3549
msgid "Move the crossfader to the middle of its range of travel."
msgstr "Déplacer le crossfader au point milieu de son chemin."
#. TC: The attenuation response curve of the crossfader. User selectable.
-#: python/maingui.py:3518 python/maingui.py:3520
+#: python/maingui.py:3554 python/maingui.py:3556
msgid "Response"
msgstr "Réponse"
-#: python/maingui.py:3542
+#: python/maingui.py:3578
msgid ""
"This selects the response curve of the crossfader.\n"
"\n"
@@ -1446,11 +1474,11 @@ msgstr ""
"Les atténuations au point milieu sont respectivement -3dB, 0dB et -22dB "
#. TC: Duration in seconds.
-#: python/maingui.py:3556 python/maingui.py:3558
+#: python/maingui.py:3592 python/maingui.py:3594
msgid "Time"
msgstr "Durée"
-#: python/maingui.py:3575
+#: python/maingui.py:3611
msgid ""
"The time in seconds that the crossfader will take to automatically pass "
"across when the button to the right is clicked."
@@ -1460,11 +1488,11 @@ msgstr ""
#. TC: The crossfader pass-across button text.
#. TC: The actual button appears as [<-->] with this text above it.
-#: python/maingui.py:3584 python/maingui.py:3586
+#: python/maingui.py:3620 python/maingui.py:3622
msgid "Pass"
msgstr "Passer"
-#: python/maingui.py:3599
+#: python/maingui.py:3635
msgid ""
"This button causes the crossfader to move to the opposite side at a speed "
"determined by the speed selector to the left."
@@ -1472,30 +1500,30 @@ msgstr ""
"Ce bouton fait passer le crossfader vers le côté opposé à la vitesse "
"déterminée par le sélecteur de vitesse à gauche."
-#: python/maingui.py:3642
+#: python/maingui.py:3678
msgid "Peak"
msgstr "Pick"
-#: python/maingui.py:3645
+#: python/maingui.py:3681
msgid "A peak hold meter indicating the signal strength of the stream audio."
msgstr ""
"Un indicateur de pic temporisé montrant la force du signal du flux audio."
#. TC: This text appears above the stream mix VU meter.
-#: python/maingui.py:3667
+#: python/maingui.py:3703
msgid "VU"
msgstr "VU"
-#: python/maingui.py:3671
+#: python/maingui.py:3707
msgid "A VU meter for the stream audio."
msgstr "Un Vumêtre pour le flux audio."
#. TC: Appears above the mic meters as a label followed by a number.
-#: python/maingui.py:3674
+#: python/maingui.py:3710
msgid "Ch"
msgstr "Ch"
-#: python/maingui.py:3701
+#: python/maingui.py:3737
msgid ""
"A peak hold meter indicating the microphone signal strength and a meter "
"indicating attenuation levels in the microphone signal processing system. "
@@ -1508,470 +1536,469 @@ msgstr ""
"esseur, Rouge par le limiteur."
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:47
+#: python/midicontrols.py:48
msgid "Tooltips enable"
msgstr "Ballons Activer"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:49
+#: python/midicontrols.py:50
msgid "DJ-mix monitor"
msgstr "DJ-Mix Monitoring"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:51
+#: python/midicontrols.py:52
msgid "Panning load from presets"
msgstr "Placement chargé depuis la présélection"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:53
+#: python/midicontrols.py:54
msgid "Player play/pause"
msgstr "Lecteur Lecture/pause"
#. TC: Control method. Please keep it as Target:Action.
#. TC: Playlist control.
-#: python/midicontrols.py:55 python/playergui.py:3719
+#: python/midicontrols.py:56 python/playergui.py:3798
msgid "Player stop"
msgstr "Arret lecteur"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:57
+#: python/midicontrols.py:58
msgid "Player advance"
msgstr "Lecteur Avance"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:59
+#: python/midicontrols.py:60
msgid "Player play previous"
msgstr "Lecteur Lire précédente"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:61
+#: python/midicontrols.py:62
msgid "Player play next"
msgstr "Lecteur Lire suivante"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:63
+#: python/midicontrols.py:64
msgid "Player play selected from start"
msgstr "Lecteur Reprendre au début"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:65
+#: python/midicontrols.py:66
msgid "Player select previous"
msgstr "Lecteur Sélectionner la précédente"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:67
+#: python/midicontrols.py:68
msgid "Player select next"
msgstr "Lecteur Sélectionner la suivante"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:69
+#: python/midicontrols.py:70
msgid "Player stream output enable"
msgstr "Lecteur de flux Activer la sortie"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:71
+#: python/midicontrols.py:72
msgid "Player DJ output enable"
msgstr "Lecteur DJ Activer la sortie"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:73
+#: python/midicontrols.py:74
msgid "Player DJ-only switch"
msgstr "Lecteur Commuter DJ seul"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:75
+#: python/midicontrols.py:76
msgid "Player set volume"
msgstr "Lecteur Régler le volume"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:77
+#: python/midicontrols.py:78
msgid "Player set gain"
msgstr "Lecteur Régler le gain"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:79
+#: python/midicontrols.py:80
msgid "Player set balance"
msgstr "Lecteur Régler la balance"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:81
+#: python/midicontrols.py:82
msgid "Player set pitchbend"
msgstr "Lecteur Régler la tonalité"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:84
+#: python/midicontrols.py:85
msgid "Playlist edit tags"
msgstr "Liste de lecture Editer les tags"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:86
+#: python/midicontrols.py:87
msgid "Playlist insert stop"
msgstr "Liste de lecture Insérer un arret"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:88
+#: python/midicontrols.py:89
msgid "Playlist insert stop 2"
msgstr "Liste de lecture Insérer un arret 2"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:90
+#: python/midicontrols.py:91
msgid "Playlist insert announce"
msgstr "Liste de lecture Insérer une annonce"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:92
+#: python/midicontrols.py:93
msgid "Playlist insert transfer"
msgstr "Liste de lecture Insérer un transfert"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:94
+#: python/midicontrols.py:95
msgid "Playlist insert crossfade"
msgstr "Liste de lecture Insérer un crossfader"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:96
+#: python/midicontrols.py:97
msgid "Playlist insert pitchunbend"
msgstr "Liste de lecture Revenir à la tonalité originale"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:98
+#: python/midicontrols.py:99
msgid "Playlist insert jump to top"
msgstr "Liste de lecture Insérer un saut en haut"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:101
+#: python/midicontrols.py:102
msgid "Players set crossfade"
msgstr "Lecteurs Régler le crossfader"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:103
+#: python/midicontrols.py:104
msgid "Players pass crossfade"
msgstr "Lecteurs Effectuer un crossfader"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:105
+#: python/midicontrols.py:106
msgid "Players set focus"
msgstr "Lecteur Régler le focus"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:107
+#: python/midicontrols.py:108
msgid "Players show pitchbend"
msgstr "Lecteurs Afficher la tonalité"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:109
-#, fuzzy
+#: python/midicontrols.py:110
msgid "Players advance"
msgstr "Lecteur Avance"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:112
+#: python/midicontrols.py:113
msgid "Channel output enable"
msgstr "Canal Activer la sortie"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:114
+#: python/midicontrols.py:115
msgid "Channel set volume"
msgstr "Canal Régler le volume"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:116
+#: python/midicontrols.py:117
msgid "Channel set gain"
msgstr "Canal Régler le gain"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:118
+#: python/midicontrols.py:119
msgid "Channel set balance"
msgstr "Canal Régler la balance"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:121
+#: python/midicontrols.py:122
msgid "VoIP output enable"
msgstr "VoIP Activer la sortie"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:123
+#: python/midicontrols.py:124
msgid "VoIP DJ-only switch"
msgstr "VoIP DJ-Seul Commuter"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:125
+#: python/midicontrols.py:126
msgid "VoIP set volume"
msgstr "VoIP Régler le volume"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:127
+#: python/midicontrols.py:128
msgid "VoIP set mixback"
msgstr "VoIP Régler le retour"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:129
+#: python/midicontrols.py:130
msgid "VoIP set gain"
msgstr "VoIP Régler le gain"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:131
+#: python/midicontrols.py:132
msgid "VoIP set balance"
msgstr "VoIP Régler la balance"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:134
+#: python/midicontrols.py:135
msgid "Effect play from start"
msgstr "Effet Lire depuis le début"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:137
+#: python/midicontrols.py:138
msgid "Effects stop many"
msgstr "Effets Arrèter plusieurs"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:139
+#: python/midicontrols.py:140
msgid "Effects set volume"
msgstr "Effets Régler le volume"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:141
+#: python/midicontrols.py:142
msgid "Effects set headroom"
msgstr "Effets Régler le headroom"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:144
+#: python/midicontrols.py:145
msgid "Stream set connected"
msgstr "Flux Connecter"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:147
+#: python/midicontrols.py:148
msgid "Recorder set recording"
msgstr "Enregistreur Enregistrement"
#. TC: binding editor, action pane, first row, toplevel menu.
-#: python/midicontrols.py:151 python/midicontrols.py:1492
+#: python/midicontrols.py:152 python/midicontrols.py:1493
msgid "Player"
msgstr "Lecteur"
#. TC: binding editor, action pane, first row, toplevel menu.
#. TC: The midi channel.
#. TC: Specifically, the numerical midi channel.
-#: python/midicontrols.py:152 python/midicontrols.py:1498
-#: python/midicontrols.py:1567 python/midicontrols.py:1757
+#: python/midicontrols.py:153 python/midicontrols.py:1499
+#: python/midicontrols.py:1568 python/midicontrols.py:1758
msgid "Channel"
msgstr "Canal"
-#: python/midicontrols.py:153 python/preferences.py:596
-#: python/preferences.py:606
+#: python/midicontrols.py:154 python/preferences.py:599
+#: python/preferences.py:609
msgid "Effect"
msgstr "Effet"
-#: python/midicontrols.py:155
+#: python/midicontrols.py:156
msgid "Recorder"
msgstr "Enregistreur"
-#: python/midicontrols.py:156
+#: python/midicontrols.py:157
msgid "Setting"
msgstr "Paramètres"
-#: python/midicontrols.py:160
+#: python/midicontrols.py:161
msgid "Left player"
msgstr "Lecteur de gauche"
-#: python/midicontrols.py:161
+#: python/midicontrols.py:162
msgid "Right player"
msgstr "Lecteur de droite"
-#: python/midicontrols.py:162
+#: python/midicontrols.py:163
msgid "Background player"
msgstr "Lecteur de fond"
-#: python/midicontrols.py:163
+#: python/midicontrols.py:164
msgid "Focused player"
msgstr "Lecteur actif"
-#: python/midicontrols.py:164
+#: python/midicontrols.py:165
msgid "Fadered player"
msgstr "Lecteur affaibli"
-#: python/midicontrols.py:168
+#: python/midicontrols.py:169
msgid "Effects bank 1"
msgstr "Effets Banque 1"
-#: python/midicontrols.py:169
+#: python/midicontrols.py:170
msgid "Effects bank 2"
msgstr "Effets Banque 2"
-#: python/midicontrols.py:170
+#: python/midicontrols.py:171
msgid "All effects"
msgstr "Tous les effets"
#. TC: The name of the backspace key.
-#: python/midicontrols.py:404
+#: python/midicontrols.py:405
msgid "BackSpace"
msgstr "Retour Arrière"
#. TC: binding editor, action pane, third row, heading text.
-#: python/midicontrols.py:1468
+#: python/midicontrols.py:1469
msgid "Use value"
msgstr "Utiliser la valeur"
#. TC: binding editor, action pane, third row, heading text.
-#: python/midicontrols.py:1470
+#: python/midicontrols.py:1471
msgid "Act if"
msgstr "Agir si"
#. TC: binding editor, action pane, third row, heading text.
-#: python/midicontrols.py:1472
+#: python/midicontrols.py:1473
msgid "Set to"
msgstr "Régler à"
#. TC: binding editor, action pane, third row, heading text.
-#: python/midicontrols.py:1474
+#: python/midicontrols.py:1475
msgid "Adjust by"
msgstr "Ajuster par"
#. TC: binding editor, input pane, fourth row, heading text.
-#: python/midicontrols.py:1479 python/midicontrols.py:1483
+#: python/midicontrols.py:1480 python/midicontrols.py:1484
msgid "Control"
msgstr "Contrôle"
#. TC: binding editor, input pane, fourth row, heading text.
-#: python/midicontrols.py:1481
+#: python/midicontrols.py:1482
msgid "Note"
msgstr "Note"
#. TC: binding editor, input pane, fourth row, heading text.
-#: python/midicontrols.py:1485
+#: python/midicontrols.py:1486
msgid "Key"
msgstr "Touche"
#. TC: binding editor, action pane, first row, toplevel menu.
-#: python/midicontrols.py:1490
+#: python/midicontrols.py:1491
msgid "Miscellaneous"
msgstr "Divers"
#. TC: binding editor, action pane, first row, toplevel menu.
-#: python/midicontrols.py:1494
+#: python/midicontrols.py:1495
msgid "Both players"
msgstr "Les deux lecteurs"
#. TC: binding editor, action pane, first row, toplevel menu.
-#: python/midicontrols.py:1496
+#: python/midicontrols.py:1497
msgid "Quick panning"
msgstr "Panoramique rapide"
#. TC: binding editor, action pane, first row, toplevel menu.
-#: python/midicontrols.py:1500
+#: python/midicontrols.py:1501
msgid "VoIP channel"
msgstr "Canal VoIP"
#. TC: binding editor, action pane, first row, toplevel menu.
-#: python/midicontrols.py:1502
+#: python/midicontrols.py:1503
msgid "Single effect"
msgstr "Effet unique"
#. TC: binding editor, action pane, first row, toplevel menu.
-#: python/midicontrols.py:1504
+#: python/midicontrols.py:1505
msgid "Effects bank"
msgstr "Banque d'effets"
#. TC: binding editor, action pane, first row, toplevel menu.
-#: python/midicontrols.py:1508
+#: python/midicontrols.py:1509
msgid "Stream recorder"
msgstr "Enregistreur de flux"
#. TC: binding editor, action pane, second row, dropdown text.
-#: python/midicontrols.py:1513
+#: python/midicontrols.py:1514
msgid "Direct fader/held button"
msgstr "Bouton fader/premuto"
#. TC: binding editor, action pane, second row, dropdown text.
-#: python/midicontrols.py:1515
+#: python/midicontrols.py:1516
msgid "One-shot/toggle button"
msgstr "Bouton One-shot/Commuter"
#. TC: binding editor, action pane, second row, dropdown text.
-#: python/midicontrols.py:1517
+#: python/midicontrols.py:1518
msgid "Set value"
msgstr "Régler la valeur"
#. TC: binding editor, action pane, second row, dropdown text.
-#: python/midicontrols.py:1519
+#: python/midicontrols.py:1520
msgid "Alter value"
msgstr "Modifier la valeur"
#. TC: binding editor, input pane, second row, dropdown text.
-#: python/midicontrols.py:1524
+#: python/midicontrols.py:1525
msgid "MIDI control"
msgstr "Contrôle MIDI"
#. TC: binding editor, input pane, second row, dropdown text.
-#: python/midicontrols.py:1526
+#: python/midicontrols.py:1527
msgid "MIDI note"
msgstr "Note MIDI"
#. TC: binding editor, input pane, second row, dropdown text.
-#: python/midicontrols.py:1528
+#: python/midicontrols.py:1529
msgid "MIDI pitch-wheel"
msgstr "Tonalité MIDI"
#. TC: binding editor, input pane, second row, dropdown text.
-#: python/midicontrols.py:1530
+#: python/midicontrols.py:1531
msgid "Keyboard press"
msgstr "Touché du clavier"
#. TC: binding editor, input pane, second row, dropdown text.
-#: python/midicontrols.py:1532
+#: python/midicontrols.py:1533
msgid "XChat command"
msgstr "Commande XChat"
#. TC: Dialog window title text.
#. TC: User is expected to edit a control binding.
-#: python/midicontrols.py:1541
+#: python/midicontrols.py:1542
msgid "Edit control binding"
msgstr "Editer les contrôleurs"
#. TC: After clicking this button the binding editor will be listening
#. TC: for a key press or midi control surface input.
#. TC: Button text. If pressed triggers 'Listening for input' mode.
-#: python/midicontrols.py:1556 python/midicontrols.py:1637
-#: python/midicontrols.py:1736
+#: python/midicontrols.py:1557 python/midicontrols.py:1638
+#: python/midicontrols.py:1737
msgid "Listen for input..."
msgstr "Ecouter sur l'entrée…"
#. TC: The input source.
-#: python/midicontrols.py:1564
+#: python/midicontrols.py:1565
msgid "Source"
msgstr "Source"
#. TC: The manner in which the input is interpreted.
-#: python/midicontrols.py:1583
+#: python/midicontrols.py:1584
msgid "Interaction"
msgstr "Interraction"
#. TC: The effect of the control can be directed upon a specific target.
#. TC: e.g. On target [Left player]
-#: python/midicontrols.py:1589
+#: python/midicontrols.py:1590
msgid "On target"
msgstr "Destination"
#. TC: Checkbutton text.
#. TC: Use reverse scale and invert the meaning of button presses.
-#: python/midicontrols.py:1597
+#: python/midicontrols.py:1598
msgid "Reversed"
msgstr "Inversé"
-#: python/midicontrols.py:1598
+#: python/midicontrols.py:1599
msgid "Pressed"
msgstr "Pressé"
-#: python/midicontrols.py:1600
+#: python/midicontrols.py:1601
msgid "Released"
msgstr "Relaché"
#. TC: Tree column heading for Inputs e.g. Backspace, F1, S.
-#: python/midicontrols.py:1630 python/midicontrols.py:1991
+#: python/midicontrols.py:1631 python/midicontrols.py:1992
msgid "Input"
msgstr "Entrée"
-#: python/midicontrols.py:1634
+#: python/midicontrols.py:1635
#, python-format
msgid ""
"The first half of a binding is the input which comes in the form of the "
@@ -1985,33 +2012,33 @@ msgstr ""
"La sélection peut se faire manuellement ou à l'aide de l'option «%s»."
#. TC: Tree column heading for actions e.g. Player stop.
-#: python/midicontrols.py:1670 python/midicontrols.py:1676
-#: python/midicontrols.py:2005
+#: python/midicontrols.py:1671 python/midicontrols.py:1677
+#: python/midicontrols.py:2006
msgid "Action"
msgstr "Action"
#. TC: %s is the translation of 'Action'.
-#: python/midicontrols.py:1675
+#: python/midicontrols.py:1676
#, python-format
msgid "The '%s' pane determines how the input is handled, and to what effect."
msgstr ""
"Le ventail «%s» détermine comment l'entrée est gérée et quels en sont les "
"effets."
-#: python/midicontrols.py:1732
+#: python/midicontrols.py:1733
msgid "Listening for input"
msgstr "Lecture de l'entrée"
#. TC: Refers to key modifiers including Ctrl, Alt, Shift, ....
-#: python/midicontrols.py:1753
+#: python/midicontrols.py:1754
msgid "Shifting"
msgstr "Altération"
-#: python/midicontrols.py:1952
+#: python/midicontrols.py:1953
msgid "Singular control"
msgstr "Contrôle unique"
-#: python/midicontrols.py:2014
+#: python/midicontrols.py:2015
msgid "Target"
msgstr "Obiettivo"
@@ -2065,7 +2092,7 @@ msgid " Additional Text Frames "
msgstr " Champs texte additionnels "
#. TC: The album track number.
-#: python/mutagentagger.py:376 python/songdb.py:789 python/songdb.py:1160
+#: python/mutagentagger.py:376 python/songdb.py:906 python/songdb.py:1295
msgid "Track"
msgstr "Piste"
@@ -2091,57 +2118,63 @@ msgstr "Nom du fichier :"
msgid "Native"
msgstr "Natif"
-#: python/songdb.py:174
+#: python/songdb.py:177
msgid "Connecting"
msgstr "Connexion"
# python-format
-#: python/songdb.py:183
+#: python/songdb.py:188
#, python-format
msgid "Connection failed (try %d)"
msgstr "Connexion échouée (essayez %d)"
-#: python/songdb.py:195
-msgid "Connected: utf-8 mode failed"
+#: python/songdb.py:199
+#, fuzzy
+msgid "Connected: autocommit mode failed"
msgstr "Connecté : Echec du mode utf-8"
-#: python/songdb.py:197
+#: python/songdb.py:201
+#, fuzzy
+msgid "Connected: autocommit mode set"
+msgstr "Connecté : Echec du mode utf-8"
+
+#: python/songdb.py:202
msgid "Connected"
msgstr "Connecté"
-#: python/songdb.py:205
+#: python/songdb.py:210
msgid "Job dropped"
msgstr "Tâche abandonnée"
-#: python/songdb.py:215 python/songdb.py:427
+#: python/songdb.py:220 python/songdb.py:431
msgid "Disconnected"
msgstr "Disconnecté"
-#: python/songdb.py:229
+#: python/songdb.py:233
msgid "Problem dropping connection"
msgstr "Problème lors de l'abandon de la tâche"
-#: python/songdb.py:231
+#: python/songdb.py:235
msgid "Connection dropped"
msgstr "Connexion abandonnée"
-#: python/songdb.py:322
+#: python/songdb.py:326
msgid "Hostname[:Port]"
msgstr "Hôte[:Port]"
-#: python/songdb.py:327
+#: python/songdb.py:331
msgid "User Name"
msgstr "Nom utilisateur"
-#: python/songdb.py:330
+#: python/songdb.py:334
msgid "Database"
msgstr "Base de données"
-#: python/songdb.py:385
+#: python/songdb.py:389
msgid "Prokyon3 or Ampache (song title) Database"
msgstr "Base de donnée Prokyon3 ou Ampache (titre de chanson)"
-#: python/songdb.py:386
+#: python/songdb.py:390
msgid ""
"You can make certain media databases accessible in IDJC for easy drag and "
"drop into the playlists."
@@ -2149,165 +2182,194 @@ msgstr ""
"Vous pouvez rendre certaines bases de données accessibles dans IDJC pour "
"plusde facilités lors des glisser/déposer dans les listes de lectures"
-#: python/songdb.py:434
+#: python/songdb.py:438
msgid "Module mysql-python (MySQLdb) required"
msgstr "Module mysql-python (MySQLdb) nécessaire"
-#: python/songdb.py:675 python/songdb.py:680
+#: python/songdb.py:707 python/songdb.py:723 python/songdb.py:747
+#: python/songdb.py:805
msgid "<unknown>"
msgstr "<inconnu>"
-#: python/songdb.py:761
+#: python/songdb.py:741
+#, fuzzy
+msgid "Not Played"
+msgstr "Dernière lue"
+
+#: python/songdb.py:878
msgid "Reload the database."
msgstr "Recharger la base de données"
-#: python/songdb.py:766
+#: python/songdb.py:883
msgid "Expand entire tree."
msgstr "Développer l'arborescence."
-#: python/songdb.py:767
+#: python/songdb.py:884
msgid "Collapse tree."
msgstr "Enrouler l'arborescence."
-#: python/songdb.py:774
+#: python/songdb.py:891
msgid "Browse"
msgstr "Parcourrir"
#. TC: The disk number of the album track.
-#: python/songdb.py:787 python/songdb.py:1159
+#: python/songdb.py:904 python/songdb.py:1294
msgid "Disk"
msgstr "Disque"
#. TC: Track playback time.
#. TC: Playback time.
-#: python/songdb.py:791 python/songdb.py:1162 python/playergui.py:312
+#: python/songdb.py:908 python/songdb.py:1296 python/playergui.py:313
msgid "Duration"
msgstr "Durée"
-#: python/songdb.py:792 python/songdb.py:1163
+#: python/songdb.py:910 python/songdb.py:1297 python/format.py:594
+#: python/format.py:615 python/format.py:701 python/format.py:722
+#: python/format.py:857 python/format.py:962 python/format.py:1012
+#: python/format.py:1022
msgid "Bitrate"
msgstr "Bitrate"
-#: python/songdb.py:793 python/songdb.py:1164
+#: python/songdb.py:911 python/songdb.py:1298
msgid "Filename"
msgstr "Nom du fichier"
#. TC: Directory path to a file.
-#: python/songdb.py:795 python/songdb.py:1165
+#: python/songdb.py:913 python/songdb.py:1299
msgid "Path"
msgstr "Répertoire"
-#: python/songdb.py:800
+#: python/songdb.py:918
msgid "Artist - Album - Title"
msgstr "Artiste - Album - Titre"
-#: python/songdb.py:801
+#: python/songdb.py:919
msgid "Album - [Disk] - Title"
msgstr "Album - [Disque] - Titre"
-#: python/songdb.py:821
+#: python/songdb.py:939
msgid "Fetching"
msgstr "Découverte"
-#: python/songdb.py:953
+#: python/songdb.py:1084
msgid "Tree fetch failed"
msgstr "Echec de la découverte de l'arborescence"
-#: python/songdb.py:955
+#: python/songdb.py:1085
msgid "Fetch Failed!"
msgstr "Echec de la découverte!"
-#: python/songdb.py:968
+#: python/songdb.py:1098
msgid "Populating"
msgstr "Popularité"
-#: python/songdb.py:1094
+#: python/songdb.py:1224
#, python-format
msgid "Disk %d"
msgstr "Disque %d"
#. TC: User specified search filter entry box title text.
-#: python/songdb.py:1113
+#: python/songdb.py:1243
msgid "Filters"
msgstr "Filtres"
#. TC: A type of search on any data field matching paritial strings.
-#: python/songdb.py:1125
+#: python/songdb.py:1255
msgid "Fuzzy Search"
msgstr "Recherche floue"
#. TC: WHERE is an SQL keyword.
-#: python/songdb.py:1134
+#: python/songdb.py:1264
msgid "WHERE"
-msgstr "LA_OU"
+msgstr "WHERE"
-#: python/songdb.py:1147
+#: python/songdb.py:1277
msgid "Search"
msgstr "Recherche"
-#: python/songdb.py:1440
-msgid "Catalogs"
+#: python/songdb.py:1514 python/songdb.py:1639
+msgid "Minutes"
msgstr ""
-#: python/songdb.py:1445
+#: python/songdb.py:1514 python/songdb.py:1639
#, fuzzy
+msgid "Hours"
+msgstr "Couleurs"
+
+#: python/songdb.py:1515 python/songdb.py:1639
+msgid "Days"
+msgstr ""
+
+#: python/songdb.py:1515 python/songdb.py:1639 python/songdb.py:1709
+#: python/songdb.py:1803
+msgid "Weeks"
+msgstr ""
+
+#: python/songdb.py:1609
+msgid "Catalogs"
+msgstr "Catalogues"
+
+#: python/songdb.py:1616
msgid "Name"
-msgstr "Sans nom"
+msgstr "Nom"
-#: python/songdb.py:1446
+#: python/songdb.py:1617
msgid "Catalog Path"
-msgstr ""
+msgstr "Chemin du Catalogue"
-#: python/songdb.py:1447
-#, fuzzy
+#: python/songdb.py:1618
msgid "Prepend Path"
-msgstr "Avant"
+msgstr "Chemin Préfixe"
-#: python/songdb.py:1462
+#: python/songdb.py:1626
#, fuzzy
+msgid "Last Played Scale"
+msgstr "Dernière lue"
+
+#: python/songdb.py:1658
msgid "Path Peel"
-msgstr "Répertoire"
+msgstr "Chemin supprimable"
-#: python/songdb.py:1528
+#: python/songdb.py:1737
msgid "N/A"
-msgstr ""
+msgstr "S/O"
-#: python/songdb.py:1703
+#: python/songdb.py:1918
msgid "Failed to create FULLTEXT index"
-msgstr "Echec de la création de l'index PLEIN TEXTE"
+msgstr "Echec de la création de l'index TEXTE"
-#: python/songdb.py:1707
+#: python/songdb.py:1922
msgid "Found existing FULLTEXT index"
-msgstr "Un index PLEIN TEXTE exite déjà"
+msgstr "Un index TEXTE exite déjà"
-#: python/songdb.py:1721 python/songdb.py:1734
+#: python/songdb.py:1936 python/songdb.py:1949
msgid "Unrecognised database"
msgstr "Base de données non reconnue"
-#: python/songdb.py:1729
+#: python/songdb.py:1944
msgid "Found Prokyon 3 schema"
msgstr "Schéma Prokyon 3 trouvé"
-#: python/playergui.py:235
+#: python/playergui.py:236
msgid "Cuesheet Playlist"
msgstr "Liste de lecture cuesheet"
#. TC: Column heading, the track number.
-#: python/playergui.py:301
+#: python/playergui.py:302
msgid "Trk"
msgstr "Piste"
#. TC: Column heading, the index number.
-#: python/playergui.py:304
+#: python/playergui.py:305
msgid "Ind"
msgstr "Index"
-#: python/playergui.py:413
+#: python/playergui.py:414
msgid "External Playlist"
msgstr "Liste de lecture externe"
#. TC: Button text to activate an external playlist.
-#: python/playergui.py:424
+#: python/playergui.py:425
msgid "Active"
msgstr "Attivée"
@@ -2335,242 +2397,252 @@ msgstr "Créer une nouvelle annonce"
msgid "Modify or Delete this announcement"
msgstr "Modifier ou supprimer cette annonce"
-#. TC: Playlist control.
#. TC: Embed a DJ announcement text into the playlist.
-#: python/playergui.py:528 python/playergui.py:3709 python/playergui.py:4347
+#: python/playergui.py:528 python/playergui.py:4430
msgid "Announcement"
msgstr "Annonce"
#. TC: The time format as minutes and seconds.
-#: python/playergui.py:555
+#: python/playergui.py:556
msgid "mm:ss"
msgstr "mm:ss"
#. TC: Alongside the name of the next track.
-#: python/playergui.py:608
+#: python/playergui.py:609
msgid "Next track"
msgstr "Piste suivante"
-#: python/playergui.py:933
+#: python/playergui.py:934
msgid "By Extension"
msgstr "Par extention"
-#: python/playergui.py:933
+#: python/playergui.py:934
msgid "M3U playlist"
msgstr "Liste de lecture M3U"
#: python/playergui.py:934
+#, fuzzy
+msgid "M3U8 playlist"
+msgstr "Liste de lecture M3U"
+
+#: python/playergui.py:935
msgid "XSPF playlist"
msgstr "Liste de lecture XSPF"
-#: python/playergui.py:934
+#: python/playergui.py:935
msgid "PLS playlist"
msgstr "Liste de lecture PLS"
-#: python/playergui.py:1006
+#: python/playergui.py:1007
#, python-format
msgid "%d Audio Tracks"
msgstr "%d pistes audio"
#. TC: Missing metadata text.
-#: python/playergui.py:1016
+#: python/playergui.py:1017
msgid "Unknown"
msgstr "Inconnu"
-#: python/playergui.py:1020
+#: python/playergui.py:1021
msgid "(Cue sheet)"
msgstr "(Cue Sheet)"
-#: python/playergui.py:1054
+#: python/playergui.py:1058
msgid "Bad Tag"
msgstr "Tag erroné"
-#: python/playergui.py:1830 python/playergui.py:4185
+#: python/playergui.py:1888 python/playergui.py:4268
msgid "Manual"
msgstr "Manuel"
-#: python/playergui.py:1834 python/playergui.py:4182
+#: python/playergui.py:1892 python/playergui.py:4265
msgid "Play All"
msgstr "Tout jouer"
-#: python/playergui.py:1842 python/playergui.py:1851 python/playergui.py:4183
+#: python/playergui.py:1900 python/playergui.py:1909 python/playergui.py:4266
msgid "Loop All"
msgstr "Tout boucler"
-#: python/playergui.py:1842 python/playergui.py:4186
+#: python/playergui.py:1900 python/playergui.py:4269
msgid "Cue Up"
msgstr "Pré-écoute"
-#: python/playergui.py:1843 python/playergui.py:4190
+#: python/playergui.py:1901 python/playergui.py:4273
msgid "Fade Over"
msgstr "Fondu dessus"
-#: python/playergui.py:1855 python/playergui.py:1926 python/playergui.py:4184
+#: python/playergui.py:1913 python/playergui.py:1984 python/playergui.py:4267
msgid "Random"
msgstr "Aléatoire"
-#: python/playergui.py:1895 python/playergui.py:4187
+#: python/playergui.py:1953 python/playergui.py:4270
msgid "External"
msgstr "Externe"
-#: python/playergui.py:1907 python/playergui.py:1923 python/playergui.py:4189
+#: python/playergui.py:1965 python/playergui.py:1981 python/playergui.py:4272
msgid "Alternate"
msgstr "Alternatif"
-#: python/playergui.py:1907 python/playergui.py:1925 python/playergui.py:4191
+#: python/playergui.py:1965 python/playergui.py:1983 python/playergui.py:4274
msgid "Random Hop"
msgstr "Hop aléatoire"
#. TC: The remaining playlist time.
-#: python/playergui.py:2080 python/playergui.py:2086
+#: python/playergui.py:2138 python/playergui.py:2144
msgid "Remaining"
msgstr "Restant"
#. TC: The estimated finish time of the playlist.
#. TC: The estimated finish time of the playlist (ETA).
-#: python/playergui.py:2082 python/playergui.py:2086 python/playergui.py:2100
+#: python/playergui.py:2140 python/playergui.py:2144 python/playergui.py:2158
msgid "Finish"
msgstr "Fini"
#. TC: The play duration of the block of audio tracks.
-#: python/playergui.py:2087 python/playergui.py:2098
+#: python/playergui.py:2145 python/playergui.py:2156
msgid "Block size"
msgstr "Taille de block"
#. TC: File dialog title text.
-#: python/playergui.py:2485
+#: python/playergui.py:2546
msgid "Add music to left playlist"
msgstr "Ajouter de la musique à la liste de gauche"
#. TC: File dialog title text.
-#: python/playergui.py:2488
+#: python/playergui.py:2549
msgid "Add music to right playlist"
msgstr "Ajouter de la musique à la liste de droite"
-#: python/playergui.py:2490
+#: python/playergui.py:2551
msgid "Add background music"
msgstr "ajouter une musique de fond"
#. TC: File filter text.
-#: python/playergui.py:2502
+#: python/playergui.py:2563
msgid "Supported Media Formats"
msgstr "Formats de média supportés"
#. TC: Expander text "Select File Type (.pls)" for the pls file type.
-#: python/playergui.py:2564
+#: python/playergui.py:2625
msgid "Select File Type"
msgstr "Sélectionner le type de fichier"
-#: python/playergui.py:3308
+#: python/playergui.py:3383
msgid "Save left playlist"
msgstr "Sauvegarder la liste de lecture de gauche"
-#: python/playergui.py:3310
+#: python/playergui.py:3385
msgid "Save right playlist"
msgstr "Sauvegarder la liste de lecture de droite"
-#: python/playergui.py:3312
+#: python/playergui.py:3387
msgid "Save background playlist"
msgstr "Sauvegarder la liste de lecture de fond"
-#: python/playergui.py:3330
+#: python/playergui.py:3405
msgid "File Type"
msgstr "Type de fichier"
-#: python/playergui.py:3335
+#: python/playergui.py:3410
msgid "Extension"
msgstr "Extention"
#. TC: Playlist control.
#. TC: Insert playlist control to do a ten second fade to the next track.
-#: python/playergui.py:3693 python/playergui.py:4358
+#: python/playergui.py:3774 python/playergui.py:4441
msgid "Fade 10s"
msgstr "Fondu 10s"
#. TC: Playlist control.
#. TC: Insert playlist control to do a five second fade to the next track.
-#: python/playergui.py:3699 python/playergui.py:4365
+#: python/playergui.py:3780 python/playergui.py:4448
msgid "Fade 5s"
msgstr "Fondu 5s"
#. TC: Playlist control.
#. TC: Insert playlist control to not do a fade to the next track.
-#: python/playergui.py:3704 python/playergui.py:4372
+#: python/playergui.py:3785 python/playergui.py:4455
msgid "No Fade"
msgstr "Aucun Fondu"
#. TC: Playlist control.
-#: python/playergui.py:3714
+#: python/playergui.py:3793
msgid ">> Normal Speed <<"
msgstr ">> Vitesse normale <<"
#. TC: Playlist control.
-#: python/playergui.py:3724
+#: python/playergui.py:3803
msgid "Player stop 2"
msgstr "Arret Lecteur 2"
#. TC: Playlist control.
#. TC: Insert playlist control to jump to the top of the playlist.
-#: python/playergui.py:3729 python/playergui.py:4324
+#: python/playergui.py:3808 python/playergui.py:4407
msgid "Jump To Top"
msgstr "Retour en haut"
#. TC: Playlist control.
-#: python/playergui.py:3734 python/playergui.py:4384
+#: python/playergui.py:3813 python/playergui.py:4467
msgid "Stop streaming"
msgstr "Arret du flux"
#. TC: Playlist control.
-#: python/playergui.py:3739 python/playergui.py:4392
+#: python/playergui.py:3818 python/playergui.py:4475
msgid "Stop recording"
msgstr "Arret de l'enregistrement"
+#: python/playergui.py:3851
+#, fuzzy
+msgid "Announcement:"
+msgstr "Annonce"
+
#. TC: Playlist control.
-#: python/playergui.py:3774
+#: python/playergui.py:3857
msgid ">>> Transfer across >>>"
msgstr ">>> Transfer en face >>>"
#. TC: Playlist control.
-#: python/playergui.py:3777
+#: python/playergui.py:3860
msgid "<<< Transfer across <<<"
msgstr "<<< Transfer en face <<<"
#. TC: Playlist control.
-#: python/playergui.py:3782
+#: python/playergui.py:3865
msgid ">>> Fade across >>>"
msgstr ">>> Fondu en face >>>"
#. TC: Playlist control.
-#: python/playergui.py:3785
+#: python/playergui.py:3868
msgid "<<< Fade across <<<"
msgstr "<<< Fondu en face <<<"
#. TC: Playlist control.
-#: python/playergui.py:3791
+#: python/playergui.py:3874
msgid "Ignored playlist control"
msgstr "Contrôle de liste de lecture ignoré"
-#: python/playergui.py:3859
+#: python/playergui.py:3942
+#, python-brace-format
msgid "Playing track {0} of {1}"
msgstr "Lecture piste {0} sur {1}"
#. TC: Previous line: Playing track {0} of {1}
-#: python/playergui.py:3872
+#: python/playergui.py:3955
#, python-format
msgid "From the album, %s"
msgstr "De l'album, %s"
-#: python/playergui.py:3879
+#: python/playergui.py:3962
#, python-format
msgid "Total number of tracks %d"
msgstr "Nombre de piste total %d"
-#: python/playergui.py:3883 python/playergui.py:3885
+#: python/playergui.py:3966 python/playergui.py:3968
#, python-format
msgid "Total play duration %s"
msgstr "Durée totale %s"
-#: python/playergui.py:3935
+#: python/playergui.py:4018
msgid ""
"Left click toggles between showing the amount of time elapsed or remaining "
"on the current track being played."
@@ -2578,7 +2650,7 @@ msgstr ""
"Clic à gauche pour afficher le temps écoulé ou le temps restant pour la "
"piste en cours de reproduction."
-#: python/playergui.py:3953
+#: python/playergui.py:4036
msgid ""
"This slider acts as both a play progress indicator and as a means for "
"seeking within the currently playing track."
@@ -2587,15 +2659,16 @@ msgstr ""
"positionneur dans la piste en cours de reproduction."
#. TC: File filter text.
-#: python/playergui.py:4042
+#: python/playergui.py:4125
msgid "All file types"
msgstr "Tout type de fichier"
-#: python/playergui.py:4047
-msgid "Playlist types (*.m3u, *.xspf, *.pls)"
-msgstr "Type de listes de lecture (*.m3u, *.xspf, *.pls)"
+#: python/playergui.py:4130
+#, fuzzy
+msgid "Playlist types"
+msgstr "Liste de lecture 1"
-#: python/playergui.py:4062
+#: python/playergui.py:4145
msgid ""
"'Block size' indicates the amount of time that it will take to play from the "
"currently selected track to the next stop.\n"
@@ -2607,43 +2680,43 @@ msgstr ""
"«Restant» indique le temps restant avant le prochain arret.\n"
"«Fin» est le temps calculé lorsque la piste aura fini d'être lue."
-#: python/playergui.py:4085
+#: python/playergui.py:4168
msgid "This adjusts the playback speed anywhere from 25% to 400%."
msgstr "Ajuste la vitesse de reproduction entre 25% et 400%."
-#: python/playergui.py:4099
+#: python/playergui.py:4182
msgid "This sets the playback speed back to normal."
msgstr "Remet la vitesse de reproduction à sa valeur normale."
-#: python/playergui.py:4116
+#: python/playergui.py:4199
msgid "Previous track."
msgstr "Piste précédente"
-#: python/playergui.py:4128
+#: python/playergui.py:4211
msgid "Play."
msgstr "Lecture"
-#: python/playergui.py:4138
+#: python/playergui.py:4221
msgid "Pause."
msgstr "Pause"
-#: python/playergui.py:4148
+#: python/playergui.py:4231
msgid "Stop."
msgstr "Arret"
-#: python/playergui.py:4158
+#: python/playergui.py:4241
msgid "Next track."
msgstr "Piste suivante"
-#: python/playergui.py:4170
+#: python/playergui.py:4253
msgid "Add tracks to the playlist."
msgstr "Ajouter des pistes à la liste"
-#: python/playergui.py:4177 python/preferences.py:70
+#: python/playergui.py:4260 python/preferences.py:71
msgid "Playlist Mode"
msgstr "Mode de la liste de lecture"
-#: python/playergui.py:4196
+#: python/playergui.py:4279
msgid ""
"This sets the playlist mode which defines player behaviour after a track has "
"finished playing.\n"
@@ -2708,31 +2781,31 @@ msgstr ""
"opposée."
#. TC: Fade time heading.
-#: python/playergui.py:4220 python/preferences.py:71
+#: python/playergui.py:4303 python/preferences.py:72
msgid "Fade"
msgstr "Fondu"
-#: python/playergui.py:4232
+#: python/playergui.py:4315
msgid "This controls the amount of fade between tracks."
msgstr "Contrôle le taux de fondu entre les pistes."
-#: python/playergui.py:4239
+#: python/playergui.py:4322
msgid "Audio Feed"
msgstr "Audio Feed"
-#: python/playergui.py:4249
+#: python/playergui.py:4332
msgid "Make output from this player available for streaming."
msgstr "Rendre la sortie de ce lecteur disponible pour le flux"
-#: python/playergui.py:4257
+#: python/playergui.py:4340
msgid "Make output from this player audible to the DJ."
msgstr "Rendre la sortie de ce lecteur audible au DJ"
-#: python/playergui.py:4259
+#: python/playergui.py:4342
msgid "Force"
msgstr "Forcer"
-#: python/playergui.py:4265
+#: python/playergui.py:4348
msgid ""
"When selected this player will be treated like a main player.\n"
"It will be affected by microphone ducking and won't mute when a main player "
@@ -2743,142 +2816,142 @@ msgstr ""
"lecteur principal est en fonction."
#. TC: Insert playlist control.
-#: python/playergui.py:4278
+#: python/playergui.py:4361
msgid "Insert control"
msgstr "Insérer un contrôle"
#. TC: The Item submenu.
-#: python/playergui.py:4287
+#: python/playergui.py:4370
msgid "Item"
msgstr "Elément"
#. TC: The Playlist submenu.
-#: python/playergui.py:4292
+#: python/playergui.py:4375
msgid "Playlist"
msgstr "Liste de lecture"
#. TC: Insert playlist control to set playback speed to normal.
-#: python/playergui.py:4303
+#: python/playergui.py:4386
msgid "Normal Speed"
msgstr "Vitesse normale"
#. TC: Submenu Item. Parent menu is Playlist.
-#: python/playergui.py:4332 python/playergui.py:4486
+#: python/playergui.py:4415 python/playergui.py:4569
msgid "Transfer"
msgstr "Transfer"
-#: python/playergui.py:4340
+#: python/playergui.py:4423
msgid "Crossfade"
msgstr "Crossfader"
#. TC: Menu item. Opens the metadata tagger on the selected track.
-#: python/playergui.py:4405
+#: python/playergui.py:4488
msgid "Meta Tag"
msgstr "Méta Tag"
#. TC: Menu Item. Duplicates the selected track in the playlist.
-#: python/playergui.py:4411
+#: python/playergui.py:4494
msgid "Duplicate"
msgstr "Dupliquer"
#. TC: Menu Item. Remove the selected track.
-#: python/playergui.py:4418
+#: python/playergui.py:4501
msgid "Remove"
msgstr "Supprimer"
#. TC: Submenu Item. Parent menu item is Remove.
-#: python/playergui.py:4429
+#: python/playergui.py:4512
msgid "This"
msgstr "Ceci"
#. TC: Submenu Item. Parent menu item is Remove.
-#: python/playergui.py:4436 python/preferences.py:1234
+#: python/playergui.py:4519 python/preferences.py:1237
msgid "All"
msgstr "Tout"
#. TC: Submenu Item. Parent menu item is Remove.
-#: python/playergui.py:4443
+#: python/playergui.py:4526
msgid "From Here"
msgstr "Depuis ici"
#. TC: Submenu Item. Parent menu item is Remove.
-#: python/playergui.py:4450
+#: python/playergui.py:4533
msgid "To Here"
msgstr "Jusqu'ici"
#. TC: Open the file dialog for adding music to the chosen playlist.
-#: python/playergui.py:4463
+#: python/playergui.py:4546
msgid "Add Music"
msgstr "Ajouter de la musique"
#. TC: Submenu Item. Parent menu is Playlist.
-#: python/playergui.py:4470
+#: python/playergui.py:4553
msgid "Save"
msgstr "Sauvegarder"
#. TC: Submenu Item. Parent menu is Playlist.
-#: python/playergui.py:4481
+#: python/playergui.py:4564
msgid "Copy"
msgstr "Copier"
-#: python/playergui.py:4492
+#: python/playergui.py:4575
msgid "Exchange"
msgstr "Echanger"
#. TC: Submenu Item. Parent menu is Playlist.
-#: python/playergui.py:4499
+#: python/playergui.py:4582
msgid "Empty"
msgstr "Vide"
#. TC: Submenu Item. Parent menus are Playlist->Copy.
#. TC: Submenu Item. Parent menus are Playlist->Transfer.
-#: python/playergui.py:4513 python/playergui.py:4552
+#: python/playergui.py:4596 python/playergui.py:4635
msgid "Append"
msgstr "Après"
#. TC: Submenu Item. Parent menus are Playlist->Copy.
#. TC: Submenu Item. Parent menus are Playlist->Transfer.
-#: python/playergui.py:4520 python/playergui.py:4559
+#: python/playergui.py:4603 python/playergui.py:4642
msgid "Prepend"
msgstr "Avant"
#. TC: Submenu Item. Parent menus are Playlist->Copy.
-#: python/playergui.py:4531
+#: python/playergui.py:4614
msgid "Append Cursor"
msgstr "Ajouter après le curseur"
#. TC: Submenu Item. Parent menus are Playlist->Copy.
-#: python/playergui.py:4538
+#: python/playergui.py:4621
msgid "Prepend Cursor"
msgstr "Ajouter avant le curseur"
#. TC: Submenu Item. Parent menus are Playlist->Transfer.
-#: python/playergui.py:4570
+#: python/playergui.py:4653
msgid "Append at Cursor"
msgstr "Ajouter après au curseur"
#. TC: Submenu Item. Parent menus are Playlist->Transfer.
-#: python/playergui.py:4577
+#: python/playergui.py:4660
msgid "Prepend at Cursor"
msgstr "Ajouter avant au curseur"
-#: python/preferences.py:84
+#: python/preferences.py:85
msgid "Track time elapsed"
msgstr "Tempo écoulé"
-#: python/preferences.py:86
+#: python/preferences.py:87
msgid "Track time remaining"
msgstr "Temps restant"
-#: python/preferences.py:88
+#: python/preferences.py:89
msgid "Audio to stream"
msgstr "Audio vers flux"
-#: python/preferences.py:89
+#: python/preferences.py:90
msgid "Audio to DJ"
msgstr "Audio vers DJ"
-#: python/preferences.py:126
+#: python/preferences.py:127
#, python-format
msgid ""
"Stereo panning is the selection of where an audio source sits from left to "
@@ -2905,11 +2978,11 @@ msgstr ""
"L'appairage des canaux doit être laissé à 100% gauche/droite à moins que la "
"réduction du champ stéréo ne soit votre intention."
-#: python/preferences.py:157
+#: python/preferences.py:158
msgid "Presets"
msgstr "Présélections"
-#: python/preferences.py:248
+#: python/preferences.py:249
msgid ""
"The pan preset selection buttons.\n"
"\n"
@@ -2927,40 +3000,40 @@ msgstr ""
"Note : Une préconfiguration des présélections est nécessaire."
#. TC: Microphone mode combobox text.
-#: python/preferences.py:273
+#: python/preferences.py:274
msgid "Deactivated"
msgstr "Désactivé"
#. TC: Microphone mode combobox text.
-#: python/preferences.py:275
+#: python/preferences.py:276
msgid "Basic input"
msgstr "Entrée de base"
#. TC: Microphone mode combobox text.
-#: python/preferences.py:277
+#: python/preferences.py:278
msgid "Processed input"
msgstr "Ingresso elaborato"
#. TC: Microphone mode combobox text.
-#: python/preferences.py:279
+#: python/preferences.py:280
#, python-format
msgid "Partnered with channel %s"
msgstr "Associer au canal %s"
-#: python/preferences.py:429
+#: python/preferences.py:432
msgid "A label so you may describe briefly the role of this audio channel."
msgstr "Un label décrivant brièvement le rôle de ce canal audio."
-#: python/preferences.py:461
+#: python/preferences.py:464
msgid "The signal processing mode."
msgstr "Mode de traitement du signal"
#. TC: A frame heading. The channel opener is selected within.
-#: python/preferences.py:465
+#: python/preferences.py:468
msgid "Channel Opener"
msgstr "Ouvreur de canal"
-#: python/preferences.py:468
+#: python/preferences.py:471
msgid ""
"This controls the allocation of front panel open/unmute buttons. Having one "
"button control multiple microphones can save time."
@@ -2969,28 +3042,28 @@ msgstr ""
"un bouton pour contrôler plusieurs micro peut faire gagner du temps."
#. TC: Spinbutton label text.
-#: python/preferences.py:475
+#: python/preferences.py:478
msgid "Main Panel Button"
msgstr "Boutton du paneau principal"
-#: python/preferences.py:492
+#: python/preferences.py:495
msgid "This:"
msgstr "Ceci :"
-#: python/preferences.py:501
+#: python/preferences.py:504
msgid "Open"
msgstr "Ouvrir"
-#: python/preferences.py:514
+#: python/preferences.py:517
msgid "Stereo Panning"
msgstr "Panoramique Stéréo"
#. TC: A set of controls that perform audio signal matching.
-#: python/preferences.py:527
+#: python/preferences.py:530
msgid "Signal Matching"
msgstr "Correspondance de signal"
-#: python/preferences.py:528
+#: python/preferences.py:531
msgid ""
"These controls are provided to obtain a decent match between the two "
"microphones."
@@ -2998,17 +3071,17 @@ msgstr ""
"Ces contrôles sont mis à disposition pour obtenir une correction de gain "
"convenable entre les micros."
-#: python/preferences.py:537
+#: python/preferences.py:540
msgid "Relative Gain (dB)"
msgstr "Gain relatif (dB)"
#. TC: Mic audio phase inversion control.
-#: python/preferences.py:542 python/preferences.py:547
+#: python/preferences.py:545 python/preferences.py:550
msgid "Invert Signal"
msgstr "Invercer le signal"
-#: python/preferences.py:548 python/preferences.py:568
-#: python/preferences.py:664
+#: python/preferences.py:551 python/preferences.py:571
+#: python/preferences.py:667
msgid ""
"Useful for when microphones are cancelling one another out, producing a "
"hollow sound."
@@ -3016,41 +3089,41 @@ msgstr ""
"Utile lorsque les micros s'annulent mutuellement provoquant un son caverneux."
#. TC: Control whether to mix microphone audio to the DJ mix.
-#: python/preferences.py:551
+#: python/preferences.py:554
msgid "In The DJ's Mix"
msgstr "Dans le mix du DJ"
-#: python/preferences.py:552 python/preferences.py:574
-#: python/preferences.py:674
+#: python/preferences.py:555 python/preferences.py:577
+#: python/preferences.py:677
msgid ""
"Make the microphone audio audible in the DJ mix. This may not always be "
"desirable."
msgstr ""
"Rendre le micro audio audible dans le mix DJ. Ce n'est pas toujour désiré."
-#: python/preferences.py:560
+#: python/preferences.py:563
msgid "Basic Controls"
msgstr "Contrôles de base"
-#: python/preferences.py:561 python/preferences.py:616
+#: python/preferences.py:564 python/preferences.py:619
msgid "Boost/Cut (dB)"
msgstr "Augmenter/Couper (dB)"
-#: python/preferences.py:582
+#: python/preferences.py:585
msgid "High Pass Filter"
msgstr "Filtre passe haut"
-#: python/preferences.py:583 python/preferences.py:598
-#: python/preferences.py:608
+#: python/preferences.py:586 python/preferences.py:601
+#: python/preferences.py:611
msgid "Cutoff Frequency"
msgstr "Fréquence de coupure"
#. TC: User can set the number of filter stages.
-#: python/preferences.py:587
+#: python/preferences.py:590
msgid "Stages"
msgstr "Passes"
-#: python/preferences.py:590
+#: python/preferences.py:593
msgid ""
"Frequency in Hertz above which audio can pass to later stages. Use this "
"feature to restrict low frequency sounds such as mains hum. Setting too high "
@@ -3062,55 +3135,55 @@ msgstr ""
"sonnera aiguë."
#. TC: this is the treble control. HF = high frequency.
-#: python/preferences.py:595
+#: python/preferences.py:598
msgid "HF Detail"
msgstr "Détails HF"
-#: python/preferences.py:602
+#: python/preferences.py:605
msgid "You can use this to boost the amount of treble in the audio."
msgstr "Vous pouvez l'utiliser pour augmenter le taux d'aiguës dans l'audio."
#. TC: this is the bass control. LF = low frequency.
-#: python/preferences.py:605
+#: python/preferences.py:608
msgid "LF Detail"
msgstr "Détails LF"
-#: python/preferences.py:612
+#: python/preferences.py:615
msgid "You can use this to boost the amount of bass in the audio."
msgstr "Vous pouvez l'utiliser pour augmenter le taux de basses dans l'audio."
#. TC: lookahead brick wall limiter.
-#: python/preferences.py:615
+#: python/preferences.py:618
msgid "Limiter"
msgstr "Limiteur"
#. TC: this is the peak signal limit.
-#: python/preferences.py:620
+#: python/preferences.py:623
msgid "Upper Limit"
msgstr "Limite supérieure"
-#: python/preferences.py:622
+#: python/preferences.py:625
msgid ""
"A look-ahead brick-wall limiter. Audio signals are capped at the upper limit."
msgstr ""
"Un limiteur prédictif. Les signaux audio sont bloqués à la limite supérieure."
-#: python/preferences.py:625
+#: python/preferences.py:628
msgid "Noise Gate"
msgstr "Noise Gate"
#. TC: noise gate triggers at this level.
-#: python/preferences.py:627
+#: python/preferences.py:630
msgid "Threshold"
msgstr "Profondeur"
#. TC: negative gain when the noise gate is active.
#. TC: The de-esser attenuation in ess-detected state.
-#: python/preferences.py:631 python/preferences.py:641
+#: python/preferences.py:634 python/preferences.py:644
msgid "Gain"
msgstr "Gain"
-#: python/preferences.py:633
+#: python/preferences.py:636
msgid ""
"Reduce the unwanted quietest sounds and background noise which you don't "
"want your listeners to hear with this."
@@ -3118,16 +3191,16 @@ msgstr ""
"Réduit les sons faibles non désirés et le bruit de fond que vous ne désirez "
"transmettre aux auditeurs."
-#: python/preferences.py:636
+#: python/preferences.py:639
msgid "De-esser"
msgstr "De-esser"
#. TC: Bias has a numeric setting.
-#: python/preferences.py:638
+#: python/preferences.py:641
msgid "Bias"
msgstr "Bias"
-#: python/preferences.py:643
+#: python/preferences.py:646
msgid ""
"Reduce the S, T, and P sounds which microphones tend to exaggerate. Ideally "
"the Bias control will be set low so that the de-esser is off when there is "
@@ -3138,19 +3211,19 @@ msgstr ""
"esseur soit inopérant lorsqu'il y a du silence mais suffisament haut pour "
"que les clics de la souris soient détectés et éliminés."
-#: python/preferences.py:648
+#: python/preferences.py:651
msgid "Ducker"
msgstr "Atténuateur"
-#: python/preferences.py:649
+#: python/preferences.py:652
msgid "Release"
msgstr "Relâche"
-#: python/preferences.py:652
+#: python/preferences.py:655
msgid "Hold"
msgstr "Maintenu"
-#: python/preferences.py:655
+#: python/preferences.py:658
msgid ""
"The ducker automatically reduces the level of player audio when the DJ "
"speaks. These settings allow you to adjust the timings of that audio "
@@ -3160,15 +3233,15 @@ msgstr ""
"parle. Ces paramêtres permettent l'ajustement de la durée de "
"l'affaiblissement audio."
-#: python/preferences.py:659
+#: python/preferences.py:662
msgid "Other options"
msgstr "Autres options"
-#: python/preferences.py:666
+#: python/preferences.py:669
msgid "Phase Rotator"
msgstr "Rotacteur de phase"
-#: python/preferences.py:669
+#: python/preferences.py:672
msgid ""
"This feature processes the microphone audio so that it sounds more even. The "
"effect is particularly noticable on male voices."
@@ -3176,34 +3249,34 @@ msgstr ""
"Cette fonctionalité traite le micro pour qu'il paraisse plus présent. Cet "
"effet est plus audible avec les voix mâles."
-#: python/preferences.py:852
+#: python/preferences.py:855
msgid "The volume control for the left music player."
msgstr "Contrôle de volume du lecteur de gauche."
#. TC: preferences window title.
-#: python/preferences.py:908
+#: python/preferences.py:911
msgid "IDJC Preferences"
msgstr "Préférences de IDJC"
#. TC: The DJ's sound level controller.
-#: python/preferences.py:933
+#: python/preferences.py:936
msgid "DJ Audio Level"
msgstr "Niveau audio DJ"
-#: python/preferences.py:945
+#: python/preferences.py:948
msgid "This adjusts the sound level of the DJ audio."
msgstr "Ajuste le niveau sonore du canal audio DJ."
#. TC: The alarm sound level.
-#: python/preferences.py:950
+#: python/preferences.py:953
msgid "Alarm Level"
msgstr "Niveau de l'alarme"
-#: python/preferences.py:964
+#: python/preferences.py:967
msgid "Music Loudness Compensation"
msgstr "Compensation Loudness"
-#: python/preferences.py:962
+#: python/preferences.py:965
#, python-format
msgid ""
"This adjusts the sound level of the DJ alarm. Typically this should be set "
@@ -3214,11 +3287,11 @@ msgstr ""
"alentours du niveau audio du DJ lorsque la fonction «%s» est utilisée, ou "
"sinon un petit peu plus fort."
-#: python/preferences.py:970
+#: python/preferences.py:973
msgid "Player Resample Quality"
msgstr "Qualité de rééchantillonnage du lecteur"
-#: python/preferences.py:976
+#: python/preferences.py:979
msgid ""
"This adjusts the quality of the audio resampling method used whenever the "
"sample rate of the music file currently playing does not match the sample "
@@ -3232,52 +3305,52 @@ msgstr ""
"aussi plus de puissance CPU (non recommendé pour les systèmes d'avant 2006). "
"Tous ces modes donne une qualité correcte."
-#: python/preferences.py:984
+#: python/preferences.py:987
msgid "Best"
msgstr "Meilleure"
-#: python/preferences.py:993
+#: python/preferences.py:996 python/format.py:512
msgid "Medium"
msgstr "Moyenne"
-#: python/preferences.py:1002
+#: python/preferences.py:1005
msgid "Fast"
msgstr "Rapide"
#. TC: the set of features - section heading.
-#: python/preferences.py:1017
+#: python/preferences.py:1020
msgid "Feature Set"
msgstr "Liste de fonctionalités"
#. TC: Start in the full featured user interface mode.
-#: python/preferences.py:1029
+#: python/preferences.py:1032
msgid "Start Full"
msgstr "Démarrer avec tout"
-#: python/preferences.py:1034 python/preferences.py:1042
+#: python/preferences.py:1037 python/preferences.py:1045
msgid "Indicates which mode IDJC will be in when launched."
msgstr "Indique quel sera le mode de IDJC au démarrage."
#. TC: Start in a reduced user interface mode.
-#: python/preferences.py:1037
+#: python/preferences.py:1040
msgid "Start Mini"
msgstr "Démarrer avec le minimum"
-#: python/preferences.py:1050
+#: python/preferences.py:1053
msgid "Fully Featured"
msgstr "Toutes les fonctionalités"
-#: python/preferences.py:1055
+#: python/preferences.py:1058
msgid "Run in full functionality mode which uses more CPU power."
msgstr ""
"Exécuter dans le mode toutes fonctionalités qui utilise plus de puissance "
"CPU."
-#: python/preferences.py:1057
+#: python/preferences.py:1060
msgid "Basic Streamer"
msgstr "Streamer de base"
-#: python/preferences.py:1061
+#: python/preferences.py:1064
msgid ""
"Run in a reduced functionality mode that lowers the burden on the CPU and "
"takes up less screen space."
@@ -3285,43 +3358,43 @@ msgstr ""
"Exécuter dans le mode fonctionalités réduites qui utilise moins de puissance "
"CPU et utilise moins d'espace à l'écran."
-#: python/preferences.py:1069
+#: python/preferences.py:1072
msgid "These settings take effect after restarting"
msgstr "Ces paramêtres ne prennent effet qu'après un redémarrage."
-#: python/preferences.py:1090
+#: python/preferences.py:1093
msgid "Reserve 24 sound effects slots"
msgstr "Réserver 24 slots d'effets sonores"
-#: python/preferences.py:1091
+#: python/preferences.py:1094
msgid "Only 12"
msgstr "Seulement 12"
-#: python/preferences.py:1103
+#: python/preferences.py:1106
msgid "Audio input channels"
msgstr "Canaux audio en entrée"
-#: python/preferences.py:1108
+#: python/preferences.py:1111
msgid "Simultaneous stream(s)"
msgstr "Transmission(ws) simultanée(s)"
-#: python/preferences.py:1114
+#: python/preferences.py:1117
msgid "Simultaneous recording(s)"
msgstr "Enregistrement(s) simultané(s)"
-#: python/preferences.py:1168
+#: python/preferences.py:1171
msgid "Fill channel meter void space"
msgstr "Remplir l'espace libre du vu-mêtre du canal"
-#: python/preferences.py:1180
+#: python/preferences.py:1183
msgid "Player Loudness Normalisation"
msgstr "Normalisation du Loudness du lecteur"
-#: python/preferences.py:1191
+#: python/preferences.py:1194
msgid "Indicate which tracks have loudness metadata"
msgstr "Indique quelles pistes ont une métadonnée de Loudness."
-#: python/preferences.py:1192
+#: python/preferences.py:1195
msgid ""
"Shows a marker in the playlists next to each track. Either a green circle or "
"a red triangle."
@@ -3329,19 +3402,19 @@ msgstr ""
"Affiche un marqueur à côté de chaque piste dans les listes de lecture. Soit "
"un cercle vert, soit un triangle rouge."
-#: python/preferences.py:1200
+#: python/preferences.py:1203
msgid "Adjust playback volume in dB"
msgstr "Ajuste le volume de rendu en dB"
-#: python/preferences.py:1201
+#: python/preferences.py:1204
msgid "Effective only on newly started tracks."
msgstr "Effectif uniquement pour les pistes nouvellement jouées."
-#: python/preferences.py:1207
+#: python/preferences.py:1210
msgid "R128"
msgstr "R128"
-#: python/preferences.py:1211
+#: python/preferences.py:1214
msgid ""
"It may not be desirable to use the default level since it is rather quiet. "
"This should be set 4 or 5 dB higher than the ReplayGain setting."
@@ -3350,11 +3423,11 @@ msgstr ""
"est plutot bas. Il doit se situer 4 ou 5 dB plus haut que le réglage de Gain "
"Replay."
-#: python/preferences.py:1216
+#: python/preferences.py:1219
msgid "ReplayGain"
msgstr "Gain Replay"
-#: python/preferences.py:1220
+#: python/preferences.py:1223
msgid ""
"It may not be desirable to use the default level since it is rather quiet. "
"This should be set 4 or 5 dB lower than the R128 setting."
@@ -3362,11 +3435,11 @@ msgstr ""
"Il peut ne pas être souhaitable d'utiliser le volume par défaut puisqu'il "
"est plutot bas. Il doit se situer 4 ou 5 dB plus bas que le réglage du R128."
-#: python/preferences.py:1225
+#: python/preferences.py:1228
msgid "Untagged"
msgstr "Non taggé"
-#: python/preferences.py:1229
+#: python/preferences.py:1232
msgid ""
"Set this so that any unmarked tracks are playing at a roughly similar "
"loudness level as the marked ones."
@@ -3374,15 +3447,15 @@ msgstr ""
"Cocher pour que toutes les pistes non taggés soient jouées approximativement "
"au même volume que celle qui le sont."
-#: python/preferences.py:1238
+#: python/preferences.py:1241
msgid "A master level control for the media players."
msgstr "Un contrôle maitre pour les Lecteurs."
-#: python/preferences.py:1249
+#: python/preferences.py:1252
msgid "Recorder Filename (excluding the file extension)"
msgstr "Non du fichier d'enregistrement (sans extention)"
-#: python/preferences.py:1250
+#: python/preferences.py:1253
msgid ""
"The specifiers are $r for the number of the recorder with the rest being "
"documented in the strftime man page.\n"
@@ -3394,23 +3467,23 @@ msgstr ""
"Les utilisateurs peuvent modifier ceci pour rendre les noms de fichiers "
"compatibles avec certains systèmes de fichiers."
-#: python/preferences.py:1267
+#: python/preferences.py:1270
msgid "Miscellaneous Features"
msgstr "Fonctionalités diverses"
-#: python/preferences.py:1276
+#: python/preferences.py:1279
msgid "Trim quiet song endings and trailing silence"
msgstr "Eliminer les silences de début et de fin de pistes"
-#: python/preferences.py:1282
+#: python/preferences.py:1285
msgid "End tracks containing long passages of silence"
msgstr "Terminer les pistes contenant de long segments muets"
-#: python/preferences.py:1288
+#: python/preferences.py:1291
msgid "Enable the main-player speed/pitch controls"
msgstr "Activer les contrôles de tonalité/vitesse du lecteur principal"
-#: python/preferences.py:1292
+#: python/preferences.py:1295
msgid ""
"This option causes some extra widgets to appear below the playlists which "
"allow the playback speed to be adjusted from 25% to 400% and a normal speed "
@@ -3420,11 +3493,11 @@ msgstr ""
"pour permettre l'ajustement de la vitesse entre 25 rt 400% ainsi qu'un "
"bouton vitesse normale."
-#: python/preferences.py:1297
+#: python/preferences.py:1300
msgid "Separate left/right player volume faders"
msgstr "Séparrer les curseurs de volume gauche et droite"
-#: python/preferences.py:1301
+#: python/preferences.py:1304
msgid ""
"Select this option to use an independent volume fader for the left and right "
"music players."
@@ -3432,11 +3505,11 @@ msgstr ""
"Choisir cette option pour avoir des boutons de fader indépendants pour les "
"lecteurs de gauche et de droite."
-#: python/preferences.py:1305
+#: python/preferences.py:1308
msgid "Enlarge the time elapsed/remaining windows"
msgstr "Elargir les fenêtres de temps écoulé/restant"
-#: python/preferences.py:1309
+#: python/preferences.py:1312
msgid ""
"The time elapsed/remaining windows sometimes don't appear big enough for the "
"text that appears in them due to unusual DPI settings or the use of a "
@@ -3446,11 +3519,11 @@ msgstr ""
"pour contenir tout le texte pour cause de DPI inabituel ou d'un moteur de "
"rendu différent. Cette option peut remédier à ce défaut."
-#: python/preferences.py:1315
+#: python/preferences.py:1318
msgid "Sound an alarm when the music is due to end"
msgstr "Jouer une alarme lorsque la musique arrive à sa fin"
-#: python/preferences.py:1318
+#: python/preferences.py:1321
msgid ""
"An alarm tone alerting the DJ that dead-air is just nine seconds away. This "
"also works when monitoring stream audio but the alarm tone is not sent to "
@@ -3464,11 +3537,11 @@ msgstr ""
"\n"
"Le mode freewheel de JACK est également désengagé automatiquement."
-#: python/preferences.py:1328
+#: python/preferences.py:1331
msgid "Apply dither to 16 bit PCM playback"
msgstr "Appliquer un adoucissement au rendu 16 bits PCM"
-#: python/preferences.py:1332
+#: python/preferences.py:1335
msgid ""
"This feature maybe improves the sound quality a little when listening on a "
"24 bit sound card."
@@ -3476,11 +3549,11 @@ msgstr ""
"Cette fonctionalité peut augmenter légèrement la qualité lors de l'écoute "
"sur une carte son 24bit"
-#: python/preferences.py:1335
+#: python/preferences.py:1338
msgid "Enable tooltips"
msgstr "Activer les bulles d'aide"
-#: python/preferences.py:1339
+#: python/preferences.py:1342
msgid ""
"This, what you are currently reading, is a tooltip. This feature turns them "
"on or off."
@@ -3488,15 +3561,15 @@ msgstr ""
"Ce que vous lisez actuellement est une bulle d'aide. Cette fonctionalité les "
"dés/active. "
-#: python/preferences.py:1358
+#: python/preferences.py:1361
msgid "Player Settings At Startup"
msgstr "Configuration de démarrage du lecteur"
-#: python/preferences.py:1369
+#: python/preferences.py:1372
msgid "Restore the previous session"
msgstr "Restaurer la session précédente"
-#: python/preferences.py:1374
+#: python/preferences.py:1377
msgid ""
"When starting IDJC most of the main window settings will be as they were "
"left. As an alternative you may specify below how you want the various "
@@ -3506,107 +3579,111 @@ msgstr ""
"resteront comme vous les aviez laissés. Comme alternative, vous pouvez "
"spécifier ci-dessous comment ils doivent être initialisés."
-#: python/preferences.py:1384
+#: python/preferences.py:1387
msgid "Player 1"
msgstr "Lecteur 1"
-#: python/preferences.py:1386
+#: python/preferences.py:1389
msgid "Player 2"
msgstr "Lecteur 2"
#. TC: DJ hears the stream mix.
-#: python/preferences.py:1414
+#: python/preferences.py:1417
msgid "Monitor Stream Mix"
msgstr "Moniteur du stream Mixé"
#. TC: A heading label for miscellaneous settings.
-#: python/preferences.py:1425
+#: python/preferences.py:1428
msgid "General"
msgstr "Général"
-#: python/preferences.py:1475
+#: python/preferences.py:1478
msgid "VoIP panning + mono downmix"
msgstr "Placement VoIP + réduction mono"
#. TC: Keyboard and MIDI bindings configuration.
-#: python/preferences.py:1489
+#: python/preferences.py:1492
msgid "Bindings"
msgstr "Scorciatoie"
-#: python/preferences.py:1537
+#: python/preferences.py:1540
msgid "Licence"
msgstr "Licence"
-#: python/preferences.py:1560
+#: python/preferences.py:1563
msgid "Contributors"
msgstr "Collaborateurs"
-#: python/preferences.py:1567
+#: python/preferences.py:1570
msgid "Translators"
msgstr "Traducteurs"
-#: python/preferences.py:1573
+#: python/preferences.py:1574
+msgid "Build Info"
+msgstr ""
+
+#: python/preferences.py:1591
msgid "About"
msgstr "Concernant…"
-#: python/sourceclientgui.py:89
+#: python/sourceclientgui.py:91
msgid "Insert Attribute"
msgstr "Insérer un attribut"
-#: python/sourceclientgui.py:133
+#: python/sourceclientgui.py:135
msgid "Icecast 2 Master"
msgstr "Icecast 2 Maitre"
-#: python/sourceclientgui.py:133
+#: python/sourceclientgui.py:135
msgid "Shoutcast Master"
msgstr "Shoutcast Maitre"
-#: python/sourceclientgui.py:134
+#: python/sourceclientgui.py:136
msgid "Icecast 2 Stats/Relay"
msgstr "Icecast 2 Stats/Relais"
-#: python/sourceclientgui.py:134
+#: python/sourceclientgui.py:136
msgid "Shoutcast Stats/Relay"
msgstr "Icecast 2 Stats/Relais"
-#: python/sourceclientgui.py:137
+#: python/sourceclientgui.py:139
msgid "Enter new server connection details"
msgstr "Insérer de nouveaux détails concernant la connexion au serveur"
-#: python/sourceclientgui.py:156
+#: python/sourceclientgui.py:158
msgid "Edit existing server connection details"
msgstr "Editer les détails de la connexion au serveur"
-#: python/sourceclientgui.py:193
+#: python/sourceclientgui.py:195
msgid "This server is to be scanned for audience figures"
msgstr "Ce serveur doit être scanné pour les stats d'audience"
-#: python/sourceclientgui.py:206
+#: python/sourceclientgui.py:208
msgid "Server type"
msgstr "Type de serveur"
-#: python/sourceclientgui.py:206
+#: python/sourceclientgui.py:208
msgid "Port number"
msgstr "Numéro du port"
-#: python/sourceclientgui.py:207
+#: python/sourceclientgui.py:209
msgid "Mount point"
msgstr "Point de montage"
-#: python/sourceclientgui.py:207
+#: python/sourceclientgui.py:209
msgid "Login name"
msgstr "Nome utente"
-#: python/sourceclientgui.py:449
+#: python/sourceclientgui.py:475
msgid "Encoder Format Not Set/Compatible"
msgstr "Format d'encodage non défini/incompatible"
#. TC: Connection button text when no details have been entered.
-#: python/sourceclientgui.py:452
+#: python/sourceclientgui.py:478
msgid "No Master Server Configured"
msgstr "Aucun serveur maitre n'es configuré"
-#: python/sourceclientgui.py:654
+#: python/sourceclientgui.py:680
msgid ""
"A table of servers with which to connect. Only one master server can be "
"added for the purpose of streaming. All other servers will appear below the "
@@ -3618,41 +3695,41 @@ msgstr ""
"sous le serveur maitre pour les statistiques, qui peuvent être occultés par "
"serveurs."
-#: python/sourceclientgui.py:670
+#: python/sourceclientgui.py:696
msgid "Hostname/IP address"
msgstr "Hôte/Adresse IP"
#. TC: Mount point is a technical term in relation to icecast servers.
-#: python/sourceclientgui.py:683
+#: python/sourceclientgui.py:709
msgid "Mount point "
msgstr "Point de montage "
#. TC: This is the listener count heading.
-#: python/sourceclientgui.py:692
+#: python/sourceclientgui.py:718
msgid "Listeners"
msgstr "Auditeurs"
-#: python/sourceclientgui.py:707
+#: python/sourceclientgui.py:733
msgid "The sum total of listeners in this server tab."
msgstr "Nombre total d'auditeurs pour cet onglet serveur"
-#: python/sourceclientgui.py:734
+#: python/sourceclientgui.py:760
msgid "Never"
msgstr "Jamais"
-#: python/sourceclientgui.py:737
+#: python/sourceclientgui.py:763
msgid "Always"
msgstr "Toujours"
-#: python/sourceclientgui.py:739
+#: python/sourceclientgui.py:765
msgid "If connected"
msgstr "Si connecté"
-#: python/sourceclientgui.py:995
+#: python/sourceclientgui.py:1021
msgid "Custom user agent string"
msgstr "User agent personnalisé"
-#: python/sourceclientgui.py:1002
+#: python/sourceclientgui.py:1028
msgid ""
"Set this on the occasion that the server or its firewall specifically "
"refuses to allow libshout based clients."
@@ -3660,16 +3737,16 @@ msgstr ""
"A configurer au cas ou le serveur ou le pare-feux refuse spécialement "
"d'autoriser les clients basés sur libshout."
-#: python/sourceclientgui.py:1007
+#: python/sourceclientgui.py:1033
msgid "If the connection breaks reconnect to the server"
msgstr "Si la connexion est interrompue, se reconnecter au sserveur"
#. TC: Label for a comma separated list of delay times.
-#: python/sourceclientgui.py:1017
+#: python/sourceclientgui.py:1043
msgid "Delay times"
msgstr "Temps de délais"
-#: python/sourceclientgui.py:1021
+#: python/sourceclientgui.py:1047
msgid ""
"A comma separated list of delays in seconds between reconnection attempts. "
"Note that bad values or values less than 5 will be interpreted as 5."
@@ -3678,45 +3755,45 @@ msgstr ""
"tentatives de reconnexion. Notez que de mauvaises valeurs ou inférieures à 5 "
"seront interprétées comme 5."
-#: python/sourceclientgui.py:1027
+#: python/sourceclientgui.py:1053
msgid "Repeat the sequence of delays indefinitely."
msgstr "Répéter la saquence de délais indéfiniment."
#. TC: User specifies no dialog box to be shown.
-#: python/sourceclientgui.py:1030
+#: python/sourceclientgui.py:1056
msgid "Quiet"
msgstr "Muet"
-#: python/sourceclientgui.py:1032
+#: python/sourceclientgui.py:1058
msgid "Keep the reconnection dialogue box hidden at all times."
msgstr "Laisser la boite de reconnexion cachée tout le temps."
-#: python/sourceclientgui.py:1037
+#: python/sourceclientgui.py:1063
msgid "The contingency plan upon the stream buffer becoming full is..."
msgstr "Le plan d'action lorsque le tampon de streaming est plein est…"
-#: python/sourceclientgui.py:1046
+#: python/sourceclientgui.py:1072
msgid "Discard audio data for as long as needed."
msgstr "Laisser tomber les données audio pour la durée nécessaire."
-#: python/sourceclientgui.py:1048
+#: python/sourceclientgui.py:1074
msgid "Assume the connection is beyond saving and reconnect."
msgstr ""
"Assumer que la connexion est interrompue, se déconnecter et se reconnecter."
-#: python/sourceclientgui.py:1300
+#: python/sourceclientgui.py:1357 python/format.py:1140
msgid "Shoutcast"
msgstr "Shoucast"
-#: python/sourceclientgui.py:1337
+#: python/sourceclientgui.py:1394
msgid "[Metadata suppressed]"
msgstr "[Métadonnée supprimmée]"
-#: python/sourceclientgui.py:1416
+#: python/sourceclientgui.py:1473
msgid "Individual Controls"
msgstr "Contrôles individuels"
-#: python/sourceclientgui.py:1430
+#: python/sourceclientgui.py:1487
msgid ""
"Connect to or disconnect from the radio server. If the button does not stay "
"in, the connection failed for some reason.\n"
@@ -3738,11 +3815,11 @@ msgstr ""
"capable de sélectionner le format du flux."
#. TC: Kick whoever is on the server.
-#: python/sourceclientgui.py:1447
+#: python/sourceclientgui.py:1504
msgid "Kick Source"
msgstr "Kick Source"
-#: python/sourceclientgui.py:1449
+#: python/sourceclientgui.py:1506
msgid ""
"This will disconnect whoever is currently using the server, freeing it up "
"for personal use."
@@ -3750,61 +3827,58 @@ msgstr ""
"Déconnectera tous ceux qui utilisent le serveurs, le libérant ainsi pour une "
"utilisation privée."
-#: python/sourceclientgui.py:1459
-#, fuzzy
+#: python/sourceclientgui.py:1516
msgid "Timer:"
-msgstr "Timer"
+msgstr "Timer :"
-#: python/sourceclientgui.py:1463
-#, fuzzy
+#: python/sourceclientgui.py:1520
msgid "From"
-msgstr "Depuis ici"
+msgstr "Depuis"
-#: python/sourceclientgui.py:1464
+#: python/sourceclientgui.py:1521
msgid ""
"Automatically connect to the server at a specific time in 24 hour format, "
"midnight being 00:00"
msgstr ""
"Se connecter à une heure spécifique au format 24 heures, minuit étant 00:00"
-#: python/sourceclientgui.py:1469
+#: python/sourceclientgui.py:1526
msgid "Kick"
msgstr ""
-#: python/sourceclientgui.py:1471
+#: python/sourceclientgui.py:1528
msgid "Disconnect whoever is using the server just before start time."
msgstr "Déconnecter tous ceux qui utilisent le serveur avant de démarrer."
-#: python/sourceclientgui.py:1480
+#: python/sourceclientgui.py:1537
msgid "To"
msgstr ""
-#: python/sourceclientgui.py:1481
+#: python/sourceclientgui.py:1538
msgid ""
"Automatically disconnect from the server at a specific time in 24 hour "
"format."
msgstr ""
"Se déconnecter automatiquement à une heure spécifique au format 24 heures"
-#: python/sourceclientgui.py:1484
-#, fuzzy
+#: python/sourceclientgui.py:1541
msgid "Fade out"
-msgstr "Fondu 5s"
+msgstr "Fondu"
-#: python/sourceclientgui.py:1486
+#: python/sourceclientgui.py:1543
msgid "Fade audio before disconnecting."
-msgstr ""
+msgstr "Fondu audio avant la déconnexion."
-#: python/sourceclientgui.py:1500
+#: python/sourceclientgui.py:1557
msgid "At connect:"
msgstr "A la connection :"
#. TC: [x] Start player (*) 1 ( ) 2
-#: python/sourceclientgui.py:1504
+#: python/sourceclientgui.py:1561
msgid "Start player"
msgstr "Démarrer le lecteur"
-#: python/sourceclientgui.py:1509
+#: python/sourceclientgui.py:1566
msgid ""
"Have one of the players start automatically when a radio server connection "
"is successfully made."
@@ -3813,32 +3887,33 @@ msgstr ""
"connexion au serveur radio a réussie."
#. TC: [x] Start recorder (*) 1 ( ) 2
-#: python/sourceclientgui.py:1517
+#: python/sourceclientgui.py:1574
msgid "Start recorder"
msgstr "Démarrer l'enregistreur"
-#: python/sourceclientgui.py:1524
+#: python/sourceclientgui.py:1581
msgid ""
"Have a recorder start automatically when a radio server connection is "
"successfully made."
msgstr ""
-"Pour avoir l'enregistreur qui démarre automatiquement lorsque la connexion "
-"au serveur radio a réussie."
+"Pour démarrer automatiquement un enregistreur lorsqu'une connexion au "
+"serveur radio est établie."
-#: python/sourceclientgui.py:1529
+#: python/sourceclientgui.py:1586 python/format.py:521 python/format.py:532
+#: python/format.py:542
msgid "Metadata"
msgstr "Métadonnées"
-#: python/sourceclientgui.py:1539
+#: python/sourceclientgui.py:1596
msgid "Format String"
msgstr "Chaine de format"
#. TC: Label for the metadata fallback value.
-#: python/sourceclientgui.py:1541
+#: python/sourceclientgui.py:1598
msgid "Fallback"
msgstr "Fallback"
-#: python/sourceclientgui.py:1555
+#: python/sourceclientgui.py:1612
msgid ""
"You can enter text to accompany the stream here and can specify placemarkers "
"%r %t %l %s for the artist, title, album, and songname respectively, or "
@@ -3862,7 +3937,7 @@ msgstr ""
"Lorsque ce champ est vide, les flux Ogg utiliseront les tags standards "
"vorbis et les mp3 utiliseront %s."
-#: python/sourceclientgui.py:1563
+#: python/sourceclientgui.py:1620
msgid ""
"The fallback text to use when %r %t %l metadata is unavailable. See the "
"format string to the left."
@@ -3870,7 +3945,7 @@ msgstr ""
"Texte de remplacement lorsque les métadonnées %r %t %l ne sont pas "
"disponibles. voir Chaine de format à gauche."
-#: python/sourceclientgui.py:1565
+#: python/sourceclientgui.py:1622
msgid ""
"Metadata normally updates only on song title changes but you can force an "
"immediate update here."
@@ -3878,28 +3953,28 @@ msgstr ""
"Les métadonnées se mettent à jour lorsque le titre change mais vous pouvez "
"aussi forcer leur mise à jour immédiate ici."
-#: python/sourceclientgui.py:1584
+#: python/sourceclientgui.py:1641
msgid "Configuration"
msgstr "Configuration"
-#: python/sourceclientgui.py:1585
+#: python/sourceclientgui.py:1642
msgid "The controls for configuring a stream."
msgstr "Les contrôles pour configurer un flux."
-#: python/sourceclientgui.py:1593
+#: python/sourceclientgui.py:1650
msgid "Connection"
msgstr "Connexion"
-#: python/sourceclientgui.py:1598
+#: python/sourceclientgui.py:1655
msgid "Format"
msgstr "Format"
#. TC: Tab heading. User can enter information about the stream here.
-#: python/sourceclientgui.py:1607
+#: python/sourceclientgui.py:1664
msgid "Stream Info"
msgstr "Informations sur le flux"
-#: python/sourceclientgui.py:1612
+#: python/sourceclientgui.py:1669
msgid ""
"Enter your DJ name or station name here. Typically this information will be "
"displayed by listener clients."
@@ -3907,7 +3982,7 @@ msgstr ""
"Saisissez le nom du DJ ou de la station. Typiquement cette information sera "
"affichée par les clients des Auditeurs."
-#: python/sourceclientgui.py:1615
+#: python/sourceclientgui.py:1672
msgid ""
"The URL of your radio station. This and the rest of the information below is "
"intended for display on a radio station listings website."
@@ -3915,19 +3990,19 @@ msgstr ""
"L'URL de votre station. Ceci ainsi que les informations suivantes sont "
"destinées à l'affichage sur un site listant les stations."
-#: python/sourceclientgui.py:1620
+#: python/sourceclientgui.py:1677
msgid "A description of your radio station."
msgstr "Description de votre station."
-#: python/sourceclientgui.py:1625
+#: python/sourceclientgui.py:1682
msgid "The musical genres you are likely to play."
msgstr "Genres musicaux offerts."
-#: python/sourceclientgui.py:1628
+#: python/sourceclientgui.py:1685
msgid "Make Public"
msgstr "Rendre publique"
-#: python/sourceclientgui.py:1629
+#: python/sourceclientgui.py:1686
msgid ""
"Publish your radio station on a listings website. The website in question "
"will depend on how the server to which you connect is configured."
@@ -3935,15 +4010,15 @@ msgstr ""
"Publier votre station sur le site de liste. Le site en question dépends de "
"la configuration du serveur auquel vous vous connectez."
-#: python/sourceclientgui.py:1641
+#: python/sourceclientgui.py:1698
msgid "Genre(s)"
msgstr "Genere(s)"
-#: python/sourceclientgui.py:1651
+#: python/sourceclientgui.py:1709
msgid "Master server admin password"
msgstr "Mot de passe administrateur principal"
-#: python/sourceclientgui.py:1656
+#: python/sourceclientgui.py:1714
msgid ""
"This is for kick and stats on Shoutcast master servers that have an "
"administrator password. For those that don't leave this blank (the source "
@@ -3953,47 +4028,55 @@ msgstr ""
"d'administration. Pour ceux n'en possédant pas, laissez vide (le mot de "
"passe de la source est suffisant pour eux)"
-#: python/sourceclientgui.py:1665
+#: python/sourceclientgui.py:1723
msgid "Contact Details"
msgstr "Détails de contact"
-#: python/sourceclientgui.py:1670
+#: python/sourceclientgui.py:1727
msgid "Internet Relay Chat connection info goes here."
msgstr "Les informations d'IRC viennent ici"
-#: python/sourceclientgui.py:1673
+#: python/sourceclientgui.py:1730
msgid "Connection info for AOL instant messenger goes here."
msgstr "Informations de connexion au messager AOL viennent ici."
-#: python/sourceclientgui.py:1676
+#: python/sourceclientgui.py:1733
msgid "ICQ instant messenger connection info goes here."
msgstr "Les informations concernant le messager ICQ viennent ici."
-#: python/sourceclientgui.py:1679
+#: python/sourceclientgui.py:1736
msgid "IRC"
msgstr "IRC"
-#: python/sourceclientgui.py:1680
+#: python/sourceclientgui.py:1737
msgid "AIM"
msgstr "AIM"
-#: python/sourceclientgui.py:1681
+#: python/sourceclientgui.py:1738
msgid "ICQ"
msgstr "ICQ"
-#: python/sourceclientgui.py:1690
+#: python/sourceclientgui.py:1748
+msgid "Use ISO-8859-1 encoding for fixed metadata"
+msgstr ""
+
+#: python/sourceclientgui.py:1750
+msgid "Enable this if sending to a Shoutcast V1 server."
+msgstr ""
+
+#: python/sourceclientgui.py:1754
msgid "Extra Shoutcast"
msgstr "Extra Shoutcast"
-#: python/sourceclientgui.py:1695
+#: python/sourceclientgui.py:1759
msgid "Troubleshooting"
msgstr "Résolution des problèmes"
-#: python/sourceclientgui.py:1821
+#: python/sourceclientgui.py:1890
msgid "Stop recording."
msgstr "Arrêter l'enregistrement"
-#: python/sourceclientgui.py:1823
+#: python/sourceclientgui.py:1892
msgid ""
"Start recording.\n"
"\n"
@@ -4006,20 +4089,20 @@ msgstr ""
"sont pas corrects ou que les permissions d'écriture ne sont pas obtenues "
"pour le dossier de destination."
-#: python/sourceclientgui.py:1828
+#: python/sourceclientgui.py:1897
msgid "Pause recording."
msgstr "Enregistrement en pause"
-#: python/sourceclientgui.py:1865
+#: python/sourceclientgui.py:1934
msgid "Recording time elapsed."
msgstr "Temps d'enregistement écoulé."
#. TC: Dialog title bar text.
-#: python/sourceclientgui.py:1919
+#: python/sourceclientgui.py:1988
msgid "Select the folder to record to"
msgstr "Sélection du dossier pour l'enregistrement"
-#: python/sourceclientgui.py:1930
+#: python/sourceclientgui.py:1999
msgid ""
"Choose which stream to record or the 24 bit FLAC option. If the stream isn't "
"already running the encoder will be started automatically using whatever "
@@ -4029,7 +4112,7 @@ msgstr ""
"pas en cours de lecture, l'encodage commencera automatiquement quels que "
"soient les paramêtres actuellement configurés."
-#: python/sourceclientgui.py:1934
+#: python/sourceclientgui.py:2003
msgid ""
"Choose which directory you want to save to. All file names will be in a "
"timestamp format and have either an oga, mp3, or flac file extension. "
@@ -4041,69 +4124,70 @@ msgstr ""
"Important : vous devez sélectionner un dossier avec les permissions en "
"écriture adéquates."
-#: python/sourceclientgui.py:2038
+#: python/sourceclientgui.py:2110
msgid "Perform operations on multiple servers in unison."
msgstr "Effecter des opérations simultanément sur plusieurs serveurs."
-#: python/sourceclientgui.py:2050
+#: python/sourceclientgui.py:2122
msgid "Connect"
msgstr "Connecter"
-#: python/sourceclientgui.py:2067
+#: python/sourceclientgui.py:2139
msgid "Disconnect"
msgstr "Déconnecter"
-#: python/sourceclientgui.py:2075
+#: python/sourceclientgui.py:2147
msgid "Kick Sources"
msgstr "Kick Sources"
-#: python/sourceclientgui.py:2084
+#: python/sourceclientgui.py:2156
msgid "Metadata:"
msgstr "Metadonnées :"
-#: python/sourceclientgui.py:2114
+#: python/sourceclientgui.py:2186
msgid "Group Controls"
msgstr "Contrôles de groupe"
-#: python/sourceclientgui.py:2610
+#: python/sourceclientgui.py:2692
msgid "Recording Facility Unavailable"
msgstr "Fonctionalités d'enregistrement non disponibles"
-#: python/sourceclientgui.py:2613
+#: python/sourceclientgui.py:2695
msgid "No Recorders Are Correctly Configured"
msgstr "Aucun enregistreur configuré correctement"
#. TC: Recorder menu format string.
-#: python/sourceclientgui.py:2626
+#: python/sourceclientgui.py:2708
+#, python-brace-format
msgid "{numericid} [{source}] > [{directory}]"
msgstr "{numericid} [{source}] > [{directory}]"
-#: python/sourceclientgui.py:2628
+#: python/sourceclientgui.py:2710
msgid "Misconfigured"
msgstr "Mal configuré"
-#: python/sourceclientgui.py:2649
+#: python/sourceclientgui.py:2731
msgid "Streaming Facility Unavailable"
msgstr "Fonctionalités de flux non disponibles"
-#: python/sourceclientgui.py:2651
+#: python/sourceclientgui.py:2733
msgid "No Streams Are Currently Configured"
msgstr "Aucun flux actuellement configuré"
-#: python/sourceclientgui.py:2654
+#: python/sourceclientgui.py:2736
msgid "Group Connect"
msgstr "Connexion de groupe"
-#: python/sourceclientgui.py:2660
+#: python/sourceclientgui.py:2742
msgid "Group Disconnect"
msgstr "Déconnetion de groupe"
#. TC: Window title bar text.
-#: python/sourceclientgui.py:2691
+#: python/sourceclientgui.py:2773
msgid "IDJC Output"
msgstr "Sortie IDJC"
-#: python/sourceclientgui.py:2707
+#: python/sourceclientgui.py:2789
msgid ""
"Each one of these tabs represents a separate stream recorder. The LED "
"indicator colours represent the following: Clear=Stopped Yellow=Paused "
@@ -4112,7 +4196,7 @@ msgstr ""
"Chacun de ces onglets représente un enregistreur de flux. La couleur de la "
"LED indique : Eteinte=Arret Jaune=Pause Rouge=Enregistrement."
-#: python/sourceclientgui.py:2715
+#: python/sourceclientgui.py:2797
msgid ""
"Each one of these tabs represents a separate radio streamer. The LED "
"indicator colours represent the following: Clear=No connection "
@@ -4123,11 +4207,11 @@ msgstr ""
"indique : Eteinte=Aucune connexion Jaune=En attente d'autentification. "
"Verte=Connecté. Clignottante=Perte de paquet du à une mauvaise connexion."
-#: python/sourceclientgui.py:2733
+#: python/sourceclientgui.py:2815
msgid " Stream "
msgstr " Flux "
-#: python/sourceclientgui.py:2768
+#: python/sourceclientgui.py:2850
msgid ""
"<span weight=\"bold\" size=\"12000\">A connection to a radio server has "
"failed.</span>\n"
@@ -4139,7 +4223,7 @@ msgstr ""
"\n"
"Aucune tentative de reconnexion ne sera faite."
-#: python/sourceclientgui.py:2773
+#: python/sourceclientgui.py:2855
msgid ""
"<span weight=\"bold\" size=\"12000\">A scheduled stream disconnection has "
"occurred.</span>"
@@ -4147,6 +4231,519 @@ msgstr ""
"<span weight=\"bold\" size=\"12000\">Une déconnexion pré-programmée du flux "
"s'est produite.</span>"
+#: python/format.py:419
+msgid "Right click for suggested values."
+msgstr ""
+
+#: python/format.py:438
+#, fuzzy
+msgid "Suggested Values"
+msgstr "Régler la valeur"
+
+#: python/format.py:494
+#, fuzzy
+msgid "Pregain"
+msgstr "Lecteur Régler le gain"
+
+#: python/format.py:495 python/format.py:913
+msgid "0 dB"
+msgstr ""
+
+#: python/format.py:496 python/format.py:914
+msgid "-0.5 dB"
+msgstr ""
+
+#: python/format.py:497 python/format.py:915
+msgid "-1.0 dB"
+msgstr ""
+
+#: python/format.py:498 python/format.py:916
+msgid "-1.5 dB"
+msgstr ""
+
+#: python/format.py:499 python/format.py:917
+msgid "-2.0 dB"
+msgstr ""
+
+#: python/format.py:500 python/format.py:918
+msgid "-2.5 dB"
+msgstr ""
+
+#: python/format.py:501 python/format.py:919
+msgid "-3.0 dB"
+msgstr ""
+
+#: python/format.py:502
+msgid ""
+"A blanket gain reduction to promote audio quality when using long "
+"established lossy audio codecs like mp3 with loud audio material.\n"
+"\n"
+"ReplayGain makes this feature generally unnecessary and the correct setting "
+"in that case is 0 dB."
+msgstr ""
+
+#: python/format.py:510
+#, fuzzy
+msgid "Resample Quality"
+msgstr "Qualité de rééchantillonnage du lecteur"
+
+#: python/format.py:511
+msgid "Highest"
+msgstr "La plus élevée"
+
+#: python/format.py:513
+msgid "Lowest"
+msgstr "La plus basse"
+
+#: python/format.py:514
+msgid ""
+"All of these settings will provide adequate audio quality. The highest "
+"setting will preserve more of the original audio bandwidth at the expense of "
+"many CPU cycles."
+msgstr ""
+
+#: python/format.py:522 python/format.py:533 python/format.py:543
+#, fuzzy
+msgid "Suppressed"
+msgstr "Pressé"
+
+#: python/format.py:523 python/format.py:534
+msgid "UTF-8"
+msgstr ""
+
+#: python/format.py:524
+msgid "Latin1 *"
+msgstr ""
+
+#: python/format.py:525
+msgid ""
+"This affects the stream metadata only. Recordings will use UTF-8 for their "
+"metadata."
+msgstr ""
+
+#: python/format.py:535
+msgid ""
+"Choose whether the stream will carry dynamic metadata. In the case of Ogg "
+"streams this is important as a great many players can't handle chained Ogg "
+"streams which result from the metadata updates."
+msgstr ""
+
+#: python/format.py:544
+msgid "Latin1"
+msgstr ""
+
+#: python/format.py:545
+msgid "Choose whether to send metadata. Recordings will use UTF-8 metadata."
+msgstr ""
+
+#: python/format.py:561 python/format.py:572 python/format.py:583
+#: python/format.py:690 python/format.py:818 python/format.py:888
+#: python/format.py:897 python/format.py:971 python/format.py:994
+#: python/format.py:1003
+msgid "Mode"
+msgstr ""
+
+#: python/format.py:562 python/format.py:573 python/format.py:584
+#: python/format.py:691 python/format.py:819 python/format.py:889
+#: python/format.py:898 python/format.py:972 python/format.py:995
+#: python/format.py:1004
+msgid "Mono"
+msgstr ""
+
+#: python/format.py:563 python/format.py:574 python/format.py:585
+#: python/format.py:692 python/format.py:820 python/format.py:890
+#: python/format.py:899 python/format.py:973 python/format.py:996
+#: python/format.py:1005
+#, fuzzy
+msgid "Stereo"
+msgstr "Panoramique Stéréo"
+
+#: python/format.py:564 python/format.py:575 python/format.py:586
+#: python/format.py:693
+msgid "Joint Stereo"
+msgstr ""
+
+#: python/format.py:565
+msgid "Joint Stereo is a good choice on streams with low bitrates."
+msgstr ""
+
+#: python/format.py:576
+msgid "Due to the high bitrate selected, this codec will only support stereo."
+msgstr ""
+
+#: python/format.py:587
+msgid "Due to the low bitrate selected, this codec will only support mono."
+msgstr ""
+
+#: python/format.py:636 python/format.py:646 python/format.py:743
+#: python/format.py:753 python/format.py:763 python/format.py:869
+#: python/format.py:879 python/format.py:1032 python/format.py:1052
+msgid "Samplerate"
+msgstr ""
+
+#. TC: Abbreviation of the word, standard.
+#: python/format.py:657 python/format.py:774
+msgid "Std."
+msgstr ""
+
+#. TC: v stands for version.
+#: python/format.py:659 python/format.py:776
+msgid "V 1"
+msgstr ""
+
+#. TC: v stands for version.
+#: python/format.py:661 python/format.py:778
+msgid "V 2"
+msgstr ""
+
+#: python/format.py:662
+msgid ""
+"MPEG2 introduced lower samplerate options and corresponding lower bitrates. "
+"Choose 2 if those are required."
+msgstr ""
+
+#: python/format.py:669 python/format.py:797
+msgid "Quality"
+msgstr ""
+
+#: python/format.py:670
+msgid "0 most"
+msgstr ""
+
+#. TC: * means is the recommended setting.
+#: python/format.py:673
+msgid "2 *"
+msgstr ""
+
+#: python/format.py:675
+msgid "Higher quality costs more in terms of CPU cycles."
+msgstr ""
+
+#: python/format.py:694
+msgid "Joint Stereo is a good choice on streams with low bitrates"
+msgstr ""
+
+#. TC: v stands for version.
+#: python/format.py:780
+msgid "V 2.5"
+msgstr ""
+
+#: python/format.py:787
+msgid "Complexity"
+msgstr ""
+
+#: python/format.py:790
+msgid "A quality setting that affects how heavily the CPU is used."
+msgstr ""
+
+#: python/format.py:800
+msgid "The higher this setting, the higher the bitrate."
+msgstr ""
+
+#: python/format.py:807
+msgid "Bandwidth"
+msgstr ""
+
+#: python/format.py:808
+msgid "Ultrawide"
+msgstr ""
+
+#: python/format.py:809
+msgid "Wide"
+msgstr ""
+
+#: python/format.py:810
+msgid "Narrow"
+msgstr ""
+
+#: python/format.py:811
+msgid "Essentially a samplerate setting."
+msgstr ""
+
+#: python/format.py:828
+msgid "24 bit"
+msgstr ""
+
+#: python/format.py:829
+msgid "20 bit"
+msgstr ""
+
+#: python/format.py:830
+msgid "16 bit"
+msgstr ""
+
+#: python/format.py:831
+msgid ""
+"24 bit records with the highest level of detail. If file size is a concern "
+"maybe FLAC is not the right codec."
+msgstr ""
+
+#: python/format.py:838 python/format.py:927
+msgid "Variability"
+msgstr ""
+
+#: python/format.py:839
+msgid "Constant"
+msgstr ""
+
+#: python/format.py:840
+msgid "±10%"
+msgstr ""
+
+#: python/format.py:841
+msgid "±20%"
+msgstr ""
+
+#: python/format.py:842
+msgid "±30%"
+msgstr ""
+
+#: python/format.py:843
+msgid "±40%"
+msgstr ""
+
+#: python/format.py:844
+msgid "±50%"
+msgstr ""
+
+#: python/format.py:845
+#, fuzzy
+msgid "This control is for enabling variable bitrate on Vorbis streams."
+msgstr "Les contrôles pour configurer un flux."
+
+#: python/format.py:906
+#, fuzzy
+msgid "Postgain"
+msgstr "VoIP Régler le gain"
+
+#: python/format.py:907
+msgid "3.0 dB"
+msgstr ""
+
+#: python/format.py:908
+msgid "2.5 dB"
+msgstr ""
+
+#: python/format.py:909
+msgid "2.0 dB"
+msgstr ""
+
+#: python/format.py:910
+msgid "1.5 dB"
+msgstr ""
+
+#: python/format.py:911
+msgid "1.0 dB"
+msgstr ""
+
+#: python/format.py:912
+msgid "0.5 dB"
+msgstr ""
+
+#: python/format.py:920
+msgid "A gain adjustment for the player to apply."
+msgstr ""
+
+#: python/format.py:928
+msgid "CBR *"
+msgstr ""
+
+#: python/format.py:929
+msgid "CVBR"
+msgstr ""
+
+#: python/format.py:930
+msgid "VBR"
+msgstr ""
+
+#: python/format.py:931
+msgid ""
+"Bitrate variability. Actual VBR operation may require a higher frame size."
+msgstr ""
+
+#: python/format.py:938
+msgid "Frame Size"
+msgstr ""
+
+#: python/format.py:939
+msgid "60 ms"
+msgstr ""
+
+#: python/format.py:940
+msgid "40 ms"
+msgstr ""
+
+#: python/format.py:941
+msgid "20 ms"
+msgstr ""
+
+#: python/format.py:942
+msgid "A higher frame size may sound better on very low bitrates."
+msgstr ""
+
+#: python/format.py:949
+msgid "CPU"
+msgstr ""
+
+#: python/format.py:952
+msgid "The encoder complexity setting which affects CPU load."
+msgstr ""
+
+#: python/format.py:980 python/format.py:1083
+msgid "Codec"
+msgstr ""
+
+#: python/format.py:981
+msgid "Vorbis"
+msgstr ""
+
+#: python/format.py:982
+msgid "FLAC"
+msgstr ""
+
+#: python/format.py:983
+msgid "Speex"
+msgstr ""
+
+#: python/format.py:984
+msgid "Opus"
+msgstr ""
+
+#: python/format.py:987
+msgid "Codecs of the Ogg container."
+msgstr ""
+
+#: python/format.py:1033
+msgid "96000 Hz"
+msgstr ""
+
+#: python/format.py:1034
+msgid "88200 Hz"
+msgstr ""
+
+#: python/format.py:1035
+msgid "64000 Hz"
+msgstr ""
+
+#: python/format.py:1036 python/format.py:1053
+msgid "48000 Hz"
+msgstr ""
+
+#: python/format.py:1037 python/format.py:1054
+msgid "44100 Hz"
+msgstr ""
+
+#: python/format.py:1038
+msgid "32000 Hz"
+msgstr ""
+
+#: python/format.py:1039
+msgid "24000 Hz"
+msgstr ""
+
+#: python/format.py:1040
+msgid "22050 Hz"
+msgstr ""
+
+#: python/format.py:1041
+msgid "16000 Hz"
+msgstr ""
+
+#: python/format.py:1042
+msgid "12000 Hz"
+msgstr ""
+
+#: python/format.py:1043
+msgid "11025 Hz"
+msgstr ""
+
+#: python/format.py:1044
+msgid "8000 Hz"
+msgstr ""
+
+#: python/format.py:1045
+msgid "7350 Hz"
+msgstr ""
+
+#: python/format.py:1067
+msgid "The MP2 option requires IDJC be rebuilt against libtwolame."
+msgstr ""
+
+#: python/format.py:1070
+msgid "Enable the MP3 option by installing libmp3lame."
+msgstr ""
+
+#: python/format.py:1073
+msgid "The AAC options require IDJC be rebuilt against libav libraries."
+msgstr ""
+
+#: python/format.py:1076
+msgid ""
+"Specific AAC support not present in libavcodec. More info: idjc.sourceforge."
+"net."
+msgstr ""
+
+#: python/format.py:1078
+msgid ""
+"Specific AAC+ support not present in libavcodec. More info: idjc.sourceforge."
+"net."
+msgstr ""
+
+#: python/format.py:1081
+msgid "Codecs of the MPEG family."
+msgstr ""
+
+#: python/format.py:1084
+msgid "MP2"
+msgstr ""
+
+#: python/format.py:1085
+msgid "MP3"
+msgstr ""
+
+#: python/format.py:1086
+msgid "AAC"
+msgstr ""
+
+#: python/format.py:1087
+msgid "AAC+ v2"
+msgstr ""
+
+#. TC: Codec family e.g. Xiph/Ogg, MPEG etc.
+#: python/format.py:1099
+msgid "Family"
+msgstr ""
+
+#. TC: Xiph.org Ogg container format.
+#: python/format.py:1101
+msgid "Xiph/Ogg"
+msgstr ""
+
+#: python/format.py:1102
+msgid "MPEG"
+msgstr ""
+
+#: python/format.py:1103
+msgid "Codecs have been grouped by standards body and or container format."
+msgstr ""
+
+#: python/format.py:1128
+msgid "Capabilities"
+msgstr ""
+
+#: python/format.py:1140
+#, fuzzy
+msgid "Icecast"
+msgstr "Icecast 2 Maitre"
+
+#: python/format.py:1140
+#, fuzzy
+msgid "Recordable"
+msgstr "Enregistreur"
+
+#~ msgid "Playlist types (*.m3u, *.xspf, *.pls)"
+#~ msgstr "Type de listes de lecture (*.m3u, *.xspf, *.pls)"
+
#~ msgid "File Path Modify"
#~ msgstr "Modifier le chemin"
@@ -4290,9 +4887,3 @@ msgstr ""
#~ "Pour les matériaux généralement forts, il est conseillé d'utiliser entre "
#~ "4 et 8dB, toutefois une valeur trop élevée entraine une perte de "
#~ "dynamique. Le Picmêtre est utile pour trouver la bonne valeur."
-
-#~ msgid "Highest"
-#~ msgstr "La plus élevée"
-
-#~ msgid "Lowest"
-#~ msgstr "La plus basse"
diff --git a/po/idjc.pot b/po/idjc.pot
index faf553d..a266f64 100644
--- a/po/idjc.pot
+++ b/po/idjc.pot
@@ -6,15 +6,15 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: idjc 0.8.14\n"
+"Project-Id-Version: idjc 0.8.15\n"
"Report-Msgid-Bugs-To: putidjcinthesubjectline at bethere.co.uk\n"
-"POT-Creation-Date: 2014-02-17 19:31+0000\n"
+"POT-Creation-Date: 2015-07-27 07:47+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: python/prelims/__init__.py:101
@@ -283,6 +283,7 @@ msgstr ""
#. TC: text appears in the title bar when in session mode.
#: python/prelims/__init__.py:590
+#, python-brace-format
msgid "session={type}:{name}"
msgstr ""
@@ -317,14 +318,17 @@ msgid "Profile %s is active."
msgstr ""
#: python/prelims/__init__.py:791
+#, python-brace-format
msgid "Cannot rename profile {0} to {1}, {1} currently exists."
msgstr ""
#: python/prelims/__init__.py:795
+#, python-brace-format
msgid "Error during attempt to rename {0} to {1}."
msgstr ""
#: python/prelims/__init__.py:805
+#, python-brace-format
msgid ""
"<span weight='bold' size='12000'>Error while editing profile: {0}.</span>\n"
"\n"
@@ -332,6 +336,7 @@ msgid ""
msgstr ""
#: python/prelims/__init__.py:824
+#, python-brace-format
msgid "could not get a lock on profile {0}: {1}"
msgstr ""
@@ -433,54 +438,54 @@ msgid "The default profile"
msgstr ""
#. TC: data entry dialog window title text. %s = profile name
-#: python/prelims/profiledialog.py:97
+#: python/prelims/profiledialog.py:98
#, python-format
msgid "Edit profile %s"
msgstr ""
#. TC: data entry dialog window title text. %s = profile name
-#: python/prelims/profiledialog.py:100
+#: python/prelims/profiledialog.py:101
#, python-format
msgid "New profile based upon %s"
msgstr ""
#. TC: data entry dialog window title text.
-#: python/prelims/profiledialog.py:104
+#: python/prelims/profiledialog.py:105
msgid "New profile details"
msgstr ""
#. TC: profile dialog window title text.
-#: python/prelims/profiledialog.py:242
+#: python/prelims/profiledialog.py:243
msgid "IDJC Profile Manager"
msgstr ""
-#: python/prelims/profiledialog.py:276
+#: python/prelims/profiledialog.py:277
msgid "Profile"
msgstr ""
#. TC: column heading. The profile nicknames.
#. TC: IRC nickname data entry label.
-#: python/prelims/profiledialog.py:284 python/irc.py:446
+#: python/prelims/profiledialog.py:285 python/irc.py:452
msgid "Nickname"
msgstr ""
#. TC: column heading.
#. TC: Station description.
-#: python/prelims/profiledialog.py:287 python/irc.py:90
-#: python/playergui.py:306 python/sourceclientgui.py:1640
+#: python/prelims/profiledialog.py:288 python/irc.py:96
+#: python/playergui.py:307 python/sourceclientgui.py:1697
msgid "Description"
msgstr ""
#. TC: column heading. The time a particular profile has been running.
-#: python/prelims/profiledialog.py:291
+#: python/prelims/profiledialog.py:292
msgid "Up-time"
msgstr ""
-#: python/prelims/profiledialog.py:305
+#: python/prelims/profiledialog.py:306
msgid "_Auto"
msgstr ""
-#: python/prelims/profiledialog.py:364
+#: python/prelims/profiledialog.py:365
#, python-format
msgid ""
"<span weight='bold' size='12000'>Delete the data of profile '%s'?</span>\n"
@@ -488,7 +493,7 @@ msgid ""
"The profile will remain available with initial settings."
msgstr ""
-#: python/prelims/profiledialog.py:368
+#: python/prelims/profiledialog.py:369
#, python-format
msgid ""
"<span weight='bold' size='12000'>Delete profile '%s' and all its data?</"
@@ -499,6 +504,7 @@ msgstr ""
#. TC: The contents of <> and {} must not be changed.
#: python/dialogs.py:198
+#, python-brace-format
msgid ""
"<span weight=\"bold\" size=\"12000\">The connection to the server in tab "
"{servertab} has failed.</span>\n"
@@ -525,148 +531,157 @@ msgid "Released under the GNU General Public License V2.0+."
msgstr ""
#. TC: IRC message subcategory, triggers on new track announcements.
-#: python/irc.py:78
+#: python/irc.py:82
msgid "Track announce"
msgstr ""
#. TC: IRC message subcategory, triggered by a timer.
-#: python/irc.py:80
+#: python/irc.py:84
msgid "Timer"
msgstr ""
#. TC: IRC message subcategory, triggered once when the stream starts.
-#: python/irc.py:82
+#: python/irc.py:86
msgid "On stream up"
msgstr ""
#. TC: IRC message subcategory, triggered once at the stream's end.
-#: python/irc.py:84
+#: python/irc.py:88
msgid "On stream down"
msgstr ""
+#. TC: IRC message subcategory, triggered once at the stream's end.
+#: python/irc.py:90
+msgid "Operations"
+msgstr ""
+
#. TC: Track artist.
-#: python/irc.py:89 python/mutagentagger.py:375 python/songdb.py:785
-#: python/songdb.py:1157 python/sourceclientgui.py:92
+#: python/irc.py:95 python/mutagentagger.py:375 python/songdb.py:902
+#: python/songdb.py:1290 python/sourceclientgui.py:94
msgid "Artist"
msgstr ""
-#: python/irc.py:89 python/mutagentagger.py:375 python/songdb.py:1161
-#: python/sourceclientgui.py:92
+#: python/irc.py:95 python/mutagentagger.py:375 python/songdb.py:1292
+#: python/sourceclientgui.py:94
msgid "Title"
msgstr ""
-#: python/irc.py:89 python/mutagentagger.py:376 python/songdb.py:1158
-#: python/sourceclientgui.py:92
+#: python/irc.py:95 python/mutagentagger.py:376 python/songdb.py:1291
+#: python/sourceclientgui.py:94
msgid "Album"
msgstr ""
-#: python/irc.py:89 python/sourceclientgui.py:93
+#: python/irc.py:95 python/sourceclientgui.py:95
msgid "Song name"
msgstr ""
#. TC: The DJ or Stream name.
-#: python/irc.py:90 python/sourceclientgui.py:1637
+#: python/irc.py:96 python/sourceclientgui.py:1694
msgid "DJ name"
msgstr ""
-#: python/irc.py:90 python/sourceclientgui.py:1638
+#: python/irc.py:96 python/sourceclientgui.py:1695
msgid "Listen URL"
msgstr ""
+#: python/irc.py:96
+msgid "Source URI"
+msgstr ""
+
#. TC: Popup menu item for a GTK text entry widget.
-#: python/irc.py:133
+#: python/irc.py:139
msgid "Insert Attribute or Colour Code"
msgstr ""
#. TC: Text formatting style.
-#: python/irc.py:170
+#: python/irc.py:176
msgid "<b>Bold</b>"
msgstr ""
#. TC: Text formatting style.
-#: python/irc.py:172
+#: python/irc.py:178
msgid "<u>Underline</u>"
msgstr ""
#. TC: Text formatting style.
-#: python/irc.py:174
+#: python/irc.py:180
msgid "Normal"
msgstr ""
-#: python/irc.py:180
+#: python/irc.py:186
msgid "Colours"
msgstr ""
-#: python/irc.py:397
+#: python/irc.py:403
msgid "Optional data entry field for information only."
msgstr ""
#. TC: Tab heading text.
-#: python/irc.py:400
+#: python/irc.py:406
msgid "IRC server"
msgstr ""
-#: python/irc.py:412
+#: python/irc.py:418
msgid "Manual start"
msgstr ""
-#: python/irc.py:414
+#: python/irc.py:420
msgid "Off when restarting IDJC and off initially."
msgstr ""
#. TC: The IRC network e.g. EFnet.
-#: python/irc.py:438
+#: python/irc.py:444
msgid "Network"
msgstr ""
#. TC: label for hostname entry.
-#: python/irc.py:440 python/sourceclientgui.py:206
+#: python/irc.py:446 python/sourceclientgui.py:208
msgid "Hostname"
msgstr ""
#. TC: TCP/IP port number label.
#. TC: TCP port number.
-#: python/irc.py:442 python/sourceclientgui.py:678
+#: python/irc.py:448 python/sourceclientgui.py:704
msgid "Port"
msgstr ""
-#: python/irc.py:443
+#: python/irc.py:449
msgid "User name"
msgstr ""
-#: python/irc.py:444 python/songdb.py:339 python/sourceclientgui.py:207
+#: python/irc.py:450 python/songdb.py:343 python/sourceclientgui.py:209
msgid "Password"
msgstr ""
#. TC: Second choice of IRC nickname.
-#: python/irc.py:448
+#: python/irc.py:454
msgid "Second choice"
msgstr ""
#. TC: Third choice of IRC nickname.
-#: python/irc.py:450
+#: python/irc.py:456
msgid "Third choice"
msgstr ""
#. TC: The IRC user's 'real' name.
-#: python/irc.py:452
+#: python/irc.py:458
msgid "Real name"
msgstr ""
#. TC: The NickServ password.
-#: python/irc.py:454
+#: python/irc.py:460
msgid "NickServ p/w"
msgstr ""
#. TC: Tooltip to IRC 'User name' field.
-#: python/irc.py:459
+#: python/irc.py:465
msgid ""
"Ideally set this to something even on servers that allow public anonymous "
"access."
msgstr ""
#. TC: tooltip to all IRC nicknames entry fields.
-#: python/irc.py:469
+#: python/irc.py:475
msgid ""
"When a nickname is in use on the target IRC network, during connection these "
"IRC nicknames are cycled through, then twice again after appending an "
@@ -674,7 +689,7 @@ msgid ""
"nicknames to try."
msgstr ""
-#: python/irc.py:474
+#: python/irc.py:480
msgid ""
"The real name you want to use which will be available regardless of whether "
"the network connection was made with the primary nickname or not.\n"
@@ -682,7 +697,7 @@ msgid ""
"Ideally set this to something."
msgstr ""
-#: python/irc.py:477
+#: python/irc.py:483
msgid ""
"If this value is set an attempt will be made to acquire your first choice "
"IRC nickname (if needed) and log in with NickServ at services.\n"
@@ -691,7 +706,7 @@ msgid ""
"network using a regular chat client."
msgstr ""
-#: python/irc.py:505
+#: python/irc.py:511
msgid ""
"<span weight='bold' size='12000'>Permanently delete this server?</span>\n"
"\n"
@@ -699,11 +714,11 @@ msgid ""
msgstr ""
#. TC: An IRC channel #chan or user name entry box label.
-#: python/irc.py:552
+#: python/irc.py:559
msgid "Channels/Users"
msgstr ""
-#: python/irc.py:556
+#: python/irc.py:563
msgid ""
"The comma or space separated list of channels and/or users to whom the "
"message will be sent.\n"
@@ -713,11 +728,11 @@ msgid ""
msgstr ""
#. TC: Message text to send to an IRC channel. Widget label.
-#: python/irc.py:563
+#: python/irc.py:616
msgid "Message"
msgstr ""
-#: python/irc.py:567
+#: python/irc.py:620
msgid ""
"The message to send.\n"
"\n"
@@ -728,17 +743,17 @@ msgid ""
msgstr ""
#. TC: Dialog window title text.
-#: python/irc.py:638
+#: python/irc.py:673
msgid "IRC track announce"
msgstr ""
#. TC: Spinbutton label for a delay value.
-#: python/irc.py:645
+#: python/irc.py:680
msgid "Delay"
msgstr ""
#. TC: tooltip on a spinbutton widget.
-#: python/irc.py:647
+#: python/irc.py:682
msgid ""
"The delay time of this message.\n"
"\n"
@@ -751,228 +766,233 @@ msgid ""
msgstr ""
#. TC: Dialog window title text.
-#: python/irc.py:675
+#: python/irc.py:710
msgid "IRC timed message"
msgstr ""
#. TC: Spinbutton time offset value label.
-#: python/irc.py:684
+#: python/irc.py:719
msgid "Offset"
msgstr ""
#. TC: Spinbutton timed interval duration value label.
-#: python/irc.py:686
+#: python/irc.py:721
msgid "Interval"
msgstr ""
#. TC: spinbutton tooltip
-#: python/irc.py:689
+#: python/irc.py:724
msgid ""
"The time offset within the below specified interval at which the message "
"will be issued."
msgstr ""
-#: python/irc.py:693
+#: python/irc.py:728
msgid "The interval in seconds of the timed message."
msgstr ""
-#: python/irc.py:930
+#: python/irc.py:967
msgid "This feature requires the installation of python-irc."
msgstr ""
#. TC: Indicator text: We used a password.
-#: python/irc.py:1021
+#: python/irc.py:1058
msgid "PASSWORD"
msgstr ""
#. TC: Indicator text: We interact with NickServ.
-#: python/irc.py:1024
+#: python/irc.py:1061
msgid "NICKSERV"
msgstr ""
#. TC: Indicator text: Server connection started manually.
-#: python/irc.py:1027
+#: python/irc.py:1064
msgid "MANUAL"
msgstr ""
-#. TC: Expander text encapsulating messages that play when stream goes up.
-#: python/irc.py:1048
+#. TC: Dialog title text.
+#: python/irc.py:1089
msgid "IRC stream up message"
msgstr ""
-#. TC: Expander text encapsulating messages that play when stream goes down.
-#: python/irc.py:1050
+#. TC: Dialog title text.
+#: python/irc.py:1091
msgid "IRC stream down message"
msgstr ""
-#: python/jingles.py:95
+#. TC: Dialog title text.
+#: python/irc.py:1093
+msgid "IRC station operations"
+msgstr ""
+
+#: python/jingles.py:96
msgid "Stop"
msgstr ""
#. TC: Column heading, whether to play.
-#: python/jingles.py:113 python/playergui.py:298
+#: python/jingles.py:114 python/playergui.py:299
msgid "Play"
msgstr ""
-#: python/jingles.py:122 python/sourceclientgui.py:1025
+#: python/jingles.py:123 python/sourceclientgui.py:1051
msgid "Repeat"
msgstr ""
-#: python/jingles.py:135
+#: python/jingles.py:136
msgid "Configure"
msgstr ""
-#: python/jingles.py:326 python/playergui.py:4052
+#: python/jingles.py:327 python/playergui.py:4135
msgid "Supported media"
msgstr ""
-#: python/jingles.py:333
+#: python/jingles.py:334
#, python-format
msgid "Effect %d Config"
msgstr ""
-#: python/jingles.py:348
+#: python/jingles.py:349
msgid "Trigger text"
msgstr ""
-#: python/jingles.py:349
+#: python/jingles.py:350
msgid "No Name"
msgstr ""
-#: python/jingles.py:356
+#: python/jingles.py:357
msgid "Level adjustment (dB)"
msgstr ""
-#: python/jingles.py:431
+#: python/jingles.py:432
msgid "Effects volume."
msgstr ""
-#: python/jingles.py:438
+#: python/jingles.py:439
msgid "Player headroom that is applied when an effect is playing."
msgstr ""
-#: python/jingles.py:501
+#: python/jingles.py:502
msgid "Alternative"
msgstr ""
-#: python/jingles.py:502
+#: python/jingles.py:503
msgid "Default"
msgstr ""
-#: python/jingles.py:547
+#: python/jingles.py:548
msgid "Effects"
msgstr ""
-#: python/jingles.py:590
+#: python/jingles.py:591
#, python-format
msgid "Effects %d"
msgstr ""
-#: python/jingles.py:598 python/maingui.py:188
+#: python/jingles.py:599 python/maingui.py:189
msgid "Background Tracks"
msgstr ""
-#: python/jingles.py:617
+#: python/jingles.py:618
msgid "Background Tracks volume."
msgstr ""
-#: python/maingui.py:92
+#: python/maingui.py:93
msgid "Show a JACK freewheel control on the main panel"
msgstr ""
-#: python/maingui.py:94
+#: python/maingui.py:95
msgid "Toggle JACK freewheel mode."
msgstr ""
-#: python/maingui.py:167
+#: python/maingui.py:168
msgid "File"
msgstr ""
-#: python/maingui.py:167 python/preferences.py:1127
+#: python/maingui.py:168 python/preferences.py:1130
msgid "View"
msgstr ""
-#: python/maingui.py:168
+#: python/maingui.py:169
msgid "JACK Ports"
msgstr ""
-#: python/maingui.py:168
+#: python/maingui.py:169
msgid "Help"
msgstr ""
-#: python/maingui.py:170 python/maingui.py:3653
+#: python/maingui.py:171 python/maingui.py:3689
msgid "Streams"
msgstr ""
-#: python/maingui.py:171
+#: python/maingui.py:172
msgid "Recorders"
msgstr ""
-#: python/maingui.py:184 python/maingui.py:223
+#: python/maingui.py:185 python/maingui.py:224
msgid "Output"
msgstr ""
-#: python/maingui.py:184
+#: python/maingui.py:185
msgid "Preferences"
msgstr ""
-#: python/maingui.py:184
+#: python/maingui.py:185
msgid "Profiles"
msgstr ""
-#: python/maingui.py:187 python/songdb.py:405
+#: python/maingui.py:188 python/songdb.py:409
msgid "Music Database"
msgstr ""
-#: python/maingui.py:187
+#: python/maingui.py:188
msgid "Channel Meters"
msgstr ""
-#: python/maingui.py:187
+#: python/maingui.py:188
msgid "Output Meters"
msgstr ""
-#: python/maingui.py:188
+#: python/maingui.py:189
msgid "Tabbed Area"
msgstr ""
-#: python/maingui.py:188
+#: python/maingui.py:189
msgid "Button Bar"
msgstr ""
-#: python/maingui.py:222 python/preferences.py:1482
+#: python/maingui.py:223 python/preferences.py:1485
msgid "Channels"
msgstr ""
-#: python/maingui.py:222
+#: python/maingui.py:223
msgid "Players"
msgstr ""
-#: python/maingui.py:223
+#: python/maingui.py:224
msgid "VoIP"
msgstr ""
-#: python/maingui.py:223 python/maingui.py:3093
+#: python/maingui.py:224 python/maingui.py:3129
msgid "DSP"
msgstr ""
-#: python/maingui.py:223
+#: python/maingui.py:224
msgid "Mix"
msgstr ""
-#: python/maingui.py:223
+#: python/maingui.py:224
msgid "Misc"
msgstr ""
-#: python/maingui.py:268
+#: python/maingui.py:269
msgid "Reset"
msgstr ""
-#: python/maingui.py:271
+#: python/maingui.py:272
msgid "Reset the JACK port connections to the default settings."
msgstr ""
-#: python/maingui.py:276
+#: python/maingui.py:277
msgid ""
"<span size=\"12000\" weight=\"bold\">Reset all JACK port connections?</"
"span>\n"
@@ -981,165 +1001,171 @@ msgid ""
"and replaced with defaults."
msgstr ""
-#: python/maingui.py:320
+#: python/maingui.py:321
msgid "No compatible ports available."
msgstr ""
-#: python/maingui.py:363
+#: python/maingui.py:364
+#, python-brace-format
msgid "{0} profile={1}:{2} settings saved."
msgstr ""
-#: python/maingui.py:366
+#: python/maingui.py:367
+#, python-brace-format
msgid "{0} session={1}:{2} settings saved."
msgstr ""
-#: python/maingui.py:670
+#: python/maingui.py:671
msgid "Text"
msgstr ""
-#: python/maingui.py:673
+#: python/maingui.py:674
msgid "The opener button's text."
msgstr ""
-#: python/maingui.py:681
+#: python/maingui.py:682
msgid "Icon"
msgstr ""
-#: python/maingui.py:689
+#: python/maingui.py:690
msgid "The opener button's icon."
msgstr ""
-#: python/maingui.py:697
+#: python/maingui.py:698
msgid ""
"The headroom is the amount by which to reduce player volume when this opener "
"is active. Note that the actual amount will be the largest value of all the "
"currently open buttons."
msgstr ""
-#: python/maingui.py:702
+#: python/maingui.py:703
msgid "The amount of headroom required (dB)"
msgstr ""
-#: python/maingui.py:711
+#: python/maingui.py:712
msgid "This button will flash as a reminder to close"
msgstr ""
-#: python/maingui.py:712
+#: python/maingui.py:713
msgid ""
"After a number of seconds where a main player is active this button's status "
"indicator will start to flash and will continue to do so until the button is "
"closed or the player stops."
msgstr ""
-#: python/maingui.py:720
+#: python/maingui.py:721
msgid "This button is to be treated as a microphone opener"
msgstr ""
-#: python/maingui.py:722
+#: python/maingui.py:723
msgid ""
"The button will be grouped with the other microphone opener buttons. It will "
"be affected by signals to close microphone buttons. Channels associated with "
"this button will be mixed differently when using the VoIP modes."
msgstr ""
-#: python/maingui.py:733
+#: python/maingui.py:732
+msgid "This button will automatically cancel JACK freewheel mode"
+msgstr ""
+
+#: python/maingui.py:734
msgid ""
"This should be set for all buttons that control input from a live sound "
"source or device."
msgstr ""
-#: python/maingui.py:736
+#: python/maingui.py:737
msgid "Button Open Triggers"
msgstr ""
-#: python/maingui.py:743
+#: python/maingui.py:744
msgid "Playlist advance button"
msgstr ""
-#: python/maingui.py:744 python/maingui.py:745
+#: python/maingui.py:745 python/maingui.py:746
#, python-format
msgid "'%s' control"
msgstr ""
#. TC: Insert playlist control to stop the player.
-#: python/maingui.py:744 python/playergui.py:4310
+#: python/maingui.py:745 python/playergui.py:4393
msgid "Player Stop"
msgstr ""
#. TC: Insert playlist control to stop the player.
-#: python/maingui.py:745 python/playergui.py:4317
+#: python/maingui.py:746 python/playergui.py:4400
msgid "Player Stop 2"
msgstr ""
-#: python/maingui.py:746
+#: python/maingui.py:747
msgid "Announcements"
msgstr ""
-#: python/maingui.py:758
+#: python/maingui.py:759
msgid "When opened close these other buttons"
msgstr ""
-#: python/maingui.py:769
+#: python/maingui.py:770
msgid "Shell Command"
msgstr ""
-#: python/maingui.py:770
+#: python/maingui.py:771
msgid ""
"Mostly useful issuing 'amixer' commands, in particular for setting capture."
msgstr ""
-#: python/maingui.py:790
+#: python/maingui.py:791
msgid "On open"
msgstr ""
-#: python/maingui.py:791
+#: python/maingui.py:792
msgid "On close"
msgstr ""
-#: python/maingui.py:835
+#: python/maingui.py:836
msgid "Main Panel Opener Buttons"
msgstr ""
-#: python/maingui.py:847
+#: python/maingui.py:848
msgid "Indicate button numbers and associated channel numbers"
msgstr ""
-#: python/maingui.py:849
+#: python/maingui.py:850
msgid "A useful feature to have switched on while allocating channel openers."
msgstr ""
-#: python/maingui.py:855
+#: python/maingui.py:856
msgid "Status Indicator Appearance"
msgstr ""
-#: python/maingui.py:858
+#: python/maingui.py:859
msgid ""
"Each opener button has two vertical bars at the side to make the button "
"state more apparent. These settings control their appearance."
msgstr ""
-#: python/maingui.py:867
+#: python/maingui.py:868 python/format.py:827
msgid "Width"
msgstr ""
-#: python/maingui.py:874
+#: python/maingui.py:875
msgid "Opened"
msgstr ""
-#: python/maingui.py:878 python/preferences.py:500 python/preferences.py:502
+#: python/maingui.py:879 python/preferences.py:503 python/preferences.py:505
msgid "Closed"
msgstr ""
-#: python/maingui.py:883
+#: python/maingui.py:884
msgid "Remind"
msgstr ""
#. TC: A placeholder text for when there are no opener buttons.
-#: python/maingui.py:1064
+#: python/maingui.py:1065
msgid "No Channel Opener Buttons"
msgstr ""
-#: python/maingui.py:1353
+#: python/maingui.py:1354
msgid ""
"This indicates the state of the various streams. Flashing means stream "
"packets are being discarded because of network congestion. Partial red means "
@@ -1147,96 +1173,97 @@ msgid ""
"the server. Green means everything is okay."
msgstr ""
-#: python/maingui.py:1376
+#: python/maingui.py:1377
msgid "The combined total number of listeners in all server tabs."
msgstr ""
#. TC: Record as in, to make a recording.
-#: python/maingui.py:1824 python/sourceclientgui.py:2702
+#: python/maingui.py:1825 python/sourceclientgui.py:2784
msgid "Record"
msgstr ""
-#: python/maingui.py:2620
+#: python/maingui.py:2647
msgid "Confirmation to quit IDJC is required."
msgstr ""
-#: python/maingui.py:2624
+#: python/maingui.py:2651
msgid "All active recordings and radio streams will terminate."
msgstr ""
-#: python/maingui.py:2626
+#: python/maingui.py:2653
msgid "All of the active radio streams will terminate."
msgstr ""
-#: python/maingui.py:2628
+#: python/maingui.py:2655
msgid "All active recordings will cease."
msgstr ""
#. TC: Popup menu item, wipes away the tracks played history text.
-#: python/maingui.py:2885 python/maingui.py:3317
+#: python/maingui.py:2921 python/maingui.py:3353
msgid "Remove Contents"
msgstr ""
-#: python/maingui.py:3040
+#: python/maingui.py:3076
msgid "Renameable Labels"
msgstr ""
-#: python/maingui.py:3064
+#: python/maingui.py:3100
msgid "Main Players"
msgstr ""
-#: python/maingui.py:3117
+#: python/maingui.py:3153
msgid "Mix voice over IP audio to the output stream."
msgstr ""
-#: python/maingui.py:3130
+#: python/maingui.py:3166
msgid "Mix voice over IP audio to the DJ only."
msgstr ""
-#: python/maingui.py:3157
+#: python/maingui.py:3193
msgid ""
"This button steps through the active playlist, pausing between tracks. The "
"active playlist is defined by the placement of the crossfader."
msgstr ""
-#: python/maingui.py:3202 python/preferences.py:870
+#: python/maingui.py:3238 python/preferences.py:873
msgid "The volume control shared by both music players."
msgstr ""
-#: python/maingui.py:3213
+#: python/maingui.py:3249
msgid "The volume control for the right music player."
msgstr ""
-#: python/maingui.py:3241
+#: python/maingui.py:3277
msgid "VoIP level adjustment. 0dB gain is at the mid point."
msgstr ""
-#: python/maingui.py:3264
+#: python/maingui.py:3300
msgid "The stream volume level to send to the voice over IP connection."
msgstr ""
-#: python/maingui.py:3291 python/preferences.py:1410
+#: python/maingui.py:3327 python/preferences.py:1413
msgid "Tracks Played"
msgstr ""
-#: python/maingui.py:3362 python/maingui.py:3364 python/maingui.py:3388
+#: python/maingui.py:3398 python/maingui.py:3400 python/maingui.py:3424
msgid "Monitor Mix"
msgstr ""
-#: python/maingui.py:3371 python/maingui.py:3388 python/playergui.py:4251
+#: python/maingui.py:3407 python/maingui.py:3424 python/playergui.py:4334
msgid "DJ"
msgstr ""
#. TC: binding editor, action pane, first row, toplevel menu.
-#: python/maingui.py:3374 python/maingui.py:3388 python/midicontrols.py:154
-#: python/midicontrols.py:1506 python/playergui.py:4243
-#: python/sourceclientgui.py:2710
+#: python/maingui.py:3410 python/maingui.py:3424 python/midicontrols.py:155
+#: python/midicontrols.py:1507 python/playergui.py:4326
+#: python/sourceclientgui.py:2792
msgid "Stream"
msgstr ""
#. TC: Context {0}, {1}, {2} = Monitor Mix, Stream, DJ
#. TC: Or whatever they become translated to.
-#: python/maingui.py:3384
+#: python/maingui.py:3420
+#, python-brace-format
msgid ""
"In IDJC there are are two audio paths and this '{0}' control toggles between "
"them. When '{1}' is active you can hear what the listeners are hearing "
@@ -1245,82 +1272,82 @@ msgid ""
msgstr ""
#. TC: Dropdown box title text widget.
-#: python/maingui.py:3397 python/maingui.py:3399
+#: python/maingui.py:3433 python/maingui.py:3435
msgid "Metadata Source"
msgstr ""
#. TC: The chosen source of track metadata.
-#: python/maingui.py:3405 python/playergui.py:3961
+#: python/maingui.py:3441 python/playergui.py:4044
msgid "Playlist 1"
msgstr ""
#. TC: The chosen source of track metadata.
-#: python/maingui.py:3407 python/playergui.py:3962
+#: python/maingui.py:3443 python/playergui.py:4045
msgid "Playlist 2"
msgstr ""
#. TC: The chosen source of track metadata.
-#: python/maingui.py:3409
+#: python/maingui.py:3445 python/songdb.py:909 python/songdb.py:1293
msgid "Last Played"
msgstr ""
#. TC: The chosen source of track metadata.
-#: python/maingui.py:3411 python/maingui.py:3448 python/maingui.py:3450
+#: python/maingui.py:3447 python/maingui.py:3484 python/maingui.py:3486
msgid "Crossfader"
msgstr ""
#. TC: The chosen source of track metadata. In this case no metadata.
#. TC: Fade time is zero. No fade, none.
-#: python/maingui.py:3413 python/playergui.py:4226
+#: python/maingui.py:3449 python/playergui.py:4309
msgid "None"
msgstr ""
#. TC: The chosen source of track metadata. In this case no metadata.
-#: python/maingui.py:3415
+#: python/maingui.py:3451
msgid "Playlist 3"
msgstr ""
-#: python/maingui.py:3420
+#: python/maingui.py:3456
msgid "Select the origin for the playing track metadata on the stream."
msgstr ""
#. TC: Abbreviation of left.
-#: python/maingui.py:3430 python/maingui.py:3432
+#: python/maingui.py:3466 python/maingui.py:3468
msgid "L"
msgstr ""
-#: python/maingui.py:3442
+#: python/maingui.py:3478
msgid "Move the crossfader fully left."
msgstr ""
-#: python/maingui.py:3462
+#: python/maingui.py:3498
msgid "The crossfader."
msgstr ""
#. TC: Abbreviation of right.
-#: python/maingui.py:3466 python/maingui.py:3468
+#: python/maingui.py:3502 python/maingui.py:3504
msgid "R"
msgstr ""
-#: python/maingui.py:3478
+#: python/maingui.py:3514
msgid "Move the crossfader fully right."
msgstr ""
#. TC: Describes a mid point.
-#: python/maingui.py:3487 python/maingui.py:3489
+#: python/maingui.py:3523 python/maingui.py:3525
msgid "Middle"
msgstr ""
-#: python/maingui.py:3506 python/maingui.py:3513
+#: python/maingui.py:3542 python/maingui.py:3549
msgid "Move the crossfader to the middle of its range of travel."
msgstr ""
#. TC: The attenuation response curve of the crossfader. User selectable.
-#: python/maingui.py:3518 python/maingui.py:3520
+#: python/maingui.py:3554 python/maingui.py:3556
msgid "Response"
msgstr ""
-#: python/maingui.py:3542
+#: python/maingui.py:3578
msgid ""
"This selects the response curve of the crossfader.\n"
"\n"
@@ -1328,11 +1355,11 @@ msgid ""
msgstr ""
#. TC: Duration in seconds.
-#: python/maingui.py:3556 python/maingui.py:3558
+#: python/maingui.py:3592 python/maingui.py:3594
msgid "Time"
msgstr ""
-#: python/maingui.py:3575
+#: python/maingui.py:3611
msgid ""
"The time in seconds that the crossfader will take to automatically pass "
"across when the button to the right is clicked."
@@ -1340,39 +1367,39 @@ msgstr ""
#. TC: The crossfader pass-across button text.
#. TC: The actual button appears as [<-->] with this text above it.
-#: python/maingui.py:3584 python/maingui.py:3586
+#: python/maingui.py:3620 python/maingui.py:3622
msgid "Pass"
msgstr ""
-#: python/maingui.py:3599
+#: python/maingui.py:3635
msgid ""
"This button causes the crossfader to move to the opposite side at a speed "
"determined by the speed selector to the left."
msgstr ""
-#: python/maingui.py:3642
+#: python/maingui.py:3678
msgid "Peak"
msgstr ""
-#: python/maingui.py:3645
+#: python/maingui.py:3681
msgid "A peak hold meter indicating the signal strength of the stream audio."
msgstr ""
#. TC: This text appears above the stream mix VU meter.
-#: python/maingui.py:3667
+#: python/maingui.py:3703
msgid "VU"
msgstr ""
-#: python/maingui.py:3671
+#: python/maingui.py:3707
msgid "A VU meter for the stream audio."
msgstr ""
#. TC: Appears above the mic meters as a label followed by a number.
-#: python/maingui.py:3674
+#: python/maingui.py:3710
msgid "Ch"
msgstr ""
-#: python/maingui.py:3701
+#: python/maingui.py:3737
msgid ""
"A peak hold meter indicating the microphone signal strength and a meter "
"indicating attenuation levels in the microphone signal processing system. "
@@ -1381,469 +1408,469 @@ msgid ""
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:47
+#: python/midicontrols.py:48
msgid "Tooltips enable"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:49
+#: python/midicontrols.py:50
msgid "DJ-mix monitor"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:51
+#: python/midicontrols.py:52
msgid "Panning load from presets"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:53
+#: python/midicontrols.py:54
msgid "Player play/pause"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
#. TC: Playlist control.
-#: python/midicontrols.py:55 python/playergui.py:3719
+#: python/midicontrols.py:56 python/playergui.py:3798
msgid "Player stop"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:57
+#: python/midicontrols.py:58
msgid "Player advance"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:59
+#: python/midicontrols.py:60
msgid "Player play previous"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:61
+#: python/midicontrols.py:62
msgid "Player play next"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:63
+#: python/midicontrols.py:64
msgid "Player play selected from start"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:65
+#: python/midicontrols.py:66
msgid "Player select previous"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:67
+#: python/midicontrols.py:68
msgid "Player select next"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:69
+#: python/midicontrols.py:70
msgid "Player stream output enable"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:71
+#: python/midicontrols.py:72
msgid "Player DJ output enable"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:73
+#: python/midicontrols.py:74
msgid "Player DJ-only switch"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:75
+#: python/midicontrols.py:76
msgid "Player set volume"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:77
+#: python/midicontrols.py:78
msgid "Player set gain"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:79
+#: python/midicontrols.py:80
msgid "Player set balance"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:81
+#: python/midicontrols.py:82
msgid "Player set pitchbend"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:84
+#: python/midicontrols.py:85
msgid "Playlist edit tags"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:86
+#: python/midicontrols.py:87
msgid "Playlist insert stop"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:88
+#: python/midicontrols.py:89
msgid "Playlist insert stop 2"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:90
+#: python/midicontrols.py:91
msgid "Playlist insert announce"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:92
+#: python/midicontrols.py:93
msgid "Playlist insert transfer"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:94
+#: python/midicontrols.py:95
msgid "Playlist insert crossfade"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:96
+#: python/midicontrols.py:97
msgid "Playlist insert pitchunbend"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:98
+#: python/midicontrols.py:99
msgid "Playlist insert jump to top"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:101
+#: python/midicontrols.py:102
msgid "Players set crossfade"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:103
+#: python/midicontrols.py:104
msgid "Players pass crossfade"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:105
+#: python/midicontrols.py:106
msgid "Players set focus"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:107
+#: python/midicontrols.py:108
msgid "Players show pitchbend"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:109
+#: python/midicontrols.py:110
msgid "Players advance"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:112
+#: python/midicontrols.py:113
msgid "Channel output enable"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:114
+#: python/midicontrols.py:115
msgid "Channel set volume"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:116
+#: python/midicontrols.py:117
msgid "Channel set gain"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:118
+#: python/midicontrols.py:119
msgid "Channel set balance"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:121
+#: python/midicontrols.py:122
msgid "VoIP output enable"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:123
+#: python/midicontrols.py:124
msgid "VoIP DJ-only switch"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:125
+#: python/midicontrols.py:126
msgid "VoIP set volume"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:127
+#: python/midicontrols.py:128
msgid "VoIP set mixback"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:129
+#: python/midicontrols.py:130
msgid "VoIP set gain"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:131
+#: python/midicontrols.py:132
msgid "VoIP set balance"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:134
+#: python/midicontrols.py:135
msgid "Effect play from start"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:137
+#: python/midicontrols.py:138
msgid "Effects stop many"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:139
+#: python/midicontrols.py:140
msgid "Effects set volume"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:141
+#: python/midicontrols.py:142
msgid "Effects set headroom"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:144
+#: python/midicontrols.py:145
msgid "Stream set connected"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:147
+#: python/midicontrols.py:148
msgid "Recorder set recording"
msgstr ""
#. TC: binding editor, action pane, first row, toplevel menu.
-#: python/midicontrols.py:151 python/midicontrols.py:1492
+#: python/midicontrols.py:152 python/midicontrols.py:1493
msgid "Player"
msgstr ""
#. TC: binding editor, action pane, first row, toplevel menu.
#. TC: The midi channel.
#. TC: Specifically, the numerical midi channel.
-#: python/midicontrols.py:152 python/midicontrols.py:1498
-#: python/midicontrols.py:1567 python/midicontrols.py:1757
+#: python/midicontrols.py:153 python/midicontrols.py:1499
+#: python/midicontrols.py:1568 python/midicontrols.py:1758
msgid "Channel"
msgstr ""
-#: python/midicontrols.py:153 python/preferences.py:596
-#: python/preferences.py:606
+#: python/midicontrols.py:154 python/preferences.py:599
+#: python/preferences.py:609
msgid "Effect"
msgstr ""
-#: python/midicontrols.py:155
+#: python/midicontrols.py:156
msgid "Recorder"
msgstr ""
-#: python/midicontrols.py:156
+#: python/midicontrols.py:157
msgid "Setting"
msgstr ""
-#: python/midicontrols.py:160
+#: python/midicontrols.py:161
msgid "Left player"
msgstr ""
-#: python/midicontrols.py:161
+#: python/midicontrols.py:162
msgid "Right player"
msgstr ""
-#: python/midicontrols.py:162
+#: python/midicontrols.py:163
msgid "Background player"
msgstr ""
-#: python/midicontrols.py:163
+#: python/midicontrols.py:164
msgid "Focused player"
msgstr ""
-#: python/midicontrols.py:164
+#: python/midicontrols.py:165
msgid "Fadered player"
msgstr ""
-#: python/midicontrols.py:168
+#: python/midicontrols.py:169
msgid "Effects bank 1"
msgstr ""
-#: python/midicontrols.py:169
+#: python/midicontrols.py:170
msgid "Effects bank 2"
msgstr ""
-#: python/midicontrols.py:170
+#: python/midicontrols.py:171
msgid "All effects"
msgstr ""
#. TC: The name of the backspace key.
-#: python/midicontrols.py:404
+#: python/midicontrols.py:405
msgid "BackSpace"
msgstr ""
#. TC: binding editor, action pane, third row, heading text.
-#: python/midicontrols.py:1468
+#: python/midicontrols.py:1469
msgid "Use value"
msgstr ""
#. TC: binding editor, action pane, third row, heading text.
-#: python/midicontrols.py:1470
+#: python/midicontrols.py:1471
msgid "Act if"
msgstr ""
#. TC: binding editor, action pane, third row, heading text.
-#: python/midicontrols.py:1472
+#: python/midicontrols.py:1473
msgid "Set to"
msgstr ""
#. TC: binding editor, action pane, third row, heading text.
-#: python/midicontrols.py:1474
+#: python/midicontrols.py:1475
msgid "Adjust by"
msgstr ""
#. TC: binding editor, input pane, fourth row, heading text.
-#: python/midicontrols.py:1479 python/midicontrols.py:1483
+#: python/midicontrols.py:1480 python/midicontrols.py:1484
msgid "Control"
msgstr ""
#. TC: binding editor, input pane, fourth row, heading text.
-#: python/midicontrols.py:1481
+#: python/midicontrols.py:1482
msgid "Note"
msgstr ""
#. TC: binding editor, input pane, fourth row, heading text.
-#: python/midicontrols.py:1485
+#: python/midicontrols.py:1486
msgid "Key"
msgstr ""
#. TC: binding editor, action pane, first row, toplevel menu.
-#: python/midicontrols.py:1490
+#: python/midicontrols.py:1491
msgid "Miscellaneous"
msgstr ""
#. TC: binding editor, action pane, first row, toplevel menu.
-#: python/midicontrols.py:1494
+#: python/midicontrols.py:1495
msgid "Both players"
msgstr ""
#. TC: binding editor, action pane, first row, toplevel menu.
-#: python/midicontrols.py:1496
+#: python/midicontrols.py:1497
msgid "Quick panning"
msgstr ""
#. TC: binding editor, action pane, first row, toplevel menu.
-#: python/midicontrols.py:1500
+#: python/midicontrols.py:1501
msgid "VoIP channel"
msgstr ""
#. TC: binding editor, action pane, first row, toplevel menu.
-#: python/midicontrols.py:1502
+#: python/midicontrols.py:1503
msgid "Single effect"
msgstr ""
#. TC: binding editor, action pane, first row, toplevel menu.
-#: python/midicontrols.py:1504
+#: python/midicontrols.py:1505
msgid "Effects bank"
msgstr ""
#. TC: binding editor, action pane, first row, toplevel menu.
-#: python/midicontrols.py:1508
+#: python/midicontrols.py:1509
msgid "Stream recorder"
msgstr ""
#. TC: binding editor, action pane, second row, dropdown text.
-#: python/midicontrols.py:1513
+#: python/midicontrols.py:1514
msgid "Direct fader/held button"
msgstr ""
#. TC: binding editor, action pane, second row, dropdown text.
-#: python/midicontrols.py:1515
+#: python/midicontrols.py:1516
msgid "One-shot/toggle button"
msgstr ""
#. TC: binding editor, action pane, second row, dropdown text.
-#: python/midicontrols.py:1517
+#: python/midicontrols.py:1518
msgid "Set value"
msgstr ""
#. TC: binding editor, action pane, second row, dropdown text.
-#: python/midicontrols.py:1519
+#: python/midicontrols.py:1520
msgid "Alter value"
msgstr ""
#. TC: binding editor, input pane, second row, dropdown text.
-#: python/midicontrols.py:1524
+#: python/midicontrols.py:1525
msgid "MIDI control"
msgstr ""
#. TC: binding editor, input pane, second row, dropdown text.
-#: python/midicontrols.py:1526
+#: python/midicontrols.py:1527
msgid "MIDI note"
msgstr ""
#. TC: binding editor, input pane, second row, dropdown text.
-#: python/midicontrols.py:1528
+#: python/midicontrols.py:1529
msgid "MIDI pitch-wheel"
msgstr ""
#. TC: binding editor, input pane, second row, dropdown text.
-#: python/midicontrols.py:1530
+#: python/midicontrols.py:1531
msgid "Keyboard press"
msgstr ""
#. TC: binding editor, input pane, second row, dropdown text.
-#: python/midicontrols.py:1532
+#: python/midicontrols.py:1533
msgid "XChat command"
msgstr ""
#. TC: Dialog window title text.
#. TC: User is expected to edit a control binding.
-#: python/midicontrols.py:1541
+#: python/midicontrols.py:1542
msgid "Edit control binding"
msgstr ""
#. TC: After clicking this button the binding editor will be listening
#. TC: for a key press or midi control surface input.
#. TC: Button text. If pressed triggers 'Listening for input' mode.
-#: python/midicontrols.py:1556 python/midicontrols.py:1637
-#: python/midicontrols.py:1736
+#: python/midicontrols.py:1557 python/midicontrols.py:1638
+#: python/midicontrols.py:1737
msgid "Listen for input..."
msgstr ""
#. TC: The input source.
-#: python/midicontrols.py:1564
+#: python/midicontrols.py:1565
msgid "Source"
msgstr ""
#. TC: The manner in which the input is interpreted.
-#: python/midicontrols.py:1583
+#: python/midicontrols.py:1584
msgid "Interaction"
msgstr ""
#. TC: The effect of the control can be directed upon a specific target.
#. TC: e.g. On target [Left player]
-#: python/midicontrols.py:1589
+#: python/midicontrols.py:1590
msgid "On target"
msgstr ""
#. TC: Checkbutton text.
#. TC: Use reverse scale and invert the meaning of button presses.
-#: python/midicontrols.py:1597
+#: python/midicontrols.py:1598
msgid "Reversed"
msgstr ""
-#: python/midicontrols.py:1598
+#: python/midicontrols.py:1599
msgid "Pressed"
msgstr ""
-#: python/midicontrols.py:1600
+#: python/midicontrols.py:1601
msgid "Released"
msgstr ""
#. TC: Tree column heading for Inputs e.g. Backspace, F1, S.
-#: python/midicontrols.py:1630 python/midicontrols.py:1991
+#: python/midicontrols.py:1631 python/midicontrols.py:1992
msgid "Input"
msgstr ""
-#: python/midicontrols.py:1634
+#: python/midicontrols.py:1635
#, python-format
msgid ""
"The first half of a binding is the input which comes in the form of the "
@@ -1853,31 +1880,31 @@ msgid ""
msgstr ""
#. TC: Tree column heading for actions e.g. Player stop.
-#: python/midicontrols.py:1670 python/midicontrols.py:1676
-#: python/midicontrols.py:2005
+#: python/midicontrols.py:1671 python/midicontrols.py:1677
+#: python/midicontrols.py:2006
msgid "Action"
msgstr ""
#. TC: %s is the translation of 'Action'.
-#: python/midicontrols.py:1675
+#: python/midicontrols.py:1676
#, python-format
msgid "The '%s' pane determines how the input is handled, and to what effect."
msgstr ""
-#: python/midicontrols.py:1732
+#: python/midicontrols.py:1733
msgid "Listening for input"
msgstr ""
#. TC: Refers to key modifiers including Ctrl, Alt, Shift, ....
-#: python/midicontrols.py:1753
+#: python/midicontrols.py:1754
msgid "Shifting"
msgstr ""
-#: python/midicontrols.py:1952
+#: python/midicontrols.py:1953
msgid "Singular control"
msgstr ""
-#: python/midicontrols.py:2014
+#: python/midicontrols.py:2015
msgid "Target"
msgstr ""
@@ -1923,7 +1950,7 @@ msgid " Additional Text Frames "
msgstr ""
#. TC: The album track number.
-#: python/mutagentagger.py:376 python/songdb.py:789 python/songdb.py:1160
+#: python/mutagentagger.py:376 python/songdb.py:906 python/songdb.py:1295
msgid "Track"
msgstr ""
@@ -1949,217 +1976,250 @@ msgstr ""
msgid "Native"
msgstr ""
-#: python/songdb.py:174
+#: python/songdb.py:177
msgid "Connecting"
msgstr ""
-#: python/songdb.py:183
+#: python/songdb.py:188
#, python-format
msgid "Connection failed (try %d)"
msgstr ""
-#: python/songdb.py:195
-msgid "Connected: utf-8 mode failed"
+#: python/songdb.py:199
+msgid "Connected: autocommit mode failed"
msgstr ""
-#: python/songdb.py:197
+#: python/songdb.py:201
+msgid "Connected: autocommit mode set"
+msgstr ""
+
+#: python/songdb.py:202
msgid "Connected"
msgstr ""
-#: python/songdb.py:205
+#: python/songdb.py:210
msgid "Job dropped"
msgstr ""
-#: python/songdb.py:215 python/songdb.py:427
+#: python/songdb.py:220 python/songdb.py:431
msgid "Disconnected"
msgstr ""
-#: python/songdb.py:229
+#: python/songdb.py:233
msgid "Problem dropping connection"
msgstr ""
-#: python/songdb.py:231
+#: python/songdb.py:235
msgid "Connection dropped"
msgstr ""
-#: python/songdb.py:322
+#: python/songdb.py:326
msgid "Hostname[:Port]"
msgstr ""
-#: python/songdb.py:327
+#: python/songdb.py:331
msgid "User Name"
msgstr ""
-#: python/songdb.py:330
+#: python/songdb.py:334
msgid "Database"
msgstr ""
-#: python/songdb.py:385
+#: python/songdb.py:389
msgid "Prokyon3 or Ampache (song title) Database"
msgstr ""
-#: python/songdb.py:386
+#: python/songdb.py:390
msgid ""
"You can make certain media databases accessible in IDJC for easy drag and "
"drop into the playlists."
msgstr ""
-#: python/songdb.py:434
+#: python/songdb.py:438
msgid "Module mysql-python (MySQLdb) required"
msgstr ""
-#: python/songdb.py:675 python/songdb.py:680
+#: python/songdb.py:707 python/songdb.py:723 python/songdb.py:747
+#: python/songdb.py:805
msgid "<unknown>"
msgstr ""
-#: python/songdb.py:761
+#: python/songdb.py:741
+msgid "Not Played"
+msgstr ""
+
+#: python/songdb.py:878
msgid "Reload the database."
msgstr ""
-#: python/songdb.py:766
+#: python/songdb.py:883
msgid "Expand entire tree."
msgstr ""
-#: python/songdb.py:767
+#: python/songdb.py:884
msgid "Collapse tree."
msgstr ""
-#: python/songdb.py:774
+#: python/songdb.py:891
msgid "Browse"
msgstr ""
#. TC: The disk number of the album track.
-#: python/songdb.py:787 python/songdb.py:1159
+#: python/songdb.py:904 python/songdb.py:1294
msgid "Disk"
msgstr ""
#. TC: Track playback time.
#. TC: Playback time.
-#: python/songdb.py:791 python/songdb.py:1162 python/playergui.py:312
+#: python/songdb.py:908 python/songdb.py:1296 python/playergui.py:313
msgid "Duration"
msgstr ""
-#: python/songdb.py:792 python/songdb.py:1163
+#: python/songdb.py:910 python/songdb.py:1297 python/format.py:594
+#: python/format.py:615 python/format.py:701 python/format.py:722
+#: python/format.py:857 python/format.py:962 python/format.py:1012
+#: python/format.py:1022
msgid "Bitrate"
msgstr ""
-#: python/songdb.py:793 python/songdb.py:1164
+#: python/songdb.py:911 python/songdb.py:1298
msgid "Filename"
msgstr ""
#. TC: Directory path to a file.
-#: python/songdb.py:795 python/songdb.py:1165
+#: python/songdb.py:913 python/songdb.py:1299
msgid "Path"
msgstr ""
-#: python/songdb.py:800
+#: python/songdb.py:918
msgid "Artist - Album - Title"
msgstr ""
-#: python/songdb.py:801
+#: python/songdb.py:919
msgid "Album - [Disk] - Title"
msgstr ""
-#: python/songdb.py:821
+#: python/songdb.py:939
msgid "Fetching"
msgstr ""
-#: python/songdb.py:953
+#: python/songdb.py:1084
msgid "Tree fetch failed"
msgstr ""
-#: python/songdb.py:955
+#: python/songdb.py:1085
msgid "Fetch Failed!"
msgstr ""
-#: python/songdb.py:968
+#: python/songdb.py:1098
msgid "Populating"
msgstr ""
-#: python/songdb.py:1094
+#: python/songdb.py:1224
#, python-format
msgid "Disk %d"
msgstr ""
#. TC: User specified search filter entry box title text.
-#: python/songdb.py:1113
+#: python/songdb.py:1243
msgid "Filters"
msgstr ""
#. TC: A type of search on any data field matching paritial strings.
-#: python/songdb.py:1125
+#: python/songdb.py:1255
msgid "Fuzzy Search"
msgstr ""
#. TC: WHERE is an SQL keyword.
-#: python/songdb.py:1134
+#: python/songdb.py:1264
msgid "WHERE"
msgstr ""
-#: python/songdb.py:1147
+#: python/songdb.py:1277
msgid "Search"
msgstr ""
-#: python/songdb.py:1440
+#: python/songdb.py:1514 python/songdb.py:1639
+msgid "Minutes"
+msgstr ""
+
+#: python/songdb.py:1514 python/songdb.py:1639
+msgid "Hours"
+msgstr ""
+
+#: python/songdb.py:1515 python/songdb.py:1639
+msgid "Days"
+msgstr ""
+
+#: python/songdb.py:1515 python/songdb.py:1639 python/songdb.py:1709
+#: python/songdb.py:1803
+msgid "Weeks"
+msgstr ""
+
+#: python/songdb.py:1609
msgid "Catalogs"
msgstr ""
-#: python/songdb.py:1445
+#: python/songdb.py:1616
msgid "Name"
msgstr ""
-#: python/songdb.py:1446
+#: python/songdb.py:1617
msgid "Catalog Path"
msgstr ""
-#: python/songdb.py:1447
+#: python/songdb.py:1618
msgid "Prepend Path"
msgstr ""
-#: python/songdb.py:1462
+#: python/songdb.py:1626
+msgid "Last Played Scale"
+msgstr ""
+
+#: python/songdb.py:1658
msgid "Path Peel"
msgstr ""
-#: python/songdb.py:1528
+#: python/songdb.py:1737
msgid "N/A"
msgstr ""
-#: python/songdb.py:1703
+#: python/songdb.py:1918
msgid "Failed to create FULLTEXT index"
msgstr ""
-#: python/songdb.py:1707
+#: python/songdb.py:1922
msgid "Found existing FULLTEXT index"
msgstr ""
-#: python/songdb.py:1721 python/songdb.py:1734
+#: python/songdb.py:1936 python/songdb.py:1949
msgid "Unrecognised database"
msgstr ""
-#: python/songdb.py:1729
+#: python/songdb.py:1944
msgid "Found Prokyon 3 schema"
msgstr ""
-#: python/playergui.py:235
+#: python/playergui.py:236
msgid "Cuesheet Playlist"
msgstr ""
#. TC: Column heading, the track number.
-#: python/playergui.py:301
+#: python/playergui.py:302
msgid "Trk"
msgstr ""
#. TC: Column heading, the index number.
-#: python/playergui.py:304
+#: python/playergui.py:305
msgid "Ind"
msgstr ""
-#: python/playergui.py:413
+#: python/playergui.py:414
msgid "External Playlist"
msgstr ""
#. TC: Button text to activate an external playlist.
-#: python/playergui.py:424
+#: python/playergui.py:425
msgid "Active"
msgstr ""
@@ -2187,263 +2247,271 @@ msgstr ""
msgid "Modify or Delete this announcement"
msgstr ""
-#. TC: Playlist control.
#. TC: Embed a DJ announcement text into the playlist.
-#: python/playergui.py:528 python/playergui.py:3709 python/playergui.py:4347
+#: python/playergui.py:528 python/playergui.py:4430
msgid "Announcement"
msgstr ""
#. TC: The time format as minutes and seconds.
-#: python/playergui.py:555
+#: python/playergui.py:556
msgid "mm:ss"
msgstr ""
#. TC: Alongside the name of the next track.
-#: python/playergui.py:608
+#: python/playergui.py:609
msgid "Next track"
msgstr ""
-#: python/playergui.py:933
+#: python/playergui.py:934
msgid "By Extension"
msgstr ""
-#: python/playergui.py:933
+#: python/playergui.py:934
msgid "M3U playlist"
msgstr ""
#: python/playergui.py:934
+msgid "M3U8 playlist"
+msgstr ""
+
+#: python/playergui.py:935
msgid "XSPF playlist"
msgstr ""
-#: python/playergui.py:934
+#: python/playergui.py:935
msgid "PLS playlist"
msgstr ""
-#: python/playergui.py:1006
+#: python/playergui.py:1007
#, python-format
msgid "%d Audio Tracks"
msgstr ""
#. TC: Missing metadata text.
-#: python/playergui.py:1016
+#: python/playergui.py:1017
msgid "Unknown"
msgstr ""
-#: python/playergui.py:1020
+#: python/playergui.py:1021
msgid "(Cue sheet)"
msgstr ""
-#: python/playergui.py:1054
+#: python/playergui.py:1058
msgid "Bad Tag"
msgstr ""
-#: python/playergui.py:1830 python/playergui.py:4185
+#: python/playergui.py:1888 python/playergui.py:4268
msgid "Manual"
msgstr ""
-#: python/playergui.py:1834 python/playergui.py:4182
+#: python/playergui.py:1892 python/playergui.py:4265
msgid "Play All"
msgstr ""
-#: python/playergui.py:1842 python/playergui.py:1851 python/playergui.py:4183
+#: python/playergui.py:1900 python/playergui.py:1909 python/playergui.py:4266
msgid "Loop All"
msgstr ""
-#: python/playergui.py:1842 python/playergui.py:4186
+#: python/playergui.py:1900 python/playergui.py:4269
msgid "Cue Up"
msgstr ""
-#: python/playergui.py:1843 python/playergui.py:4190
+#: python/playergui.py:1901 python/playergui.py:4273
msgid "Fade Over"
msgstr ""
-#: python/playergui.py:1855 python/playergui.py:1926 python/playergui.py:4184
+#: python/playergui.py:1913 python/playergui.py:1984 python/playergui.py:4267
msgid "Random"
msgstr ""
-#: python/playergui.py:1895 python/playergui.py:4187
+#: python/playergui.py:1953 python/playergui.py:4270
msgid "External"
msgstr ""
-#: python/playergui.py:1907 python/playergui.py:1923 python/playergui.py:4189
+#: python/playergui.py:1965 python/playergui.py:1981 python/playergui.py:4272
msgid "Alternate"
msgstr ""
-#: python/playergui.py:1907 python/playergui.py:1925 python/playergui.py:4191
+#: python/playergui.py:1965 python/playergui.py:1983 python/playergui.py:4274
msgid "Random Hop"
msgstr ""
#. TC: The remaining playlist time.
-#: python/playergui.py:2080 python/playergui.py:2086
+#: python/playergui.py:2138 python/playergui.py:2144
msgid "Remaining"
msgstr ""
#. TC: The estimated finish time of the playlist.
#. TC: The estimated finish time of the playlist (ETA).
-#: python/playergui.py:2082 python/playergui.py:2086 python/playergui.py:2100
+#: python/playergui.py:2140 python/playergui.py:2144 python/playergui.py:2158
msgid "Finish"
msgstr ""
#. TC: The play duration of the block of audio tracks.
-#: python/playergui.py:2087 python/playergui.py:2098
+#: python/playergui.py:2145 python/playergui.py:2156
msgid "Block size"
msgstr ""
#. TC: File dialog title text.
-#: python/playergui.py:2485
+#: python/playergui.py:2546
msgid "Add music to left playlist"
msgstr ""
#. TC: File dialog title text.
-#: python/playergui.py:2488
+#: python/playergui.py:2549
msgid "Add music to right playlist"
msgstr ""
-#: python/playergui.py:2490
+#: python/playergui.py:2551
msgid "Add background music"
msgstr ""
#. TC: File filter text.
-#: python/playergui.py:2502
+#: python/playergui.py:2563
msgid "Supported Media Formats"
msgstr ""
#. TC: Expander text "Select File Type (.pls)" for the pls file type.
-#: python/playergui.py:2564
+#: python/playergui.py:2625
msgid "Select File Type"
msgstr ""
-#: python/playergui.py:3308
+#: python/playergui.py:3383
msgid "Save left playlist"
msgstr ""
-#: python/playergui.py:3310
+#: python/playergui.py:3385
msgid "Save right playlist"
msgstr ""
-#: python/playergui.py:3312
+#: python/playergui.py:3387
msgid "Save background playlist"
msgstr ""
-#: python/playergui.py:3330
+#: python/playergui.py:3405
msgid "File Type"
msgstr ""
-#: python/playergui.py:3335
+#: python/playergui.py:3410
msgid "Extension"
msgstr ""
#. TC: Playlist control.
#. TC: Insert playlist control to do a ten second fade to the next track.
-#: python/playergui.py:3693 python/playergui.py:4358
+#: python/playergui.py:3774 python/playergui.py:4441
msgid "Fade 10s"
msgstr ""
#. TC: Playlist control.
#. TC: Insert playlist control to do a five second fade to the next track.
-#: python/playergui.py:3699 python/playergui.py:4365
+#: python/playergui.py:3780 python/playergui.py:4448
msgid "Fade 5s"
msgstr ""
#. TC: Playlist control.
#. TC: Insert playlist control to not do a fade to the next track.
-#: python/playergui.py:3704 python/playergui.py:4372
+#: python/playergui.py:3785 python/playergui.py:4455
msgid "No Fade"
msgstr ""
#. TC: Playlist control.
-#: python/playergui.py:3714
+#: python/playergui.py:3793
msgid ">> Normal Speed <<"
msgstr ""
#. TC: Playlist control.
-#: python/playergui.py:3724
+#: python/playergui.py:3803
msgid "Player stop 2"
msgstr ""
#. TC: Playlist control.
#. TC: Insert playlist control to jump to the top of the playlist.
-#: python/playergui.py:3729 python/playergui.py:4324
+#: python/playergui.py:3808 python/playergui.py:4407
msgid "Jump To Top"
msgstr ""
#. TC: Playlist control.
-#: python/playergui.py:3734 python/playergui.py:4384
+#: python/playergui.py:3813 python/playergui.py:4467
msgid "Stop streaming"
msgstr ""
#. TC: Playlist control.
-#: python/playergui.py:3739 python/playergui.py:4392
+#: python/playergui.py:3818 python/playergui.py:4475
msgid "Stop recording"
msgstr ""
+#: python/playergui.py:3851
+msgid "Announcement:"
+msgstr ""
+
#. TC: Playlist control.
-#: python/playergui.py:3774
+#: python/playergui.py:3857
msgid ">>> Transfer across >>>"
msgstr ""
#. TC: Playlist control.
-#: python/playergui.py:3777
+#: python/playergui.py:3860
msgid "<<< Transfer across <<<"
msgstr ""
#. TC: Playlist control.
-#: python/playergui.py:3782
+#: python/playergui.py:3865
msgid ">>> Fade across >>>"
msgstr ""
#. TC: Playlist control.
-#: python/playergui.py:3785
+#: python/playergui.py:3868
msgid "<<< Fade across <<<"
msgstr ""
#. TC: Playlist control.
-#: python/playergui.py:3791
+#: python/playergui.py:3874
msgid "Ignored playlist control"
msgstr ""
-#: python/playergui.py:3859
+#: python/playergui.py:3942
+#, python-brace-format
msgid "Playing track {0} of {1}"
msgstr ""
#. TC: Previous line: Playing track {0} of {1}
-#: python/playergui.py:3872
+#: python/playergui.py:3955
#, python-format
msgid "From the album, %s"
msgstr ""
-#: python/playergui.py:3879
+#: python/playergui.py:3962
#, python-format
msgid "Total number of tracks %d"
msgstr ""
-#: python/playergui.py:3883 python/playergui.py:3885
+#: python/playergui.py:3966 python/playergui.py:3968
#, python-format
msgid "Total play duration %s"
msgstr ""
-#: python/playergui.py:3935
+#: python/playergui.py:4018
msgid ""
"Left click toggles between showing the amount of time elapsed or remaining "
"on the current track being played."
msgstr ""
-#: python/playergui.py:3953
+#: python/playergui.py:4036
msgid ""
"This slider acts as both a play progress indicator and as a means for "
"seeking within the currently playing track."
msgstr ""
#. TC: File filter text.
-#: python/playergui.py:4042
+#: python/playergui.py:4125
msgid "All file types"
msgstr ""
-#: python/playergui.py:4047
-msgid "Playlist types (*.m3u, *.xspf, *.pls)"
+#: python/playergui.py:4130
+msgid "Playlist types"
msgstr ""
-#: python/playergui.py:4062
+#: python/playergui.py:4145
msgid ""
"'Block size' indicates the amount of time that it will take to play from the "
"currently selected track to the next stop.\n"
@@ -2451,43 +2519,43 @@ msgid ""
"'Finish' Is the computed time when the tracks will have finished playing."
msgstr ""
-#: python/playergui.py:4085
+#: python/playergui.py:4168
msgid "This adjusts the playback speed anywhere from 25% to 400%."
msgstr ""
-#: python/playergui.py:4099
+#: python/playergui.py:4182
msgid "This sets the playback speed back to normal."
msgstr ""
-#: python/playergui.py:4116
+#: python/playergui.py:4199
msgid "Previous track."
msgstr ""
-#: python/playergui.py:4128
+#: python/playergui.py:4211
msgid "Play."
msgstr ""
-#: python/playergui.py:4138
+#: python/playergui.py:4221
msgid "Pause."
msgstr ""
-#: python/playergui.py:4148
+#: python/playergui.py:4231
msgid "Stop."
msgstr ""
-#: python/playergui.py:4158
+#: python/playergui.py:4241
msgid "Next track."
msgstr ""
-#: python/playergui.py:4170
+#: python/playergui.py:4253
msgid "Add tracks to the playlist."
msgstr ""
-#: python/playergui.py:4177 python/preferences.py:70
+#: python/playergui.py:4260 python/preferences.py:71
msgid "Playlist Mode"
msgstr ""
-#: python/playergui.py:4196
+#: python/playergui.py:4279
msgid ""
"This sets the playlist mode which defines player behaviour after a track has "
"finished playing.\n"
@@ -2521,31 +2589,31 @@ msgid ""
msgstr ""
#. TC: Fade time heading.
-#: python/playergui.py:4220 python/preferences.py:71
+#: python/playergui.py:4303 python/preferences.py:72
msgid "Fade"
msgstr ""
-#: python/playergui.py:4232
+#: python/playergui.py:4315
msgid "This controls the amount of fade between tracks."
msgstr ""
-#: python/playergui.py:4239
+#: python/playergui.py:4322
msgid "Audio Feed"
msgstr ""
-#: python/playergui.py:4249
+#: python/playergui.py:4332
msgid "Make output from this player available for streaming."
msgstr ""
-#: python/playergui.py:4257
+#: python/playergui.py:4340
msgid "Make output from this player audible to the DJ."
msgstr ""
-#: python/playergui.py:4259
+#: python/playergui.py:4342
msgid "Force"
msgstr ""
-#: python/playergui.py:4265
+#: python/playergui.py:4348
msgid ""
"When selected this player will be treated like a main player.\n"
"It will be affected by microphone ducking and won't mute when a main player "
@@ -2553,142 +2621,142 @@ msgid ""
msgstr ""
#. TC: Insert playlist control.
-#: python/playergui.py:4278
+#: python/playergui.py:4361
msgid "Insert control"
msgstr ""
#. TC: The Item submenu.
-#: python/playergui.py:4287
+#: python/playergui.py:4370
msgid "Item"
msgstr ""
#. TC: The Playlist submenu.
-#: python/playergui.py:4292
+#: python/playergui.py:4375
msgid "Playlist"
msgstr ""
#. TC: Insert playlist control to set playback speed to normal.
-#: python/playergui.py:4303
+#: python/playergui.py:4386
msgid "Normal Speed"
msgstr ""
#. TC: Submenu Item. Parent menu is Playlist.
-#: python/playergui.py:4332 python/playergui.py:4486
+#: python/playergui.py:4415 python/playergui.py:4569
msgid "Transfer"
msgstr ""
-#: python/playergui.py:4340
+#: python/playergui.py:4423
msgid "Crossfade"
msgstr ""
#. TC: Menu item. Opens the metadata tagger on the selected track.
-#: python/playergui.py:4405
+#: python/playergui.py:4488
msgid "Meta Tag"
msgstr ""
#. TC: Menu Item. Duplicates the selected track in the playlist.
-#: python/playergui.py:4411
+#: python/playergui.py:4494
msgid "Duplicate"
msgstr ""
#. TC: Menu Item. Remove the selected track.
-#: python/playergui.py:4418
+#: python/playergui.py:4501
msgid "Remove"
msgstr ""
#. TC: Submenu Item. Parent menu item is Remove.
-#: python/playergui.py:4429
+#: python/playergui.py:4512
msgid "This"
msgstr ""
#. TC: Submenu Item. Parent menu item is Remove.
-#: python/playergui.py:4436 python/preferences.py:1234
+#: python/playergui.py:4519 python/preferences.py:1237
msgid "All"
msgstr ""
#. TC: Submenu Item. Parent menu item is Remove.
-#: python/playergui.py:4443
+#: python/playergui.py:4526
msgid "From Here"
msgstr ""
#. TC: Submenu Item. Parent menu item is Remove.
-#: python/playergui.py:4450
+#: python/playergui.py:4533
msgid "To Here"
msgstr ""
#. TC: Open the file dialog for adding music to the chosen playlist.
-#: python/playergui.py:4463
+#: python/playergui.py:4546
msgid "Add Music"
msgstr ""
#. TC: Submenu Item. Parent menu is Playlist.
-#: python/playergui.py:4470
+#: python/playergui.py:4553
msgid "Save"
msgstr ""
#. TC: Submenu Item. Parent menu is Playlist.
-#: python/playergui.py:4481
+#: python/playergui.py:4564
msgid "Copy"
msgstr ""
-#: python/playergui.py:4492
+#: python/playergui.py:4575
msgid "Exchange"
msgstr ""
#. TC: Submenu Item. Parent menu is Playlist.
-#: python/playergui.py:4499
+#: python/playergui.py:4582
msgid "Empty"
msgstr ""
#. TC: Submenu Item. Parent menus are Playlist->Copy.
#. TC: Submenu Item. Parent menus are Playlist->Transfer.
-#: python/playergui.py:4513 python/playergui.py:4552
+#: python/playergui.py:4596 python/playergui.py:4635
msgid "Append"
msgstr ""
#. TC: Submenu Item. Parent menus are Playlist->Copy.
#. TC: Submenu Item. Parent menus are Playlist->Transfer.
-#: python/playergui.py:4520 python/playergui.py:4559
+#: python/playergui.py:4603 python/playergui.py:4642
msgid "Prepend"
msgstr ""
#. TC: Submenu Item. Parent menus are Playlist->Copy.
-#: python/playergui.py:4531
+#: python/playergui.py:4614
msgid "Append Cursor"
msgstr ""
#. TC: Submenu Item. Parent menus are Playlist->Copy.
-#: python/playergui.py:4538
+#: python/playergui.py:4621
msgid "Prepend Cursor"
msgstr ""
#. TC: Submenu Item. Parent menus are Playlist->Transfer.
-#: python/playergui.py:4570
+#: python/playergui.py:4653
msgid "Append at Cursor"
msgstr ""
#. TC: Submenu Item. Parent menus are Playlist->Transfer.
-#: python/playergui.py:4577
+#: python/playergui.py:4660
msgid "Prepend at Cursor"
msgstr ""
-#: python/preferences.py:84
+#: python/preferences.py:85
msgid "Track time elapsed"
msgstr ""
-#: python/preferences.py:86
+#: python/preferences.py:87
msgid "Track time remaining"
msgstr ""
-#: python/preferences.py:88
+#: python/preferences.py:89
msgid "Audio to stream"
msgstr ""
-#: python/preferences.py:89
+#: python/preferences.py:90
msgid "Audio to DJ"
msgstr ""
-#: python/preferences.py:126
+#: python/preferences.py:127
#, python-format
msgid ""
"Stereo panning is the selection of where an audio source sits from left to "
@@ -2704,11 +2772,11 @@ msgid ""
"stereo field is the intention."
msgstr ""
-#: python/preferences.py:157
+#: python/preferences.py:158
msgid "Presets"
msgstr ""
-#: python/preferences.py:248
+#: python/preferences.py:249
msgid ""
"The pan preset selection buttons.\n"
"\n"
@@ -2719,124 +2787,124 @@ msgid ""
msgstr ""
#. TC: Microphone mode combobox text.
-#: python/preferences.py:273
+#: python/preferences.py:274
msgid "Deactivated"
msgstr ""
#. TC: Microphone mode combobox text.
-#: python/preferences.py:275
+#: python/preferences.py:276
msgid "Basic input"
msgstr ""
#. TC: Microphone mode combobox text.
-#: python/preferences.py:277
+#: python/preferences.py:278
msgid "Processed input"
msgstr ""
#. TC: Microphone mode combobox text.
-#: python/preferences.py:279
+#: python/preferences.py:280
#, python-format
msgid "Partnered with channel %s"
msgstr ""
-#: python/preferences.py:429
+#: python/preferences.py:432
msgid "A label so you may describe briefly the role of this audio channel."
msgstr ""
-#: python/preferences.py:461
+#: python/preferences.py:464
msgid "The signal processing mode."
msgstr ""
#. TC: A frame heading. The channel opener is selected within.
-#: python/preferences.py:465
+#: python/preferences.py:468
msgid "Channel Opener"
msgstr ""
-#: python/preferences.py:468
+#: python/preferences.py:471
msgid ""
"This controls the allocation of front panel open/unmute buttons. Having one "
"button control multiple microphones can save time."
msgstr ""
#. TC: Spinbutton label text.
-#: python/preferences.py:475
+#: python/preferences.py:478
msgid "Main Panel Button"
msgstr ""
-#: python/preferences.py:492
+#: python/preferences.py:495
msgid "This:"
msgstr ""
-#: python/preferences.py:501
+#: python/preferences.py:504
msgid "Open"
msgstr ""
-#: python/preferences.py:514
+#: python/preferences.py:517
msgid "Stereo Panning"
msgstr ""
#. TC: A set of controls that perform audio signal matching.
-#: python/preferences.py:527
+#: python/preferences.py:530
msgid "Signal Matching"
msgstr ""
-#: python/preferences.py:528
+#: python/preferences.py:531
msgid ""
"These controls are provided to obtain a decent match between the two "
"microphones."
msgstr ""
-#: python/preferences.py:537
+#: python/preferences.py:540
msgid "Relative Gain (dB)"
msgstr ""
#. TC: Mic audio phase inversion control.
-#: python/preferences.py:542 python/preferences.py:547
+#: python/preferences.py:545 python/preferences.py:550
msgid "Invert Signal"
msgstr ""
-#: python/preferences.py:548 python/preferences.py:568
-#: python/preferences.py:664
+#: python/preferences.py:551 python/preferences.py:571
+#: python/preferences.py:667
msgid ""
"Useful for when microphones are cancelling one another out, producing a "
"hollow sound."
msgstr ""
#. TC: Control whether to mix microphone audio to the DJ mix.
-#: python/preferences.py:551
+#: python/preferences.py:554
msgid "In The DJ's Mix"
msgstr ""
-#: python/preferences.py:552 python/preferences.py:574
-#: python/preferences.py:674
+#: python/preferences.py:555 python/preferences.py:577
+#: python/preferences.py:677
msgid ""
"Make the microphone audio audible in the DJ mix. This may not always be "
"desirable."
msgstr ""
-#: python/preferences.py:560
+#: python/preferences.py:563
msgid "Basic Controls"
msgstr ""
-#: python/preferences.py:561 python/preferences.py:616
+#: python/preferences.py:564 python/preferences.py:619
msgid "Boost/Cut (dB)"
msgstr ""
-#: python/preferences.py:582
+#: python/preferences.py:585
msgid "High Pass Filter"
msgstr ""
-#: python/preferences.py:583 python/preferences.py:598
-#: python/preferences.py:608
+#: python/preferences.py:586 python/preferences.py:601
+#: python/preferences.py:611
msgid "Cutoff Frequency"
msgstr ""
#. TC: User can set the number of filter stages.
-#: python/preferences.py:587
+#: python/preferences.py:590
msgid "Stages"
msgstr ""
-#: python/preferences.py:590
+#: python/preferences.py:593
msgid ""
"Frequency in Hertz above which audio can pass to later stages. Use this "
"feature to restrict low frequency sounds such as mains hum. Setting too high "
@@ -2844,136 +2912,136 @@ msgid ""
msgstr ""
#. TC: this is the treble control. HF = high frequency.
-#: python/preferences.py:595
+#: python/preferences.py:598
msgid "HF Detail"
msgstr ""
-#: python/preferences.py:602
+#: python/preferences.py:605
msgid "You can use this to boost the amount of treble in the audio."
msgstr ""
#. TC: this is the bass control. LF = low frequency.
-#: python/preferences.py:605
+#: python/preferences.py:608
msgid "LF Detail"
msgstr ""
-#: python/preferences.py:612
+#: python/preferences.py:615
msgid "You can use this to boost the amount of bass in the audio."
msgstr ""
#. TC: lookahead brick wall limiter.
-#: python/preferences.py:615
+#: python/preferences.py:618
msgid "Limiter"
msgstr ""
#. TC: this is the peak signal limit.
-#: python/preferences.py:620
+#: python/preferences.py:623
msgid "Upper Limit"
msgstr ""
-#: python/preferences.py:622
+#: python/preferences.py:625
msgid ""
"A look-ahead brick-wall limiter. Audio signals are capped at the upper limit."
msgstr ""
-#: python/preferences.py:625
+#: python/preferences.py:628
msgid "Noise Gate"
msgstr ""
#. TC: noise gate triggers at this level.
-#: python/preferences.py:627
+#: python/preferences.py:630
msgid "Threshold"
msgstr ""
#. TC: negative gain when the noise gate is active.
#. TC: The de-esser attenuation in ess-detected state.
-#: python/preferences.py:631 python/preferences.py:641
+#: python/preferences.py:634 python/preferences.py:644
msgid "Gain"
msgstr ""
-#: python/preferences.py:633
+#: python/preferences.py:636
msgid ""
"Reduce the unwanted quietest sounds and background noise which you don't "
"want your listeners to hear with this."
msgstr ""
-#: python/preferences.py:636
+#: python/preferences.py:639
msgid "De-esser"
msgstr ""
#. TC: Bias has a numeric setting.
-#: python/preferences.py:638
+#: python/preferences.py:641
msgid "Bias"
msgstr ""
-#: python/preferences.py:643
+#: python/preferences.py:646
msgid ""
"Reduce the S, T, and P sounds which microphones tend to exaggerate. Ideally "
"the Bias control will be set low so that the de-esser is off when there is "
"silence but is set high enough that mouse clicks are detected and suppressed."
msgstr ""
-#: python/preferences.py:648
+#: python/preferences.py:651
msgid "Ducker"
msgstr ""
-#: python/preferences.py:649
+#: python/preferences.py:652
msgid "Release"
msgstr ""
-#: python/preferences.py:652
+#: python/preferences.py:655
msgid "Hold"
msgstr ""
-#: python/preferences.py:655
+#: python/preferences.py:658
msgid ""
"The ducker automatically reduces the level of player audio when the DJ "
"speaks. These settings allow you to adjust the timings of that audio "
"reduction."
msgstr ""
-#: python/preferences.py:659
+#: python/preferences.py:662
msgid "Other options"
msgstr ""
-#: python/preferences.py:666
+#: python/preferences.py:669
msgid "Phase Rotator"
msgstr ""
-#: python/preferences.py:669
+#: python/preferences.py:672
msgid ""
"This feature processes the microphone audio so that it sounds more even. The "
"effect is particularly noticable on male voices."
msgstr ""
-#: python/preferences.py:852
+#: python/preferences.py:855
msgid "The volume control for the left music player."
msgstr ""
#. TC: preferences window title.
-#: python/preferences.py:908
+#: python/preferences.py:911
msgid "IDJC Preferences"
msgstr ""
#. TC: The DJ's sound level controller.
-#: python/preferences.py:933
+#: python/preferences.py:936
msgid "DJ Audio Level"
msgstr ""
-#: python/preferences.py:945
+#: python/preferences.py:948
msgid "This adjusts the sound level of the DJ audio."
msgstr ""
#. TC: The alarm sound level.
-#: python/preferences.py:950
+#: python/preferences.py:953
msgid "Alarm Level"
msgstr ""
-#: python/preferences.py:964
+#: python/preferences.py:967
msgid "Music Loudness Compensation"
msgstr ""
-#: python/preferences.py:962
+#: python/preferences.py:965
#, python-format
msgid ""
"This adjusts the sound level of the DJ alarm. Typically this should be set "
@@ -2981,11 +3049,11 @@ msgid ""
"louder."
msgstr ""
-#: python/preferences.py:970
+#: python/preferences.py:973
msgid "Player Resample Quality"
msgstr ""
-#: python/preferences.py:976
+#: python/preferences.py:979
msgid ""
"This adjusts the quality of the audio resampling method used whenever the "
"sample rate of the music file currently playing does not match the sample "
@@ -2994,144 +3062,144 @@ msgid ""
"these modes provide adequate sound quality."
msgstr ""
-#: python/preferences.py:984
+#: python/preferences.py:987
msgid "Best"
msgstr ""
-#: python/preferences.py:993
+#: python/preferences.py:996 python/format.py:512
msgid "Medium"
msgstr ""
-#: python/preferences.py:1002
+#: python/preferences.py:1005
msgid "Fast"
msgstr ""
#. TC: the set of features - section heading.
-#: python/preferences.py:1017
+#: python/preferences.py:1020
msgid "Feature Set"
msgstr ""
#. TC: Start in the full featured user interface mode.
-#: python/preferences.py:1029
+#: python/preferences.py:1032
msgid "Start Full"
msgstr ""
-#: python/preferences.py:1034 python/preferences.py:1042
+#: python/preferences.py:1037 python/preferences.py:1045
msgid "Indicates which mode IDJC will be in when launched."
msgstr ""
#. TC: Start in a reduced user interface mode.
-#: python/preferences.py:1037
+#: python/preferences.py:1040
msgid "Start Mini"
msgstr ""
-#: python/preferences.py:1050
+#: python/preferences.py:1053
msgid "Fully Featured"
msgstr ""
-#: python/preferences.py:1055
+#: python/preferences.py:1058
msgid "Run in full functionality mode which uses more CPU power."
msgstr ""
-#: python/preferences.py:1057
+#: python/preferences.py:1060
msgid "Basic Streamer"
msgstr ""
-#: python/preferences.py:1061
+#: python/preferences.py:1064
msgid ""
"Run in a reduced functionality mode that lowers the burden on the CPU and "
"takes up less screen space."
msgstr ""
-#: python/preferences.py:1069
+#: python/preferences.py:1072
msgid "These settings take effect after restarting"
msgstr ""
-#: python/preferences.py:1090
+#: python/preferences.py:1093
msgid "Reserve 24 sound effects slots"
msgstr ""
-#: python/preferences.py:1091
+#: python/preferences.py:1094
msgid "Only 12"
msgstr ""
-#: python/preferences.py:1103
+#: python/preferences.py:1106
msgid "Audio input channels"
msgstr ""
-#: python/preferences.py:1108
+#: python/preferences.py:1111
msgid "Simultaneous stream(s)"
msgstr ""
-#: python/preferences.py:1114
+#: python/preferences.py:1117
msgid "Simultaneous recording(s)"
msgstr ""
-#: python/preferences.py:1168
+#: python/preferences.py:1171
msgid "Fill channel meter void space"
msgstr ""
-#: python/preferences.py:1180
+#: python/preferences.py:1183
msgid "Player Loudness Normalisation"
msgstr ""
-#: python/preferences.py:1191
+#: python/preferences.py:1194
msgid "Indicate which tracks have loudness metadata"
msgstr ""
-#: python/preferences.py:1192
+#: python/preferences.py:1195
msgid ""
"Shows a marker in the playlists next to each track. Either a green circle or "
"a red triangle."
msgstr ""
-#: python/preferences.py:1200
+#: python/preferences.py:1203
msgid "Adjust playback volume in dB"
msgstr ""
-#: python/preferences.py:1201
+#: python/preferences.py:1204
msgid "Effective only on newly started tracks."
msgstr ""
-#: python/preferences.py:1207
+#: python/preferences.py:1210
msgid "R128"
msgstr ""
-#: python/preferences.py:1211
+#: python/preferences.py:1214
msgid ""
"It may not be desirable to use the default level since it is rather quiet. "
"This should be set 4 or 5 dB higher than the ReplayGain setting."
msgstr ""
-#: python/preferences.py:1216
+#: python/preferences.py:1219
msgid "ReplayGain"
msgstr ""
-#: python/preferences.py:1220
+#: python/preferences.py:1223
msgid ""
"It may not be desirable to use the default level since it is rather quiet. "
"This should be set 4 or 5 dB lower than the R128 setting."
msgstr ""
-#: python/preferences.py:1225
+#: python/preferences.py:1228
msgid "Untagged"
msgstr ""
-#: python/preferences.py:1229
+#: python/preferences.py:1232
msgid ""
"Set this so that any unmarked tracks are playing at a roughly similar "
"loudness level as the marked ones."
msgstr ""
-#: python/preferences.py:1238
+#: python/preferences.py:1241
msgid "A master level control for the media players."
msgstr ""
-#: python/preferences.py:1249
+#: python/preferences.py:1252
msgid "Recorder Filename (excluding the file extension)"
msgstr ""
-#: python/preferences.py:1250
+#: python/preferences.py:1253
msgid ""
"The specifiers are $r for the number of the recorder with the rest being "
"documented in the strftime man page.\n"
@@ -3139,55 +3207,55 @@ msgid ""
"particular filesystems."
msgstr ""
-#: python/preferences.py:1267
+#: python/preferences.py:1270
msgid "Miscellaneous Features"
msgstr ""
-#: python/preferences.py:1276
+#: python/preferences.py:1279
msgid "Trim quiet song endings and trailing silence"
msgstr ""
-#: python/preferences.py:1282
+#: python/preferences.py:1285
msgid "End tracks containing long passages of silence"
msgstr ""
-#: python/preferences.py:1288
+#: python/preferences.py:1291
msgid "Enable the main-player speed/pitch controls"
msgstr ""
-#: python/preferences.py:1292
+#: python/preferences.py:1295
msgid ""
"This option causes some extra widgets to appear below the playlists which "
"allow the playback speed to be adjusted from 25% to 400% and a normal speed "
"button."
msgstr ""
-#: python/preferences.py:1297
+#: python/preferences.py:1300
msgid "Separate left/right player volume faders"
msgstr ""
-#: python/preferences.py:1301
+#: python/preferences.py:1304
msgid ""
"Select this option to use an independent volume fader for the left and right "
"music players."
msgstr ""
-#: python/preferences.py:1305
+#: python/preferences.py:1308
msgid "Enlarge the time elapsed/remaining windows"
msgstr ""
-#: python/preferences.py:1309
+#: python/preferences.py:1312
msgid ""
"The time elapsed/remaining windows sometimes don't appear big enough for the "
"text that appears in them due to unusual DPI settings or the use of a "
"different rendering engine. This option serves to fix that."
msgstr ""
-#: python/preferences.py:1315
+#: python/preferences.py:1318
msgid "Sound an alarm when the music is due to end"
msgstr ""
-#: python/preferences.py:1318
+#: python/preferences.py:1321
msgid ""
"An alarm tone alerting the DJ that dead-air is just nine seconds away. This "
"also works when monitoring stream audio but the alarm tone is not sent to "
@@ -3196,142 +3264,146 @@ msgid ""
"JACK freewheel mode will also be automatically disengaged."
msgstr ""
-#: python/preferences.py:1328
+#: python/preferences.py:1331
msgid "Apply dither to 16 bit PCM playback"
msgstr ""
-#: python/preferences.py:1332
+#: python/preferences.py:1335
msgid ""
"This feature maybe improves the sound quality a little when listening on a "
"24 bit sound card."
msgstr ""
-#: python/preferences.py:1335
+#: python/preferences.py:1338
msgid "Enable tooltips"
msgstr ""
-#: python/preferences.py:1339
+#: python/preferences.py:1342
msgid ""
"This, what you are currently reading, is a tooltip. This feature turns them "
"on or off."
msgstr ""
-#: python/preferences.py:1358
+#: python/preferences.py:1361
msgid "Player Settings At Startup"
msgstr ""
-#: python/preferences.py:1369
+#: python/preferences.py:1372
msgid "Restore the previous session"
msgstr ""
-#: python/preferences.py:1374
+#: python/preferences.py:1377
msgid ""
"When starting IDJC most of the main window settings will be as they were "
"left. As an alternative you may specify below how you want the various "
"settings to be when IDJC starts."
msgstr ""
-#: python/preferences.py:1384
+#: python/preferences.py:1387
msgid "Player 1"
msgstr ""
-#: python/preferences.py:1386
+#: python/preferences.py:1389
msgid "Player 2"
msgstr ""
#. TC: DJ hears the stream mix.
-#: python/preferences.py:1414
+#: python/preferences.py:1417
msgid "Monitor Stream Mix"
msgstr ""
#. TC: A heading label for miscellaneous settings.
-#: python/preferences.py:1425
+#: python/preferences.py:1428
msgid "General"
msgstr ""
-#: python/preferences.py:1475
+#: python/preferences.py:1478
msgid "VoIP panning + mono downmix"
msgstr ""
#. TC: Keyboard and MIDI bindings configuration.
-#: python/preferences.py:1489
+#: python/preferences.py:1492
msgid "Bindings"
msgstr ""
-#: python/preferences.py:1537
+#: python/preferences.py:1540
msgid "Licence"
msgstr ""
-#: python/preferences.py:1560
+#: python/preferences.py:1563
msgid "Contributors"
msgstr ""
-#: python/preferences.py:1567
+#: python/preferences.py:1570
msgid "Translators"
msgstr ""
-#: python/preferences.py:1573
+#: python/preferences.py:1574
+msgid "Build Info"
+msgstr ""
+
+#: python/preferences.py:1591
msgid "About"
msgstr ""
-#: python/sourceclientgui.py:89
+#: python/sourceclientgui.py:91
msgid "Insert Attribute"
msgstr ""
-#: python/sourceclientgui.py:133
+#: python/sourceclientgui.py:135
msgid "Icecast 2 Master"
msgstr ""
-#: python/sourceclientgui.py:133
+#: python/sourceclientgui.py:135
msgid "Shoutcast Master"
msgstr ""
-#: python/sourceclientgui.py:134
+#: python/sourceclientgui.py:136
msgid "Icecast 2 Stats/Relay"
msgstr ""
-#: python/sourceclientgui.py:134
+#: python/sourceclientgui.py:136
msgid "Shoutcast Stats/Relay"
msgstr ""
-#: python/sourceclientgui.py:137
+#: python/sourceclientgui.py:139
msgid "Enter new server connection details"
msgstr ""
-#: python/sourceclientgui.py:156
+#: python/sourceclientgui.py:158
msgid "Edit existing server connection details"
msgstr ""
-#: python/sourceclientgui.py:193
+#: python/sourceclientgui.py:195
msgid "This server is to be scanned for audience figures"
msgstr ""
-#: python/sourceclientgui.py:206
+#: python/sourceclientgui.py:208
msgid "Server type"
msgstr ""
-#: python/sourceclientgui.py:206
+#: python/sourceclientgui.py:208
msgid "Port number"
msgstr ""
-#: python/sourceclientgui.py:207
+#: python/sourceclientgui.py:209
msgid "Mount point"
msgstr ""
-#: python/sourceclientgui.py:207
+#: python/sourceclientgui.py:209
msgid "Login name"
msgstr ""
-#: python/sourceclientgui.py:449
+#: python/sourceclientgui.py:475
msgid "Encoder Format Not Set/Compatible"
msgstr ""
#. TC: Connection button text when no details have been entered.
-#: python/sourceclientgui.py:452
+#: python/sourceclientgui.py:478
msgid "No Master Server Configured"
msgstr ""
-#: python/sourceclientgui.py:654
+#: python/sourceclientgui.py:680
msgid ""
"A table of servers with which to connect. Only one master server can be "
"added for the purpose of streaming. All other servers will appear below the "
@@ -3339,99 +3411,99 @@ msgid ""
"toggled on a per server basis."
msgstr ""
-#: python/sourceclientgui.py:670
+#: python/sourceclientgui.py:696
msgid "Hostname/IP address"
msgstr ""
#. TC: Mount point is a technical term in relation to icecast servers.
-#: python/sourceclientgui.py:683
+#: python/sourceclientgui.py:709
msgid "Mount point "
msgstr ""
#. TC: This is the listener count heading.
-#: python/sourceclientgui.py:692
+#: python/sourceclientgui.py:718
msgid "Listeners"
msgstr ""
-#: python/sourceclientgui.py:707
+#: python/sourceclientgui.py:733
msgid "The sum total of listeners in this server tab."
msgstr ""
-#: python/sourceclientgui.py:734
+#: python/sourceclientgui.py:760
msgid "Never"
msgstr ""
-#: python/sourceclientgui.py:737
+#: python/sourceclientgui.py:763
msgid "Always"
msgstr ""
-#: python/sourceclientgui.py:739
+#: python/sourceclientgui.py:765
msgid "If connected"
msgstr ""
-#: python/sourceclientgui.py:995
+#: python/sourceclientgui.py:1021
msgid "Custom user agent string"
msgstr ""
-#: python/sourceclientgui.py:1002
+#: python/sourceclientgui.py:1028
msgid ""
"Set this on the occasion that the server or its firewall specifically "
"refuses to allow libshout based clients."
msgstr ""
-#: python/sourceclientgui.py:1007
+#: python/sourceclientgui.py:1033
msgid "If the connection breaks reconnect to the server"
msgstr ""
#. TC: Label for a comma separated list of delay times.
-#: python/sourceclientgui.py:1017
+#: python/sourceclientgui.py:1043
msgid "Delay times"
msgstr ""
-#: python/sourceclientgui.py:1021
+#: python/sourceclientgui.py:1047
msgid ""
"A comma separated list of delays in seconds between reconnection attempts. "
"Note that bad values or values less than 5 will be interpreted as 5."
msgstr ""
-#: python/sourceclientgui.py:1027
+#: python/sourceclientgui.py:1053
msgid "Repeat the sequence of delays indefinitely."
msgstr ""
#. TC: User specifies no dialog box to be shown.
-#: python/sourceclientgui.py:1030
+#: python/sourceclientgui.py:1056
msgid "Quiet"
msgstr ""
-#: python/sourceclientgui.py:1032
+#: python/sourceclientgui.py:1058
msgid "Keep the reconnection dialogue box hidden at all times."
msgstr ""
-#: python/sourceclientgui.py:1037
+#: python/sourceclientgui.py:1063
msgid "The contingency plan upon the stream buffer becoming full is..."
msgstr ""
-#: python/sourceclientgui.py:1046
+#: python/sourceclientgui.py:1072
msgid "Discard audio data for as long as needed."
msgstr ""
-#: python/sourceclientgui.py:1048
+#: python/sourceclientgui.py:1074
msgid "Assume the connection is beyond saving and reconnect."
msgstr ""
-#: python/sourceclientgui.py:1300
+#: python/sourceclientgui.py:1357 python/format.py:1140
msgid "Shoutcast"
msgstr ""
-#: python/sourceclientgui.py:1337
+#: python/sourceclientgui.py:1394
msgid "[Metadata suppressed]"
msgstr ""
-#: python/sourceclientgui.py:1416
+#: python/sourceclientgui.py:1473
msgid "Individual Controls"
msgstr ""
-#: python/sourceclientgui.py:1430
+#: python/sourceclientgui.py:1487
msgid ""
"Connect to or disconnect from the radio server. If the button does not stay "
"in, the connection failed for some reason.\n"
@@ -3446,96 +3518,97 @@ msgid ""
msgstr ""
#. TC: Kick whoever is on the server.
-#: python/sourceclientgui.py:1447
+#: python/sourceclientgui.py:1504
msgid "Kick Source"
msgstr ""
-#: python/sourceclientgui.py:1449
+#: python/sourceclientgui.py:1506
msgid ""
"This will disconnect whoever is currently using the server, freeing it up "
"for personal use."
msgstr ""
-#: python/sourceclientgui.py:1459
+#: python/sourceclientgui.py:1516
msgid "Timer:"
msgstr ""
-#: python/sourceclientgui.py:1463
+#: python/sourceclientgui.py:1520
msgid "From"
msgstr ""
-#: python/sourceclientgui.py:1464
+#: python/sourceclientgui.py:1521
msgid ""
"Automatically connect to the server at a specific time in 24 hour format, "
"midnight being 00:00"
msgstr ""
-#: python/sourceclientgui.py:1469
+#: python/sourceclientgui.py:1526
msgid "Kick"
msgstr ""
-#: python/sourceclientgui.py:1471
+#: python/sourceclientgui.py:1528
msgid "Disconnect whoever is using the server just before start time."
msgstr ""
-#: python/sourceclientgui.py:1480
+#: python/sourceclientgui.py:1537
msgid "To"
msgstr ""
-#: python/sourceclientgui.py:1481
+#: python/sourceclientgui.py:1538
msgid ""
"Automatically disconnect from the server at a specific time in 24 hour "
"format."
msgstr ""
-#: python/sourceclientgui.py:1484
+#: python/sourceclientgui.py:1541
msgid "Fade out"
msgstr ""
-#: python/sourceclientgui.py:1486
+#: python/sourceclientgui.py:1543
msgid "Fade audio before disconnecting."
msgstr ""
-#: python/sourceclientgui.py:1500
+#: python/sourceclientgui.py:1557
msgid "At connect:"
msgstr ""
#. TC: [x] Start player (*) 1 ( ) 2
-#: python/sourceclientgui.py:1504
+#: python/sourceclientgui.py:1561
msgid "Start player"
msgstr ""
-#: python/sourceclientgui.py:1509
+#: python/sourceclientgui.py:1566
msgid ""
"Have one of the players start automatically when a radio server connection "
"is successfully made."
msgstr ""
#. TC: [x] Start recorder (*) 1 ( ) 2
-#: python/sourceclientgui.py:1517
+#: python/sourceclientgui.py:1574
msgid "Start recorder"
msgstr ""
-#: python/sourceclientgui.py:1524
+#: python/sourceclientgui.py:1581
msgid ""
"Have a recorder start automatically when a radio server connection is "
"successfully made."
msgstr ""
-#: python/sourceclientgui.py:1529
+#: python/sourceclientgui.py:1586 python/format.py:521 python/format.py:532
+#: python/format.py:542
msgid "Metadata"
msgstr ""
-#: python/sourceclientgui.py:1539
+#: python/sourceclientgui.py:1596
msgid "Format String"
msgstr ""
#. TC: Label for the metadata fallback value.
-#: python/sourceclientgui.py:1541
+#: python/sourceclientgui.py:1598
msgid "Fallback"
msgstr ""
-#: python/sourceclientgui.py:1555
+#: python/sourceclientgui.py:1612
msgid ""
"You can enter text to accompany the stream here and can specify placemarkers "
"%r %t %l %s for the artist, title, album, and songname respectively, or "
@@ -3549,125 +3622,133 @@ msgid ""
"%s."
msgstr ""
-#: python/sourceclientgui.py:1563
+#: python/sourceclientgui.py:1620
msgid ""
"The fallback text to use when %r %t %l metadata is unavailable. See the "
"format string to the left."
msgstr ""
-#: python/sourceclientgui.py:1565
+#: python/sourceclientgui.py:1622
msgid ""
"Metadata normally updates only on song title changes but you can force an "
"immediate update here."
msgstr ""
-#: python/sourceclientgui.py:1584
+#: python/sourceclientgui.py:1641
msgid "Configuration"
msgstr ""
-#: python/sourceclientgui.py:1585
+#: python/sourceclientgui.py:1642
msgid "The controls for configuring a stream."
msgstr ""
-#: python/sourceclientgui.py:1593
+#: python/sourceclientgui.py:1650
msgid "Connection"
msgstr ""
-#: python/sourceclientgui.py:1598
+#: python/sourceclientgui.py:1655
msgid "Format"
msgstr ""
#. TC: Tab heading. User can enter information about the stream here.
-#: python/sourceclientgui.py:1607
+#: python/sourceclientgui.py:1664
msgid "Stream Info"
msgstr ""
-#: python/sourceclientgui.py:1612
+#: python/sourceclientgui.py:1669
msgid ""
"Enter your DJ name or station name here. Typically this information will be "
"displayed by listener clients."
msgstr ""
-#: python/sourceclientgui.py:1615
+#: python/sourceclientgui.py:1672
msgid ""
"The URL of your radio station. This and the rest of the information below is "
"intended for display on a radio station listings website."
msgstr ""
-#: python/sourceclientgui.py:1620
+#: python/sourceclientgui.py:1677
msgid "A description of your radio station."
msgstr ""
-#: python/sourceclientgui.py:1625
+#: python/sourceclientgui.py:1682
msgid "The musical genres you are likely to play."
msgstr ""
-#: python/sourceclientgui.py:1628
+#: python/sourceclientgui.py:1685
msgid "Make Public"
msgstr ""
-#: python/sourceclientgui.py:1629
+#: python/sourceclientgui.py:1686
msgid ""
"Publish your radio station on a listings website. The website in question "
"will depend on how the server to which you connect is configured."
msgstr ""
-#: python/sourceclientgui.py:1641
+#: python/sourceclientgui.py:1698
msgid "Genre(s)"
msgstr ""
-#: python/sourceclientgui.py:1651
+#: python/sourceclientgui.py:1709
msgid "Master server admin password"
msgstr ""
-#: python/sourceclientgui.py:1656
+#: python/sourceclientgui.py:1714
msgid ""
"This is for kick and stats on Shoutcast master servers that have an "
"administrator password. For those that don't leave this blank (the source "
"password is sufficient for those)."
msgstr ""
-#: python/sourceclientgui.py:1665
+#: python/sourceclientgui.py:1723
msgid "Contact Details"
msgstr ""
-#: python/sourceclientgui.py:1670
+#: python/sourceclientgui.py:1727
msgid "Internet Relay Chat connection info goes here."
msgstr ""
-#: python/sourceclientgui.py:1673
+#: python/sourceclientgui.py:1730
msgid "Connection info for AOL instant messenger goes here."
msgstr ""
-#: python/sourceclientgui.py:1676
+#: python/sourceclientgui.py:1733
msgid "ICQ instant messenger connection info goes here."
msgstr ""
-#: python/sourceclientgui.py:1679
+#: python/sourceclientgui.py:1736
msgid "IRC"
msgstr ""
-#: python/sourceclientgui.py:1680
+#: python/sourceclientgui.py:1737
msgid "AIM"
msgstr ""
-#: python/sourceclientgui.py:1681
+#: python/sourceclientgui.py:1738
msgid "ICQ"
msgstr ""
-#: python/sourceclientgui.py:1690
+#: python/sourceclientgui.py:1748
+msgid "Use ISO-8859-1 encoding for fixed metadata"
+msgstr ""
+
+#: python/sourceclientgui.py:1750
+msgid "Enable this if sending to a Shoutcast V1 server."
+msgstr ""
+
+#: python/sourceclientgui.py:1754
msgid "Extra Shoutcast"
msgstr ""
-#: python/sourceclientgui.py:1695
+#: python/sourceclientgui.py:1759
msgid "Troubleshooting"
msgstr ""
-#: python/sourceclientgui.py:1821
+#: python/sourceclientgui.py:1890
msgid "Stop recording."
msgstr ""
-#: python/sourceclientgui.py:1823
+#: python/sourceclientgui.py:1892
msgid ""
"Start recording.\n"
"\n"
@@ -3675,27 +3756,27 @@ msgid ""
"not valid or write permission is not granted on the selected folder."
msgstr ""
-#: python/sourceclientgui.py:1828
+#: python/sourceclientgui.py:1897
msgid "Pause recording."
msgstr ""
-#: python/sourceclientgui.py:1865
+#: python/sourceclientgui.py:1934
msgid "Recording time elapsed."
msgstr ""
#. TC: Dialog title bar text.
-#: python/sourceclientgui.py:1919
+#: python/sourceclientgui.py:1988
msgid "Select the folder to record to"
msgstr ""
-#: python/sourceclientgui.py:1930
+#: python/sourceclientgui.py:1999
msgid ""
"Choose which stream to record or the 24 bit FLAC option. If the stream isn't "
"already running the encoder will be started automatically using whatever "
"settings are currently configured."
msgstr ""
-#: python/sourceclientgui.py:1934
+#: python/sourceclientgui.py:2003
msgid ""
"Choose which directory you want to save to. All file names will be in a "
"timestamp format and have either an oga, mp3, or flac file extension. "
@@ -3703,76 +3784,77 @@ msgid ""
"permission."
msgstr ""
-#: python/sourceclientgui.py:2038
+#: python/sourceclientgui.py:2110
msgid "Perform operations on multiple servers in unison."
msgstr ""
-#: python/sourceclientgui.py:2050
+#: python/sourceclientgui.py:2122
msgid "Connect"
msgstr ""
-#: python/sourceclientgui.py:2067
+#: python/sourceclientgui.py:2139
msgid "Disconnect"
msgstr ""
-#: python/sourceclientgui.py:2075
+#: python/sourceclientgui.py:2147
msgid "Kick Sources"
msgstr ""
-#: python/sourceclientgui.py:2084
+#: python/sourceclientgui.py:2156
msgid "Metadata:"
msgstr ""
-#: python/sourceclientgui.py:2114
+#: python/sourceclientgui.py:2186
msgid "Group Controls"
msgstr ""
-#: python/sourceclientgui.py:2610
+#: python/sourceclientgui.py:2692
msgid "Recording Facility Unavailable"
msgstr ""
-#: python/sourceclientgui.py:2613
+#: python/sourceclientgui.py:2695
msgid "No Recorders Are Correctly Configured"
msgstr ""
#. TC: Recorder menu format string.
-#: python/sourceclientgui.py:2626
+#: python/sourceclientgui.py:2708
+#, python-brace-format
msgid "{numericid} [{source}] > [{directory}]"
msgstr ""
-#: python/sourceclientgui.py:2628
+#: python/sourceclientgui.py:2710
msgid "Misconfigured"
msgstr ""
-#: python/sourceclientgui.py:2649
+#: python/sourceclientgui.py:2731
msgid "Streaming Facility Unavailable"
msgstr ""
-#: python/sourceclientgui.py:2651
+#: python/sourceclientgui.py:2733
msgid "No Streams Are Currently Configured"
msgstr ""
-#: python/sourceclientgui.py:2654
+#: python/sourceclientgui.py:2736
msgid "Group Connect"
msgstr ""
-#: python/sourceclientgui.py:2660
+#: python/sourceclientgui.py:2742
msgid "Group Disconnect"
msgstr ""
#. TC: Window title bar text.
-#: python/sourceclientgui.py:2691
+#: python/sourceclientgui.py:2773
msgid "IDJC Output"
msgstr ""
-#: python/sourceclientgui.py:2707
+#: python/sourceclientgui.py:2789
msgid ""
"Each one of these tabs represents a separate stream recorder. The LED "
"indicator colours represent the following: Clear=Stopped Yellow=Paused "
"Red=Recording."
msgstr ""
-#: python/sourceclientgui.py:2715
+#: python/sourceclientgui.py:2797
msgid ""
"Each one of these tabs represents a separate radio streamer. The LED "
"indicator colours represent the following: Clear=No connection "
@@ -3780,11 +3862,11 @@ msgid ""
"a bad connection."
msgstr ""
-#: python/sourceclientgui.py:2733
+#: python/sourceclientgui.py:2815
msgid " Stream "
msgstr ""
-#: python/sourceclientgui.py:2768
+#: python/sourceclientgui.py:2850
msgid ""
"<span weight=\"bold\" size=\"12000\">A connection to a radio server has "
"failed.</span>\n"
@@ -3792,8 +3874,509 @@ msgid ""
"Reconnection will not be attempted."
msgstr ""
-#: python/sourceclientgui.py:2773
+#: python/sourceclientgui.py:2855
msgid ""
"<span weight=\"bold\" size=\"12000\">A scheduled stream disconnection has "
"occurred.</span>"
msgstr ""
+
+#: python/format.py:419
+msgid "Right click for suggested values."
+msgstr ""
+
+#: python/format.py:438
+msgid "Suggested Values"
+msgstr ""
+
+#: python/format.py:494
+msgid "Pregain"
+msgstr ""
+
+#: python/format.py:495 python/format.py:913
+msgid "0 dB"
+msgstr ""
+
+#: python/format.py:496 python/format.py:914
+msgid "-0.5 dB"
+msgstr ""
+
+#: python/format.py:497 python/format.py:915
+msgid "-1.0 dB"
+msgstr ""
+
+#: python/format.py:498 python/format.py:916
+msgid "-1.5 dB"
+msgstr ""
+
+#: python/format.py:499 python/format.py:917
+msgid "-2.0 dB"
+msgstr ""
+
+#: python/format.py:500 python/format.py:918
+msgid "-2.5 dB"
+msgstr ""
+
+#: python/format.py:501 python/format.py:919
+msgid "-3.0 dB"
+msgstr ""
+
+#: python/format.py:502
+msgid ""
+"A blanket gain reduction to promote audio quality when using long "
+"established lossy audio codecs like mp3 with loud audio material.\n"
+"\n"
+"ReplayGain makes this feature generally unnecessary and the correct setting "
+"in that case is 0 dB."
+msgstr ""
+
+#: python/format.py:510
+msgid "Resample Quality"
+msgstr ""
+
+#: python/format.py:511
+msgid "Highest"
+msgstr ""
+
+#: python/format.py:513
+msgid "Lowest"
+msgstr ""
+
+#: python/format.py:514
+msgid ""
+"All of these settings will provide adequate audio quality. The highest "
+"setting will preserve more of the original audio bandwidth at the expense of "
+"many CPU cycles."
+msgstr ""
+
+#: python/format.py:522 python/format.py:533 python/format.py:543
+msgid "Suppressed"
+msgstr ""
+
+#: python/format.py:523 python/format.py:534
+msgid "UTF-8"
+msgstr ""
+
+#: python/format.py:524
+msgid "Latin1 *"
+msgstr ""
+
+#: python/format.py:525
+msgid ""
+"This affects the stream metadata only. Recordings will use UTF-8 for their "
+"metadata."
+msgstr ""
+
+#: python/format.py:535
+msgid ""
+"Choose whether the stream will carry dynamic metadata. In the case of Ogg "
+"streams this is important as a great many players can't handle chained Ogg "
+"streams which result from the metadata updates."
+msgstr ""
+
+#: python/format.py:544
+msgid "Latin1"
+msgstr ""
+
+#: python/format.py:545
+msgid "Choose whether to send metadata. Recordings will use UTF-8 metadata."
+msgstr ""
+
+#: python/format.py:561 python/format.py:572 python/format.py:583
+#: python/format.py:690 python/format.py:818 python/format.py:888
+#: python/format.py:897 python/format.py:971 python/format.py:994
+#: python/format.py:1003
+msgid "Mode"
+msgstr ""
+
+#: python/format.py:562 python/format.py:573 python/format.py:584
+#: python/format.py:691 python/format.py:819 python/format.py:889
+#: python/format.py:898 python/format.py:972 python/format.py:995
+#: python/format.py:1004
+msgid "Mono"
+msgstr ""
+
+#: python/format.py:563 python/format.py:574 python/format.py:585
+#: python/format.py:692 python/format.py:820 python/format.py:890
+#: python/format.py:899 python/format.py:973 python/format.py:996
+#: python/format.py:1005
+msgid "Stereo"
+msgstr ""
+
+#: python/format.py:564 python/format.py:575 python/format.py:586
+#: python/format.py:693
+msgid "Joint Stereo"
+msgstr ""
+
+#: python/format.py:565
+msgid "Joint Stereo is a good choice on streams with low bitrates."
+msgstr ""
+
+#: python/format.py:576
+msgid "Due to the high bitrate selected, this codec will only support stereo."
+msgstr ""
+
+#: python/format.py:587
+msgid "Due to the low bitrate selected, this codec will only support mono."
+msgstr ""
+
+#: python/format.py:636 python/format.py:646 python/format.py:743
+#: python/format.py:753 python/format.py:763 python/format.py:869
+#: python/format.py:879 python/format.py:1032 python/format.py:1052
+msgid "Samplerate"
+msgstr ""
+
+#. TC: Abbreviation of the word, standard.
+#: python/format.py:657 python/format.py:774
+msgid "Std."
+msgstr ""
+
+#. TC: v stands for version.
+#: python/format.py:659 python/format.py:776
+msgid "V 1"
+msgstr ""
+
+#. TC: v stands for version.
+#: python/format.py:661 python/format.py:778
+msgid "V 2"
+msgstr ""
+
+#: python/format.py:662
+msgid ""
+"MPEG2 introduced lower samplerate options and corresponding lower bitrates. "
+"Choose 2 if those are required."
+msgstr ""
+
+#: python/format.py:669 python/format.py:797
+msgid "Quality"
+msgstr ""
+
+#: python/format.py:670
+msgid "0 most"
+msgstr ""
+
+#. TC: * means is the recommended setting.
+#: python/format.py:673
+msgid "2 *"
+msgstr ""
+
+#: python/format.py:675
+msgid "Higher quality costs more in terms of CPU cycles."
+msgstr ""
+
+#: python/format.py:694
+msgid "Joint Stereo is a good choice on streams with low bitrates"
+msgstr ""
+
+#. TC: v stands for version.
+#: python/format.py:780
+msgid "V 2.5"
+msgstr ""
+
+#: python/format.py:787
+msgid "Complexity"
+msgstr ""
+
+#: python/format.py:790
+msgid "A quality setting that affects how heavily the CPU is used."
+msgstr ""
+
+#: python/format.py:800
+msgid "The higher this setting, the higher the bitrate."
+msgstr ""
+
+#: python/format.py:807
+msgid "Bandwidth"
+msgstr ""
+
+#: python/format.py:808
+msgid "Ultrawide"
+msgstr ""
+
+#: python/format.py:809
+msgid "Wide"
+msgstr ""
+
+#: python/format.py:810
+msgid "Narrow"
+msgstr ""
+
+#: python/format.py:811
+msgid "Essentially a samplerate setting."
+msgstr ""
+
+#: python/format.py:828
+msgid "24 bit"
+msgstr ""
+
+#: python/format.py:829
+msgid "20 bit"
+msgstr ""
+
+#: python/format.py:830
+msgid "16 bit"
+msgstr ""
+
+#: python/format.py:831
+msgid ""
+"24 bit records with the highest level of detail. If file size is a concern "
+"maybe FLAC is not the right codec."
+msgstr ""
+
+#: python/format.py:838 python/format.py:927
+msgid "Variability"
+msgstr ""
+
+#: python/format.py:839
+msgid "Constant"
+msgstr ""
+
+#: python/format.py:840
+msgid "±10%"
+msgstr ""
+
+#: python/format.py:841
+msgid "±20%"
+msgstr ""
+
+#: python/format.py:842
+msgid "±30%"
+msgstr ""
+
+#: python/format.py:843
+msgid "±40%"
+msgstr ""
+
+#: python/format.py:844
+msgid "±50%"
+msgstr ""
+
+#: python/format.py:845
+msgid "This control is for enabling variable bitrate on Vorbis streams."
+msgstr ""
+
+#: python/format.py:906
+msgid "Postgain"
+msgstr ""
+
+#: python/format.py:907
+msgid "3.0 dB"
+msgstr ""
+
+#: python/format.py:908
+msgid "2.5 dB"
+msgstr ""
+
+#: python/format.py:909
+msgid "2.0 dB"
+msgstr ""
+
+#: python/format.py:910
+msgid "1.5 dB"
+msgstr ""
+
+#: python/format.py:911
+msgid "1.0 dB"
+msgstr ""
+
+#: python/format.py:912
+msgid "0.5 dB"
+msgstr ""
+
+#: python/format.py:920
+msgid "A gain adjustment for the player to apply."
+msgstr ""
+
+#: python/format.py:928
+msgid "CBR *"
+msgstr ""
+
+#: python/format.py:929
+msgid "CVBR"
+msgstr ""
+
+#: python/format.py:930
+msgid "VBR"
+msgstr ""
+
+#: python/format.py:931
+msgid ""
+"Bitrate variability. Actual VBR operation may require a higher frame size."
+msgstr ""
+
+#: python/format.py:938
+msgid "Frame Size"
+msgstr ""
+
+#: python/format.py:939
+msgid "60 ms"
+msgstr ""
+
+#: python/format.py:940
+msgid "40 ms"
+msgstr ""
+
+#: python/format.py:941
+msgid "20 ms"
+msgstr ""
+
+#: python/format.py:942
+msgid "A higher frame size may sound better on very low bitrates."
+msgstr ""
+
+#: python/format.py:949
+msgid "CPU"
+msgstr ""
+
+#: python/format.py:952
+msgid "The encoder complexity setting which affects CPU load."
+msgstr ""
+
+#: python/format.py:980 python/format.py:1083
+msgid "Codec"
+msgstr ""
+
+#: python/format.py:981
+msgid "Vorbis"
+msgstr ""
+
+#: python/format.py:982
+msgid "FLAC"
+msgstr ""
+
+#: python/format.py:983
+msgid "Speex"
+msgstr ""
+
+#: python/format.py:984
+msgid "Opus"
+msgstr ""
+
+#: python/format.py:987
+msgid "Codecs of the Ogg container."
+msgstr ""
+
+#: python/format.py:1033
+msgid "96000 Hz"
+msgstr ""
+
+#: python/format.py:1034
+msgid "88200 Hz"
+msgstr ""
+
+#: python/format.py:1035
+msgid "64000 Hz"
+msgstr ""
+
+#: python/format.py:1036 python/format.py:1053
+msgid "48000 Hz"
+msgstr ""
+
+#: python/format.py:1037 python/format.py:1054
+msgid "44100 Hz"
+msgstr ""
+
+#: python/format.py:1038
+msgid "32000 Hz"
+msgstr ""
+
+#: python/format.py:1039
+msgid "24000 Hz"
+msgstr ""
+
+#: python/format.py:1040
+msgid "22050 Hz"
+msgstr ""
+
+#: python/format.py:1041
+msgid "16000 Hz"
+msgstr ""
+
+#: python/format.py:1042
+msgid "12000 Hz"
+msgstr ""
+
+#: python/format.py:1043
+msgid "11025 Hz"
+msgstr ""
+
+#: python/format.py:1044
+msgid "8000 Hz"
+msgstr ""
+
+#: python/format.py:1045
+msgid "7350 Hz"
+msgstr ""
+
+#: python/format.py:1067
+msgid "The MP2 option requires IDJC be rebuilt against libtwolame."
+msgstr ""
+
+#: python/format.py:1070
+msgid "Enable the MP3 option by installing libmp3lame."
+msgstr ""
+
+#: python/format.py:1073
+msgid "The AAC options require IDJC be rebuilt against libav libraries."
+msgstr ""
+
+#: python/format.py:1076
+msgid ""
+"Specific AAC support not present in libavcodec. More info: idjc.sourceforge."
+"net."
+msgstr ""
+
+#: python/format.py:1078
+msgid ""
+"Specific AAC+ support not present in libavcodec. More info: idjc.sourceforge."
+"net."
+msgstr ""
+
+#: python/format.py:1081
+msgid "Codecs of the MPEG family."
+msgstr ""
+
+#: python/format.py:1084
+msgid "MP2"
+msgstr ""
+
+#: python/format.py:1085
+msgid "MP3"
+msgstr ""
+
+#: python/format.py:1086
+msgid "AAC"
+msgstr ""
+
+#: python/format.py:1087
+msgid "AAC+ v2"
+msgstr ""
+
+#. TC: Codec family e.g. Xiph/Ogg, MPEG etc.
+#: python/format.py:1099
+msgid "Family"
+msgstr ""
+
+#. TC: Xiph.org Ogg container format.
+#: python/format.py:1101
+msgid "Xiph/Ogg"
+msgstr ""
+
+#: python/format.py:1102
+msgid "MPEG"
+msgstr ""
+
+#: python/format.py:1103
+msgid "Codecs have been grouped by standards body and or container format."
+msgstr ""
+
+#: python/format.py:1128
+msgid "Capabilities"
+msgstr ""
+
+#: python/format.py:1140
+msgid "Icecast"
+msgstr ""
+
+#: python/format.py:1140
+msgid "Recordable"
+msgstr ""
diff --git a/po/it.gmo b/po/it.gmo
index f39ddef..df66149 100644
Binary files a/po/it.gmo and b/po/it.gmo differ
diff --git a/po/it.po b/po/it.po
index 8efd561..b1a5c6f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: putidjcinthesubjectline at bethere.co.uk\n"
-"POT-Creation-Date: 2014-02-17 19:31+0000\n"
+"POT-Creation-Date: 2015-07-27 07:47+0100\n"
"PO-Revision-Date: 2013-11-07 16:48+0000\n"
"Last-Translator: \n"
"Language-Team: English <team at example.com>\n"
@@ -308,6 +308,7 @@ msgstr ""
#. TC: text appears in the title bar when in session mode.
#: python/prelims/__init__.py:590
+#, python-brace-format
msgid "session={type}:{name}"
msgstr ""
@@ -342,14 +343,17 @@ msgid "Profile %s is active."
msgstr "Il profilo %s è attivo."
#: python/prelims/__init__.py:791
+#, python-brace-format
msgid "Cannot rename profile {0} to {1}, {1} currently exists."
msgstr "Non posso rinominare il profilo {0} in {1}, {1} è già presente."
#: python/prelims/__init__.py:795
+#, python-brace-format
msgid "Error during attempt to rename {0} to {1}."
msgstr "Errore nel tentativo di rinominare {0} in {1}."
#: python/prelims/__init__.py:805
+#, python-brace-format
msgid ""
"<span weight='bold' size='12000'>Error while editing profile: {0}.</span>\n"
"\n"
@@ -361,6 +365,7 @@ msgstr ""
"{1}"
#: python/prelims/__init__.py:824
+#, python-brace-format
msgid "could not get a lock on profile {0}: {1}"
msgstr ""
@@ -463,54 +468,54 @@ msgid "The default profile"
msgstr "Il profilo base"
#. TC: data entry dialog window title text. %s = profile name
-#: python/prelims/profiledialog.py:97
+#: python/prelims/profiledialog.py:98
#, python-format
msgid "Edit profile %s"
msgstr "Modifica il profilo %s"
#. TC: data entry dialog window title text. %s = profile name
-#: python/prelims/profiledialog.py:100
+#: python/prelims/profiledialog.py:101
#, python-format
msgid "New profile based upon %s"
msgstr "Nuovo profilo basato su %s"
#. TC: data entry dialog window title text.
-#: python/prelims/profiledialog.py:104
+#: python/prelims/profiledialog.py:105
msgid "New profile details"
msgstr "Dettagli del nuovo profilo"
#. TC: profile dialog window title text.
-#: python/prelims/profiledialog.py:242
+#: python/prelims/profiledialog.py:243
msgid "IDJC Profile Manager"
msgstr "Gestore dei profili IDJC"
-#: python/prelims/profiledialog.py:276
+#: python/prelims/profiledialog.py:277
msgid "Profile"
msgstr "Profilo"
#. TC: column heading. The profile nicknames.
#. TC: IRC nickname data entry label.
-#: python/prelims/profiledialog.py:284 python/irc.py:446
+#: python/prelims/profiledialog.py:285 python/irc.py:452
msgid "Nickname"
msgstr "Nickname"
#. TC: column heading.
#. TC: Station description.
-#: python/prelims/profiledialog.py:287 python/irc.py:90
-#: python/playergui.py:306 python/sourceclientgui.py:1640
+#: python/prelims/profiledialog.py:288 python/irc.py:96
+#: python/playergui.py:307 python/sourceclientgui.py:1697
msgid "Description"
msgstr "Descrizione"
#. TC: column heading. The time a particular profile has been running.
-#: python/prelims/profiledialog.py:291
+#: python/prelims/profiledialog.py:292
msgid "Up-time"
msgstr "Avviato da"
-#: python/prelims/profiledialog.py:305
+#: python/prelims/profiledialog.py:306
msgid "_Auto"
msgstr "_Auto"
-#: python/prelims/profiledialog.py:364
+#: python/prelims/profiledialog.py:365
#, python-format
msgid ""
"<span weight='bold' size='12000'>Delete the data of profile '%s'?</span>\n"
@@ -521,7 +526,7 @@ msgstr ""
"\n"
"Il profilo resterà disponibile con le impostazioni iniziali"
-#: python/prelims/profiledialog.py:368
+#: python/prelims/profiledialog.py:369
#, python-format
msgid ""
"<span weight='bold' size='12000'>Delete profile '%s' and all its data?</"
@@ -536,6 +541,7 @@ msgstr ""
#. TC: The contents of <> and {} must not be changed.
#: python/dialogs.py:198
+#, python-brace-format
msgid ""
"<span weight=\"bold\" size=\"12000\">The connection to the server in tab "
"{servertab} has failed.</span>\n"
@@ -566,142 +572,153 @@ msgid "Released under the GNU General Public License V2.0+."
msgstr "Rilasciato sotto la Licenza Pubblica Generica GNU, V2.0+"
#. TC: IRC message subcategory, triggers on new track announcements.
-#: python/irc.py:78
+#: python/irc.py:82
msgid "Track announce"
msgstr "Annuncio traccia"
#. TC: IRC message subcategory, triggered by a timer.
-#: python/irc.py:80
+#: python/irc.py:84
msgid "Timer"
msgstr "Cronometro"
#. TC: IRC message subcategory, triggered once when the stream starts.
-#: python/irc.py:82
+#: python/irc.py:86
msgid "On stream up"
msgstr "Se il flusso è attivo"
#. TC: IRC message subcategory, triggered once at the stream's end.
-#: python/irc.py:84
+#: python/irc.py:88
msgid "On stream down"
msgstr "Se il flusso non è attivo"
+#. TC: IRC message subcategory, triggered once at the stream's end.
+#: python/irc.py:90
+#, fuzzy
+msgid "Operations"
+msgstr "Altre opzioni"
+
#. TC: Track artist.
-#: python/irc.py:89 python/mutagentagger.py:375 python/songdb.py:785
-#: python/songdb.py:1157 python/sourceclientgui.py:92
+#: python/irc.py:95 python/mutagentagger.py:375 python/songdb.py:902
+#: python/songdb.py:1290 python/sourceclientgui.py:94
msgid "Artist"
msgstr "Artista"
-#: python/irc.py:89 python/mutagentagger.py:375 python/songdb.py:1161
-#: python/sourceclientgui.py:92
+#: python/irc.py:95 python/mutagentagger.py:375 python/songdb.py:1292
+#: python/sourceclientgui.py:94
msgid "Title"
msgstr "Titolo"
-#: python/irc.py:89 python/mutagentagger.py:376 python/songdb.py:1158
-#: python/sourceclientgui.py:92
+#: python/irc.py:95 python/mutagentagger.py:376 python/songdb.py:1291
+#: python/sourceclientgui.py:94
msgid "Album"
msgstr "Album"
-#: python/irc.py:89 python/sourceclientgui.py:93
+#: python/irc.py:95 python/sourceclientgui.py:95
msgid "Song name"
msgstr "Canzone"
#. TC: The DJ or Stream name.
-#: python/irc.py:90 python/sourceclientgui.py:1637
+#: python/irc.py:96 python/sourceclientgui.py:1694
msgid "DJ name"
msgstr "Nome DJ"
-#: python/irc.py:90 python/sourceclientgui.py:1638
+#: python/irc.py:96 python/sourceclientgui.py:1695
msgid "Listen URL"
msgstr "Indirizzo di ascolto (URL)"
+#: python/irc.py:96
+#, fuzzy
+msgid "Source URI"
+msgstr "Fonte"
+
#. TC: Popup menu item for a GTK text entry widget.
-#: python/irc.py:133
+#: python/irc.py:139
msgid "Insert Attribute or Colour Code"
msgstr "Inserisci un attributo o un codice colore"
#. TC: Text formatting style.
-#: python/irc.py:170
+#: python/irc.py:176
msgid "<b>Bold</b>"
msgstr "<b>Grassetto</b>"
#. TC: Text formatting style.
-#: python/irc.py:172
+#: python/irc.py:178
msgid "<u>Underline</u>"
msgstr "<u>Sottolineato</u>"
#. TC: Text formatting style.
-#: python/irc.py:174
+#: python/irc.py:180
msgid "Normal"
msgstr "Normale"
-#: python/irc.py:180
+#: python/irc.py:186
msgid "Colours"
msgstr "Colori"
-#: python/irc.py:397
+#: python/irc.py:403
msgid "Optional data entry field for information only."
msgstr "Campo opzionale a scopo informativo."
#. TC: Tab heading text.
-#: python/irc.py:400
+#: python/irc.py:406
msgid "IRC server"
msgstr "Server IRC"
-#: python/irc.py:412
+#: python/irc.py:418
#, fuzzy
msgid "Manual start"
msgstr "Manuale"
-#: python/irc.py:414
+#: python/irc.py:420
msgid "Off when restarting IDJC and off initially."
msgstr ""
#. TC: The IRC network e.g. EFnet.
-#: python/irc.py:438
+#: python/irc.py:444
msgid "Network"
msgstr "Rete"
#. TC: label for hostname entry.
-#: python/irc.py:440 python/sourceclientgui.py:206
+#: python/irc.py:446 python/sourceclientgui.py:208
msgid "Hostname"
msgstr "Nome host"
#. TC: TCP/IP port number label.
#. TC: TCP port number.
-#: python/irc.py:442 python/sourceclientgui.py:678
+#: python/irc.py:448 python/sourceclientgui.py:704
msgid "Port"
msgstr "Porta"
-#: python/irc.py:443
+#: python/irc.py:449
msgid "User name"
msgstr "Nome utente"
-#: python/irc.py:444 python/songdb.py:339 python/sourceclientgui.py:207
+#: python/irc.py:450 python/songdb.py:343 python/sourceclientgui.py:209
msgid "Password"
msgstr "Password"
#. TC: Second choice of IRC nickname.
-#: python/irc.py:448
+#: python/irc.py:454
msgid "Second choice"
msgstr "Seconda scelta"
#. TC: Third choice of IRC nickname.
-#: python/irc.py:450
+#: python/irc.py:456
msgid "Third choice"
msgstr "Terza scelta"
#. TC: The IRC user's 'real' name.
-#: python/irc.py:452
+#: python/irc.py:458
msgid "Real name"
msgstr "Nome reale"
#. TC: The NickServ password.
-#: python/irc.py:454
+#: python/irc.py:460
msgid "NickServ p/w"
msgstr "NickServ p/w"
#. TC: Tooltip to IRC 'User name' field.
-#: python/irc.py:459
+#: python/irc.py:465
msgid ""
"Ideally set this to something even on servers that allow public anonymous "
"access."
@@ -710,7 +727,7 @@ msgstr ""
"anonimo."
#. TC: tooltip to all IRC nicknames entry fields.
-#: python/irc.py:469
+#: python/irc.py:475
msgid ""
"When a nickname is in use on the target IRC network, during connection these "
"IRC nicknames are cycled through, then twice again after appending an "
@@ -722,7 +739,7 @@ msgstr ""
"trattino basso in coda fino a smettere. Questo fornisce a IDJC un massimo di "
"nove nickname IRC da provare."
-#: python/irc.py:474
+#: python/irc.py:480
msgid ""
"The real name you want to use which will be available regardless of whether "
"the network connection was made with the primary nickname or not.\n"
@@ -734,7 +751,7 @@ msgstr ""
"\n"
"Dovreste impostarlo."
-#: python/irc.py:477
+#: python/irc.py:483
msgid ""
"If this value is set an attempt will be made to acquire your first choice "
"IRC nickname (if needed) and log in with NickServ at services.\n"
@@ -748,7 +765,7 @@ msgstr ""
"L'utilizzo del servizio NickServ necessista la preventiva registrazione del "
"nickname sulla rete utilizzando un client regolare."
-#: python/irc.py:505
+#: python/irc.py:511
msgid ""
"<span weight='bold' size='12000'>Permanently delete this server?</span>\n"
"\n"
@@ -760,11 +777,11 @@ msgstr ""
"Questa azione eliminerà anche tutti i messaggi associati"
#. TC: An IRC channel #chan or user name entry box label.
-#: python/irc.py:552
+#: python/irc.py:559
msgid "Channels/Users"
msgstr "Canali/Utenti"
-#: python/irc.py:556
+#: python/irc.py:563
msgid ""
"The comma or space separated list of channels and/or users to whom the "
"message will be sent.\n"
@@ -779,11 +796,11 @@ msgstr ""
"#canale:parolachiave"
#. TC: Message text to send to an IRC channel. Widget label.
-#: python/irc.py:563
+#: python/irc.py:616
msgid "Message"
msgstr "Messaggio"
-#: python/irc.py:567
+#: python/irc.py:620
msgid ""
"The message to send.\n"
"\n"
@@ -801,17 +818,17 @@ msgstr ""
"XChat."
#. TC: Dialog window title text.
-#: python/irc.py:638
+#: python/irc.py:673
msgid "IRC track announce"
msgstr "Annuncio traccia IRC"
#. TC: Spinbutton label for a delay value.
-#: python/irc.py:645
+#: python/irc.py:680
msgid "Delay"
msgstr "Ritardo"
#. TC: tooltip on a spinbutton widget.
-#: python/irc.py:647
+#: python/irc.py:682
msgid ""
"The delay time of this message.\n"
"\n"
@@ -833,22 +850,22 @@ msgstr ""
"messaggio."
#. TC: Dialog window title text.
-#: python/irc.py:675
+#: python/irc.py:710
msgid "IRC timed message"
msgstr "Messaggio a tempo IRC"
#. TC: Spinbutton time offset value label.
-#: python/irc.py:684
+#: python/irc.py:719
msgid "Offset"
msgstr "Sfasamento"
#. TC: Spinbutton timed interval duration value label.
-#: python/irc.py:686
+#: python/irc.py:721
msgid "Interval"
msgstr "Intervallo"
#. TC: spinbutton tooltip
-#: python/irc.py:689
+#: python/irc.py:724
msgid ""
"The time offset within the below specified interval at which the message "
"will be issued."
@@ -856,220 +873,225 @@ msgstr ""
"Lo sfasamento con l'intervallo specificato qui sotto con cui il messaggio "
"verrà recapitato."
-#: python/irc.py:693
+#: python/irc.py:728
msgid "The interval in seconds of the timed message."
msgstr "L'intervallo in secondi del messaggio temporizzato"
-#: python/irc.py:930
+#: python/irc.py:967
#, fuzzy
msgid "This feature requires the installation of python-irc."
msgstr "Questa funzionalità necessita dell'installazione di python-irclib"
#. TC: Indicator text: We used a password.
-#: python/irc.py:1021
+#: python/irc.py:1058
msgid "PASSWORD"
msgstr ""
#. TC: Indicator text: We interact with NickServ.
-#: python/irc.py:1024
+#: python/irc.py:1061
msgid "NICKSERV"
msgstr ""
#. TC: Indicator text: Server connection started manually.
-#: python/irc.py:1027
+#: python/irc.py:1064
msgid "MANUAL"
msgstr ""
-#. TC: Expander text encapsulating messages that play when stream goes up.
-#: python/irc.py:1048
+#. TC: Dialog title text.
+#: python/irc.py:1089
msgid "IRC stream up message"
msgstr "Messaggio di in onda di IRC"
-#. TC: Expander text encapsulating messages that play when stream goes down.
-#: python/irc.py:1050
+#. TC: Dialog title text.
+#: python/irc.py:1091
msgid "IRC stream down message"
msgstr "Messaggio di fuori onda IRC"
-#: python/jingles.py:95
+#. TC: Dialog title text.
+#: python/irc.py:1093
+msgid "IRC station operations"
+msgstr ""
+
+#: python/jingles.py:96
#, fuzzy
msgid "Stop"
msgstr "Ferma"
#. TC: Column heading, whether to play.
-#: python/jingles.py:113 python/playergui.py:298
+#: python/jingles.py:114 python/playergui.py:299
msgid "Play"
msgstr "Riproduci"
-#: python/jingles.py:122 python/sourceclientgui.py:1025
+#: python/jingles.py:123 python/sourceclientgui.py:1051
msgid "Repeat"
msgstr "Ripeti"
-#: python/jingles.py:135
+#: python/jingles.py:136
#, fuzzy
msgid "Configure"
msgstr "Configurazione"
-#: python/jingles.py:326 python/playergui.py:4052
+#: python/jingles.py:327 python/playergui.py:4135
msgid "Supported media"
msgstr "Media supportati"
-#: python/jingles.py:333
+#: python/jingles.py:334
#, python-format
msgid "Effect %d Config"
msgstr ""
-#: python/jingles.py:348
+#: python/jingles.py:349
msgid "Trigger text"
msgstr ""
-#: python/jingles.py:349
+#: python/jingles.py:350
msgid "No Name"
msgstr ""
-#: python/jingles.py:356
+#: python/jingles.py:357
msgid "Level adjustment (dB)"
msgstr ""
-#: python/jingles.py:431
+#: python/jingles.py:432
#, fuzzy
msgid "Effects volume."
msgstr "VoIP imposta volume"
-#: python/jingles.py:438
+#: python/jingles.py:439
msgid "Player headroom that is applied when an effect is playing."
msgstr ""
-#: python/jingles.py:501
+#: python/jingles.py:502
#, fuzzy
msgid "Alternative"
msgstr "Alterna"
-#: python/jingles.py:502
+#: python/jingles.py:503
#, fuzzy
msgid "Default"
msgstr "Base"
-#: python/jingles.py:547
+#: python/jingles.py:548
#, fuzzy
msgid "Effects"
msgstr "Effetto"
-#: python/jingles.py:590
+#: python/jingles.py:591
#, fuzzy, python-format
msgid "Effects %d"
msgstr "Effetto"
-#: python/jingles.py:598 python/maingui.py:188
+#: python/jingles.py:599 python/maingui.py:189
msgid "Background Tracks"
msgstr ""
-#: python/jingles.py:617
+#: python/jingles.py:618
msgid "Background Tracks volume."
msgstr ""
-#: python/maingui.py:92
+#: python/maingui.py:93
msgid "Show a JACK freewheel control on the main panel"
msgstr ""
-#: python/maingui.py:94
+#: python/maingui.py:95
msgid "Toggle JACK freewheel mode."
msgstr ""
-#: python/maingui.py:167
+#: python/maingui.py:168
#, fuzzy
msgid "File"
msgstr "Nome file"
-#: python/maingui.py:167 python/preferences.py:1127
+#: python/maingui.py:168 python/preferences.py:1130
msgid "View"
msgstr "Vista"
-#: python/maingui.py:168
+#: python/maingui.py:169
msgid "JACK Ports"
msgstr "Porte JACK"
-#: python/maingui.py:168
+#: python/maingui.py:169
msgid "Help"
msgstr ""
-#: python/maingui.py:170 python/maingui.py:3653
+#: python/maingui.py:171 python/maingui.py:3689
msgid "Streams"
msgstr "Flussi"
-#: python/maingui.py:171
+#: python/maingui.py:172
#, fuzzy
msgid "Recorders"
msgstr "Registratore"
-#: python/maingui.py:184 python/maingui.py:223
+#: python/maingui.py:185 python/maingui.py:224
msgid "Output"
msgstr "Uscita"
-#: python/maingui.py:184
+#: python/maingui.py:185
msgid "Preferences"
msgstr "Preferenze"
-#: python/maingui.py:184
+#: python/maingui.py:185
msgid "Profiles"
msgstr "Profili"
-#: python/maingui.py:187 python/songdb.py:405
+#: python/maingui.py:188 python/songdb.py:409
#, fuzzy
msgid "Music Database"
msgstr "Database"
-#: python/maingui.py:187
+#: python/maingui.py:188
#, fuzzy
msgid "Channel Meters"
msgstr "Gestore canale"
-#: python/maingui.py:187
+#: python/maingui.py:188
#, fuzzy
msgid "Output Meters"
msgstr "Uscita"
-#: python/maingui.py:188
+#: python/maingui.py:189
msgid "Tabbed Area"
msgstr ""
-#: python/maingui.py:188
+#: python/maingui.py:189
msgid "Button Bar"
msgstr ""
-#: python/maingui.py:222 python/preferences.py:1482
+#: python/maingui.py:223 python/preferences.py:1485
msgid "Channels"
msgstr "Canali"
-#: python/maingui.py:222
+#: python/maingui.py:223
#, fuzzy
msgid "Players"
msgstr "Lettore"
-#: python/maingui.py:223
+#: python/maingui.py:224
msgid "VoIP"
msgstr ""
-#: python/maingui.py:223 python/maingui.py:3093
+#: python/maingui.py:224 python/maingui.py:3129
msgid "DSP"
msgstr ""
-#: python/maingui.py:223
+#: python/maingui.py:224
msgid "Mix"
msgstr ""
-#: python/maingui.py:223
+#: python/maingui.py:224
msgid "Misc"
msgstr ""
-#: python/maingui.py:268
+#: python/maingui.py:269
msgid "Reset"
msgstr ""
-#: python/maingui.py:271
+#: python/maingui.py:272
msgid "Reset the JACK port connections to the default settings."
msgstr ""
-#: python/maingui.py:276
+#: python/maingui.py:277
msgid ""
"<span size=\"12000\" weight=\"bold\">Reset all JACK port connections?</"
"span>\n"
@@ -1078,35 +1100,37 @@ msgid ""
"and replaced with defaults."
msgstr ""
-#: python/maingui.py:320
+#: python/maingui.py:321
msgid "No compatible ports available."
msgstr ""
-#: python/maingui.py:363
+#: python/maingui.py:364
+#, python-brace-format
msgid "{0} profile={1}:{2} settings saved."
msgstr ""
-#: python/maingui.py:366
+#: python/maingui.py:367
+#, python-brace-format
msgid "{0} session={1}:{2} settings saved."
msgstr ""
-#: python/maingui.py:670
+#: python/maingui.py:671
msgid "Text"
msgstr "Testo"
-#: python/maingui.py:673
+#: python/maingui.py:674
msgid "The opener button's text."
msgstr "Il testo del pulsante di apertura"
-#: python/maingui.py:681
+#: python/maingui.py:682
msgid "Icon"
msgstr "Icona"
-#: python/maingui.py:689
+#: python/maingui.py:690
msgid "The opener button's icon."
msgstr "L'iconda del pulsante di apertura."
-#: python/maingui.py:697
+#: python/maingui.py:698
msgid ""
"The headroom is the amount by which to reduce player volume when this opener "
"is active. Note that the actual amount will be the largest value of all the "
@@ -1116,15 +1140,15 @@ msgstr ""
"questo opener è attivo. Notare che la riduzione attuale sarà relativa al "
"valore più alto tra tutti i pulsanti aperti."
-#: python/maingui.py:702
+#: python/maingui.py:703
msgid "The amount of headroom required (dB)"
msgstr "La quantità di headroom richiesta (dB)"
-#: python/maingui.py:711
+#: python/maingui.py:712
msgid "This button will flash as a reminder to close"
msgstr "Questo pulsante lampeggerà per ricordarvi di chiuderlo"
-#: python/maingui.py:712
+#: python/maingui.py:713
msgid ""
"After a number of seconds where a main player is active this button's status "
"indicator will start to flash and will continue to do so until the button is "
@@ -1135,11 +1159,11 @@ msgstr ""
"a farlo finché il pulsante non sarà rilasciato o finché non verrò fermata la "
"riproduzione."
-#: python/maingui.py:720
+#: python/maingui.py:721
msgid "This button is to be treated as a microphone opener"
msgstr "Questo apre il microfono"
-#: python/maingui.py:722
+#: python/maingui.py:723
msgid ""
"The button will be grouped with the other microphone opener buttons. It will "
"be affected by signals to close microphone buttons. Channels associated with "
@@ -1150,79 +1174,83 @@ msgstr ""
"questo pulsante saranno missati in modo diverso quando vengono usate le "
"modalità VoIP."
-#: python/maingui.py:733
+#: python/maingui.py:732
+msgid "This button will automatically cancel JACK freewheel mode"
+msgstr ""
+
+#: python/maingui.py:734
msgid ""
"This should be set for all buttons that control input from a live sound "
"source or device."
msgstr ""
-#: python/maingui.py:736
+#: python/maingui.py:737
msgid "Button Open Triggers"
msgstr "Inneschi apertura pulsante"
-#: python/maingui.py:743
+#: python/maingui.py:744
msgid "Playlist advance button"
msgstr "Pulsante di avanzamento playlist"
-#: python/maingui.py:744 python/maingui.py:745
+#: python/maingui.py:745 python/maingui.py:746
#, python-format
msgid "'%s' control"
msgstr "controllo '%s'"
#. TC: Insert playlist control to stop the player.
-#: python/maingui.py:744 python/playergui.py:4310
+#: python/maingui.py:745 python/playergui.py:4393
msgid "Player Stop"
msgstr "Ferma lettore"
#. TC: Insert playlist control to stop the player.
-#: python/maingui.py:745 python/playergui.py:4317
+#: python/maingui.py:746 python/playergui.py:4400
msgid "Player Stop 2"
msgstr "Ferma lettore 2"
-#: python/maingui.py:746
+#: python/maingui.py:747
msgid "Announcements"
msgstr "Annunci"
-#: python/maingui.py:758
+#: python/maingui.py:759
msgid "When opened close these other buttons"
msgstr "Chiude questi altri pulsanti se aperto"
-#: python/maingui.py:769
+#: python/maingui.py:770
msgid "Shell Command"
msgstr "Comando Shell"
-#: python/maingui.py:770
+#: python/maingui.py:771
msgid ""
"Mostly useful issuing 'amixer' commands, in particular for setting capture."
msgstr ""
"Più utile se si lancia il comando 'amixer', in particolare per impostare la "
"registrazione."
-#: python/maingui.py:790
+#: python/maingui.py:791
msgid "On open"
msgstr "All'avvio"
-#: python/maingui.py:791
+#: python/maingui.py:792
msgid "On close"
msgstr "In chiusura"
-#: python/maingui.py:835
+#: python/maingui.py:836
msgid "Main Panel Opener Buttons"
msgstr "Pulsanti di apertura del pannello principale"
-#: python/maingui.py:847
+#: python/maingui.py:848
msgid "Indicate button numbers and associated channel numbers"
msgstr "Indica il numero dei pulsanti e dei numeri di canale associati"
-#: python/maingui.py:849
+#: python/maingui.py:850
msgid "A useful feature to have switched on while allocating channel openers."
msgstr "Una funzionalità utile da attivare mentre si allocano i canali"
-#: python/maingui.py:855
+#: python/maingui.py:856
msgid "Status Indicator Appearance"
msgstr "Aspetto dell'indicatore di stato"
-#: python/maingui.py:858
+#: python/maingui.py:859
msgid ""
"Each opener button has two vertical bars at the side to make the button "
"state more apparent. These settings control their appearance."
@@ -1230,28 +1258,28 @@ msgstr ""
"Ogni pulsante ha due barre verticali ai lati per renderne chiaro lo stato. "
"Queste impostazioni ne controllano la grafica."
-#: python/maingui.py:867
+#: python/maingui.py:868 python/format.py:827
msgid "Width"
msgstr "Larghezza"
-#: python/maingui.py:874
+#: python/maingui.py:875
msgid "Opened"
msgstr "Aperto"
-#: python/maingui.py:878 python/preferences.py:500 python/preferences.py:502
+#: python/maingui.py:879 python/preferences.py:503 python/preferences.py:505
msgid "Closed"
msgstr "Chiuso"
-#: python/maingui.py:883
+#: python/maingui.py:884
msgid "Remind"
msgstr "Ricorda"
#. TC: A placeholder text for when there are no opener buttons.
-#: python/maingui.py:1064
+#: python/maingui.py:1065
msgid "No Channel Opener Buttons"
msgstr "Nessun canale da abilitare"
-#: python/maingui.py:1353
+#: python/maingui.py:1354
msgid ""
"This indicates the state of the various streams. Flashing means stream "
"packets are being discarded because of network congestion. Partial red means "
@@ -1263,54 +1291,54 @@ msgstr ""
"indica che il buffer di invio è parzialmente pieno, ovvero difficoltà di "
"comunicazione con il server. Verde indica che tutto è a posto."
-#: python/maingui.py:1376
+#: python/maingui.py:1377
msgid "The combined total number of listeners in all server tabs."
msgstr "Il numero cumulato di ascoltatori per tutti i server."
#. TC: Record as in, to make a recording.
-#: python/maingui.py:1824 python/sourceclientgui.py:2702
+#: python/maingui.py:1825 python/sourceclientgui.py:2784
msgid "Record"
msgstr "Registra"
-#: python/maingui.py:2620
+#: python/maingui.py:2647
msgid "Confirmation to quit IDJC is required."
msgstr "Viene chiesta una conferma per chiudere IDJC."
-#: python/maingui.py:2624
+#: python/maingui.py:2651
msgid "All active recordings and radio streams will terminate."
msgstr "Tutte le registrazioni ed i flussi radio verranno interrotti."
-#: python/maingui.py:2626
+#: python/maingui.py:2653
msgid "All of the active radio streams will terminate."
msgstr "Tutti flussi radio verranno interrotti."
-#: python/maingui.py:2628
+#: python/maingui.py:2655
msgid "All active recordings will cease."
msgstr "Tutte le registrazioni verranno interrotte."
#. TC: Popup menu item, wipes away the tracks played history text.
-#: python/maingui.py:2885 python/maingui.py:3317
+#: python/maingui.py:2921 python/maingui.py:3353
msgid "Remove Contents"
msgstr "Rimuove i contenuti"
-#: python/maingui.py:3040
+#: python/maingui.py:3076
msgid "Renameable Labels"
msgstr ""
-#: python/maingui.py:3064
+#: python/maingui.py:3100
#, fuzzy
msgid "Main Players"
msgstr "Lettore destro"
-#: python/maingui.py:3117
+#: python/maingui.py:3153
msgid "Mix voice over IP audio to the output stream."
msgstr "Manda in onda l'audio del VoIP"
-#: python/maingui.py:3130
+#: python/maingui.py:3166
msgid "Mix voice over IP audio to the DJ only."
msgstr "Missa l'audio del VoIP solo al DJ"
-#: python/maingui.py:3157
+#: python/maingui.py:3193
msgid ""
"This button steps through the active playlist, pausing between tracks. The "
"active playlist is defined by the placement of the crossfader."
@@ -1318,44 +1346,45 @@ msgstr ""
"Questo pulsante scorre la playlist attiva facendo una pausa tra le tracce. "
"La playlist attiva viene dedotta dal posizionamento del crossfader"
-#: python/maingui.py:3202 python/preferences.py:870
+#: python/maingui.py:3238 python/preferences.py:873
msgid "The volume control shared by both music players."
msgstr "Il controllo del volume per entrambi i lettori"
-#: python/maingui.py:3213
+#: python/maingui.py:3249
msgid "The volume control for the right music player."
msgstr "Il volume del lettore di destra."
-#: python/maingui.py:3241
+#: python/maingui.py:3277
msgid "VoIP level adjustment. 0dB gain is at the mid point."
msgstr ""
-#: python/maingui.py:3264
+#: python/maingui.py:3300
msgid "The stream volume level to send to the voice over IP connection."
msgstr "Il volume del flusso da inviare alla connessione VoIP"
-#: python/maingui.py:3291 python/preferences.py:1410
+#: python/maingui.py:3327 python/preferences.py:1413
msgid "Tracks Played"
msgstr "Tracce eseguite"
-#: python/maingui.py:3362 python/maingui.py:3364 python/maingui.py:3388
+#: python/maingui.py:3398 python/maingui.py:3400 python/maingui.py:3424
msgid "Monitor Mix"
msgstr "Monitoraggio Mix"
-#: python/maingui.py:3371 python/maingui.py:3388 python/playergui.py:4251
+#: python/maingui.py:3407 python/maingui.py:3424 python/playergui.py:4334
msgid "DJ"
msgstr "DJ"
#. TC: binding editor, action pane, first row, toplevel menu.
-#: python/maingui.py:3374 python/maingui.py:3388 python/midicontrols.py:154
-#: python/midicontrols.py:1506 python/playergui.py:4243
-#: python/sourceclientgui.py:2710
+#: python/maingui.py:3410 python/maingui.py:3424 python/midicontrols.py:155
+#: python/midicontrols.py:1507 python/playergui.py:4326
+#: python/sourceclientgui.py:2792
msgid "Stream"
msgstr "Flusso"
#. TC: Context {0}, {1}, {2} = Monitor Mix, Stream, DJ
#. TC: Or whatever they become translated to.
-#: python/maingui.py:3384
+#: python/maingui.py:3420
+#, python-brace-format
msgid ""
"In IDJC there are are two audio paths and this '{0}' control toggles between "
"them. When '{1}' is active you can hear what the listeners are hearing "
@@ -1368,83 +1397,83 @@ msgstr ""
"impostato su '{2}' per utilizzare al meglio le funzionalità VoIP"
#. TC: Dropdown box title text widget.
-#: python/maingui.py:3397 python/maingui.py:3399
+#: python/maingui.py:3433 python/maingui.py:3435
msgid "Metadata Source"
msgstr "Sorgente dei metadati"
#. TC: The chosen source of track metadata.
-#: python/maingui.py:3405 python/playergui.py:3961
+#: python/maingui.py:3441 python/playergui.py:4044
msgid "Playlist 1"
msgstr "Playlist 1"
#. TC: The chosen source of track metadata.
-#: python/maingui.py:3407 python/playergui.py:3962
+#: python/maingui.py:3443 python/playergui.py:4045
msgid "Playlist 2"
msgstr "Playlist 2"
#. TC: The chosen source of track metadata.
-#: python/maingui.py:3409
+#: python/maingui.py:3445 python/songdb.py:909 python/songdb.py:1293
msgid "Last Played"
msgstr "Ultima eseguita"
#. TC: The chosen source of track metadata.
-#: python/maingui.py:3411 python/maingui.py:3448 python/maingui.py:3450
+#: python/maingui.py:3447 python/maingui.py:3484 python/maingui.py:3486
msgid "Crossfader"
msgstr "Crossfader"
#. TC: The chosen source of track metadata. In this case no metadata.
#. TC: Fade time is zero. No fade, none.
-#: python/maingui.py:3413 python/playergui.py:4226
+#: python/maingui.py:3449 python/playergui.py:4309
msgid "None"
msgstr "Nessuna"
#. TC: The chosen source of track metadata. In this case no metadata.
-#: python/maingui.py:3415
+#: python/maingui.py:3451
msgid "Playlist 3"
msgstr "Playlist 3"
-#: python/maingui.py:3420
+#: python/maingui.py:3456
#, fuzzy
msgid "Select the origin for the playing track metadata on the stream."
msgstr "Seleziona quale Deck è responsabile dei metadati del flusso"
#. TC: Abbreviation of left.
-#: python/maingui.py:3430 python/maingui.py:3432
+#: python/maingui.py:3466 python/maingui.py:3468
msgid "L"
msgstr "L"
-#: python/maingui.py:3442
+#: python/maingui.py:3478
msgid "Move the crossfader fully left."
msgstr "Sposta il crossfader a sinistra"
-#: python/maingui.py:3462
+#: python/maingui.py:3498
msgid "The crossfader."
msgstr "Il crossfader"
#. TC: Abbreviation of right.
-#: python/maingui.py:3466 python/maingui.py:3468
+#: python/maingui.py:3502 python/maingui.py:3504
msgid "R"
msgstr "R"
-#: python/maingui.py:3478
+#: python/maingui.py:3514
msgid "Move the crossfader fully right."
msgstr "Sposta il crossfader a destra"
#. TC: Describes a mid point.
-#: python/maingui.py:3487 python/maingui.py:3489
+#: python/maingui.py:3523 python/maingui.py:3525
msgid "Middle"
msgstr "Mezzo/Metà"
-#: python/maingui.py:3506 python/maingui.py:3513
+#: python/maingui.py:3542 python/maingui.py:3549
msgid "Move the crossfader to the middle of its range of travel."
msgstr "Sposta il crossfader a metà della corsa"
#. TC: The attenuation response curve of the crossfader. User selectable.
-#: python/maingui.py:3518 python/maingui.py:3520
+#: python/maingui.py:3554 python/maingui.py:3556
msgid "Response"
msgstr "Risposta"
-#: python/maingui.py:3542
+#: python/maingui.py:3578
msgid ""
"This selects the response curve of the crossfader.\n"
"\n"
@@ -1454,11 +1483,11 @@ msgstr ""
"Le attenuzioni nel punto di mezzo sono -3dB, 0dB e -22dB rispettivamente."
#. TC: Duration in seconds.
-#: python/maingui.py:3556 python/maingui.py:3558
+#: python/maingui.py:3592 python/maingui.py:3594
msgid "Time"
msgstr "Tempo"
-#: python/maingui.py:3575
+#: python/maingui.py:3611
msgid ""
"The time in seconds that the crossfader will take to automatically pass "
"across when the button to the right is clicked."
@@ -1468,11 +1497,11 @@ msgstr ""
#. TC: The crossfader pass-across button text.
#. TC: The actual button appears as [<-->] with this text above it.
-#: python/maingui.py:3584 python/maingui.py:3586
+#: python/maingui.py:3620 python/maingui.py:3622
msgid "Pass"
msgstr "Avvia"
-#: python/maingui.py:3599
+#: python/maingui.py:3635
msgid ""
"This button causes the crossfader to move to the opposite side at a speed "
"determined by the speed selector to the left."
@@ -1480,32 +1509,32 @@ msgstr ""
"Questo pulsante muove il crossfader fino alla parte opposta nel lasso di "
"tempo specificato qui a sinistra"
-#: python/maingui.py:3642
+#: python/maingui.py:3678
#, fuzzy
msgid "Peak"
msgstr "Str Peak"
-#: python/maingui.py:3645
+#: python/maingui.py:3681
msgid "A peak hold meter indicating the signal strength of the stream audio."
msgstr ""
"Un indicatore a tenuta di picco che indica la potenza del segnale audio "
"trasmesso."
#. TC: This text appears above the stream mix VU meter.
-#: python/maingui.py:3667
+#: python/maingui.py:3703
msgid "VU"
msgstr ""
-#: python/maingui.py:3671
+#: python/maingui.py:3707
msgid "A VU meter for the stream audio."
msgstr "Indicatore VU per il flusso audio"
#. TC: Appears above the mic meters as a label followed by a number.
-#: python/maingui.py:3674
+#: python/maingui.py:3710
msgid "Ch"
msgstr "Ch"
-#: python/maingui.py:3701
+#: python/maingui.py:3737
msgid ""
"A peak hold meter indicating the microphone signal strength and a meter "
"indicating attenuation levels in the microphone signal processing system. "
@@ -1518,484 +1547,484 @@ msgstr ""
"esser. Il rosso del limiter."
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:47
+#: python/midicontrols.py:48
#, fuzzy
msgid "Tooltips enable"
msgstr "VoIP abilita l'uscita"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:49
+#: python/midicontrols.py:50
msgid "DJ-mix monitor"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:51
+#: python/midicontrols.py:52
msgid "Panning load from presets"
msgstr ""
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:53
+#: python/midicontrols.py:54
msgid "Player play/pause"
msgstr "Lettore riproduci/pausa"
#. TC: Control method. Please keep it as Target:Action.
#. TC: Playlist control.
-#: python/midicontrols.py:55 python/playergui.py:3719
+#: python/midicontrols.py:56 python/playergui.py:3798
msgid "Player stop"
msgstr "Lettore ferma"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:57
+#: python/midicontrols.py:58
msgid "Player advance"
msgstr "Lettore avanza"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:59
+#: python/midicontrols.py:60
msgid "Player play previous"
msgstr "Lettore suona la precedente"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:61
+#: python/midicontrols.py:62
msgid "Player play next"
msgstr "Lettore suona la prossima"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:63
+#: python/midicontrols.py:64
msgid "Player play selected from start"
msgstr "Lettore suona la selezione dall'inizio"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:65
+#: python/midicontrols.py:66
msgid "Player select previous"
msgstr "Lettore seleziona la precedente"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:67
+#: python/midicontrols.py:68
msgid "Player select next"
msgstr "Lettore seleziona la successiva"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:69
+#: python/midicontrols.py:70
msgid "Player stream output enable"
msgstr "Lettore abilita il flusso"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:71
+#: python/midicontrols.py:72
msgid "Player DJ output enable"
msgstr "Lettore abilita l'uscita DJ"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:73
+#: python/midicontrols.py:74
msgid "Player DJ-only switch"
msgstr "Lettore solo al DJ "
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:75
+#: python/midicontrols.py:76
msgid "Player set volume"
msgstr "Lettore Imposta il volume"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:77
+#: python/midicontrols.py:78
msgid "Player set gain"
msgstr "Lettore imposta il gain"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:79
+#: python/midicontrols.py:80
msgid "Player set balance"
msgstr "Lettore imposta il bilanciamento"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:81
+#: python/midicontrols.py:82
msgid "Player set pitchbend"
msgstr "Lettore imposta variazione tono"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:84
+#: python/midicontrols.py:85
msgid "Playlist edit tags"
msgstr "Playlist modifica i tag"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:86
+#: python/midicontrols.py:87
msgid "Playlist insert stop"
msgstr "Playlist inserisci stop"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:88
+#: python/midicontrols.py:89
msgid "Playlist insert stop 2"
msgstr "Playlist inserisci stop 2"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:90
+#: python/midicontrols.py:91
msgid "Playlist insert announce"
msgstr "Lettore inserisci annuncio"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:92
+#: python/midicontrols.py:93
msgid "Playlist insert transfer"
msgstr "Lettore inserisci trasferimento"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:94
+#: python/midicontrols.py:95
msgid "Playlist insert crossfade"
msgstr "Playlist inserisci dissolvenza"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:96
+#: python/midicontrols.py:97
msgid "Playlist insert pitchunbend"
msgstr "Playlist inserisci abbassamento tono"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:98
+#: python/midicontrols.py:99
msgid "Playlist insert jump to top"
msgstr "Playlist inserisci salto all'inizio"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:101
+#: python/midicontrols.py:102
msgid "Players set crossfade"
msgstr "Lettori imposta dissolvenza"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:103
+#: python/midicontrols.py:104
msgid "Players pass crossfade"
msgstr "Lettori supera dissolvenza"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:105
+#: python/midicontrols.py:106
msgid "Players set focus"
msgstr "Lettori imposta focus"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:107
+#: python/midicontrols.py:108
msgid "Players show pitchbend"
msgstr "Lettori mostra alzamento tono"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:109
+#: python/midicontrols.py:110
#, fuzzy
msgid "Players advance"
msgstr "Lettore avanza"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:112
+#: python/midicontrols.py:113
msgid "Channel output enable"
msgstr "Canale abilita l'uscita"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:114
+#: python/midicontrols.py:115
msgid "Channel set volume"
msgstr "Canale imposta volume"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:116
+#: python/midicontrols.py:117
msgid "Channel set gain"
msgstr "Canale imposta guadagno"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:118
+#: python/midicontrols.py:119
msgid "Channel set balance"
msgstr "Canale imposta bilanciameno"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:121
+#: python/midicontrols.py:122
msgid "VoIP output enable"
msgstr "VoIP abilita l'uscita"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:123
+#: python/midicontrols.py:124
msgid "VoIP DJ-only switch"
msgstr "VoIP solo al DJ"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:125
+#: python/midicontrols.py:126
msgid "VoIP set volume"
msgstr "VoIP imposta volume"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:127
+#: python/midicontrols.py:128
#, fuzzy
msgid "VoIP set mixback"
msgstr "VoIP imposta il bilanciamento"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:129
+#: python/midicontrols.py:130
msgid "VoIP set gain"
msgstr "VoIP imposta guadagno"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:131
+#: python/midicontrols.py:132
msgid "VoIP set balance"
msgstr "VoIP imposta il bilanciamento"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:134
+#: python/midicontrols.py:135
#, fuzzy
msgid "Effect play from start"
msgstr "Stacchetto suona dall'inizio"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:137
+#: python/midicontrols.py:138
#, fuzzy
msgid "Effects stop many"
msgstr "VoIP imposta volume"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:139
+#: python/midicontrols.py:140
#, fuzzy
msgid "Effects set volume"
msgstr "VoIP imposta volume"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:141
+#: python/midicontrols.py:142
#, fuzzy
msgid "Effects set headroom"
msgstr "Stacchetti seleziona il successivo"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:144
+#: python/midicontrols.py:145
msgid "Stream set connected"
msgstr "Flusso imposta connessione"
#. TC: Control method. Please keep it as Target:Action.
-#: python/midicontrols.py:147
+#: python/midicontrols.py:148
msgid "Recorder set recording"
msgstr "Registratore imposta registrazione"
#. TC: binding editor, action pane, first row, toplevel menu.
-#: python/midicontrols.py:151 python/midicontrols.py:1492
+#: python/midicontrols.py:152 python/midicontrols.py:1493
msgid "Player"
msgstr "Lettore"
#. TC: binding editor, action pane, first row, toplevel menu.
#. TC: The midi channel.
#. TC: Specifically, the numerical midi channel.
-#: python/midicontrols.py:152 python/midicontrols.py:1498
-#: python/midicontrols.py:1567 python/midicontrols.py:1757
+#: python/midicontrols.py:153 python/midicontrols.py:1499
+#: python/midicontrols.py:1568 python/midicontrols.py:1758
msgid "Channel"
msgstr "Canale"
-#: python/midicontrols.py:153 python/preferences.py:596
-#: python/preferences.py:606
+#: python/midicontrols.py:154 python/preferences.py:599
+#: python/preferences.py:609
msgid "Effect"
msgstr "Effetto"
-#: python/midicontrols.py:155
+#: python/midicontrols.py:156
msgid "Recorder"
msgstr "Registratore"
-#: python/midicontrols.py:156
+#: python/midicontrols.py:157
#, fuzzy
msgid "Setting"
msgstr "Modificatori"
-#: python/midicontrols.py:160
+#: python/midicontrols.py:161
msgid "Left player"
msgstr "Lettore sinistro"
-#: python/midicontrols.py:161
+#: python/midicontrols.py:162
msgid "Right player"
msgstr "Lettore destro"
-#: python/midicontrols.py:162
+#: python/midicontrols.py:163
#, fuzzy
msgid "Background player"
msgstr "Lettore attivo"
-#: python/midicontrols.py:163
+#: python/midicontrols.py:164
msgid "Focused player"
msgstr "Lettore attivo"
-#: python/midicontrols.py:164
+#: python/midicontrols.py:165
msgid "Fadered player"
msgstr "Lettore inattivo"
-#: python/midicontrols.py:168
+#: python/midicontrols.py:169
#, fuzzy
msgid "Effects bank 1"
msgstr "Effetto"
-#: python/midicontrols.py:169
+#: python/midicontrols.py:170
#, fuzzy
msgid "Effects bank 2"
msgstr "Effetto"
-#: python/midicontrols.py:170
+#: python/midicontrols.py:171
#, fuzzy
msgid "All effects"
msgstr "Stacchetti seleziona il successivo"
#. TC: The name of the backspace key.
-#: python/midicontrols.py:404
+#: python/midicontrols.py:405
msgid "BackSpace"
msgstr "BackSpace"
#. TC: binding editor, action pane, third row, heading text.
-#: python/midicontrols.py:1468
+#: python/midicontrols.py:1469
msgid "Use value"
msgstr "Usa valore"
#. TC: binding editor, action pane, third row, heading text.
-#: python/midicontrols.py:1470
+#: python/midicontrols.py:1471
msgid "Act if"
msgstr "Agisci se"
#. TC: binding editor, action pane, third row, heading text.
-#: python/midicontrols.py:1472
+#: python/midicontrols.py:1473
msgid "Set to"
msgstr "Imposta a"
#. TC: binding editor, action pane, third row, heading text.
-#: python/midicontrols.py:1474
+#: python/midicontrols.py:1475
msgid "Adjust by"
msgstr "Regola di"
#. TC: binding editor, input pane, fourth row, heading text.
-#: python/midicontrols.py:1479 python/midicontrols.py:1483
+#: python/midicontrols.py:1480 python/midicontrols.py:1484
msgid "Control"
msgstr "Controllo"
#. TC: binding editor, input pane, fourth row, heading text.
-#: python/midicontrols.py:1481
+#: python/midicontrols.py:1482
msgid "Note"
msgstr "Nota"
#. TC: binding editor, input pane, fourth row, heading text.
-#: python/midicontrols.py:1485
+#: python/midicontrols.py:1486
msgid "Key"
msgstr "Tasto"
#. TC: binding editor, action pane, first row, toplevel menu.
-#: python/midicontrols.py:1490
+#: python/midicontrols.py:1491
#, fuzzy
msgid "Miscellaneous"
msgstr "Impostazioni varie"
#. TC: binding editor, action pane, first row, toplevel menu.
-#: python/midicontrols.py:1494
+#: python/midicontrols.py:1495
msgid "Both players"
msgstr "Entrambi i lettori"
#. TC: binding editor, action pane, first row, toplevel menu.
-#: python/midicontrols.py:1496
+#: python/midicontrols.py:1497
msgid "Quick panning"
msgstr ""
#. TC: binding editor, action pane, first row, toplevel menu.
-#: python/midicontrols.py:1500
+#: python/midicontrols.py:1501
msgid "VoIP channel"
msgstr "Canale VoIP"
#. TC: binding editor, action pane, first row, toplevel menu.
-#: python/midicontrols.py:1502
+#: python/midicontrols.py:1503
#, fuzzy
msgid "Single effect"
msgstr "Stacchetti seleziona il successivo"
#. TC: binding editor, action pane, first row, toplevel menu.
-#: python/midicontrols.py:1504
+#: python/midicontrols.py:1505
#, fuzzy
msgid "Effects bank"
msgstr "Effetto"
#. TC: binding editor, action pane, first row, toplevel menu.
-#: python/midicontrols.py:1508
+#: python/midicontrols.py:1509
msgid "Stream recorder"
msgstr "Flusso registratore "
#. TC: binding editor, action pane, second row, dropdown text.
-#: python/midicontrols.py:1513
+#: python/midicontrols.py:1514
msgid "Direct fader/held button"
msgstr "Pulsante cursore/premuto"
#. TC: binding editor, action pane, second row, dropdown text.
-#: python/midicontrols.py:1515
+#: python/midicontrols.py:1516
msgid "One-shot/toggle button"
msgstr "Pulsante a singolo colpo"
#. TC: binding editor, action pane, second row, dropdown text.
-#: python/midicontrols.py:1517
+#: python/midicontrols.py:1518
msgid "Set value"
msgstr "Imposta valore"
#. TC: binding editor, action pane, second row, dropdown text.
-#: python/midicontrols.py:1519
+#: python/midicontrols.py:1520
msgid "Alter value"
msgstr "Altera valore"
#. TC: binding editor, input pane, second row, dropdown text.
-#: python/midicontrols.py:1524
+#: python/midicontrols.py:1525
msgid "MIDI control"
msgstr "MIDI controllo"
#. TC: binding editor, input pane, second row, dropdown text.
-#: python/midicontrols.py:1526
+#: python/midicontrols.py:1527
msgid "MIDI note"
msgstr "MIDI nota"
#. TC: binding editor, input pane, second row, dropdown text.
-#: python/midicontrols.py:1528
+#: python/midicontrols.py:1529
msgid "MIDI pitch-wheel"
msgstr "MIDI controllo della tonalità "
#. TC: binding editor, input pane, second row, dropdown text.
-#: python/midicontrols.py:1530
+#: python/midicontrols.py:1531
msgid "Keyboard press"
msgstr "Azione da tastiera"
#. TC: binding editor, input pane, second row, dropdown text.
-#: python/midicontrols.py:1532
+#: python/midicontrols.py:1533
msgid "XChat command"
msgstr "XChat comando"
#. TC: Dialog window title text.
#. TC: User is expected to edit a control binding.
-#: python/midicontrols.py:1541
+#: python/midicontrols.py:1542
msgid "Edit control binding"
msgstr "Modifica le scorciatoie per i controlli"
#. TC: After clicking this button the binding editor will be listening
#. TC: for a key press or midi control surface input.
#. TC: Button text. If pressed triggers 'Listening for input' mode.
-#: python/midicontrols.py:1556 python/midicontrols.py:1637
-#: python/midicontrols.py:1736
+#: python/midicontrols.py:1557 python/midicontrols.py:1638
+#: python/midicontrols.py:1737
msgid "Listen for input..."
msgstr "In attesa di input..."
#. TC: The input source.
-#: python/midicontrols.py:1564
+#: python/midicontrols.py:1565
msgid "Source"
msgstr "Fonte"
#. TC: The manner in which the input is interpreted.
-#: python/midicontrols.py:1583
+#: python/midicontrols.py:1584
msgid "Interaction"
msgstr "Interazione"
#. TC: The effect of the control can be directed upon a specific target.
#. TC: e.g. On target [Left player]
-#: python/midicontrols.py:1589
+#: python/midicontrols.py:1590
msgid "On target"
msgstr "Obiettivo"
#. TC: Checkbutton text.
#. TC: Use reverse scale and invert the meaning of button presses.
-#: python/midicontrols.py:1597
+#: python/midicontrols.py:1598
msgid "Reversed"
msgstr "Invertito"
-#: python/midicontrols.py:1598
+#: python/midicontrols.py:1599
msgid "Pressed"
msgstr "Premuto"
-#: python/midicontrols.py:1600
+#: python/midicontrols.py:1601
msgid "Released"
msgstr "Rilasciato"
#. TC: Tree column heading for Inputs e.g. Backspace, F1, S.
-#: python/midicontrols.py:1630 python/midicontrols.py:1991
+#: python/midicontrols.py:1631 python/midicontrols.py:1992
msgid "Input"
msgstr "Ingresso"
-#: python/midicontrols.py:1634
+#: python/midicontrols.py:1635
#, python-format
msgid ""
"The first half of a binding is the input which comes in the form of the "
@@ -2010,32 +2039,32 @@ msgstr ""
"dell'opzione '%s'."
#. TC: Tree column heading for actions e.g. Player stop.
-#: python/midicontrols.py:1670 python/midicontrols.py:1676
-#: python/midicontrols.py:2005
+#: python/midicontrols.py:1671 python/midicontrols.py:1677
+#: python/midicontrols.py:2006
msgid "Action"
msgstr "Azione"
#. TC: %s is the translation of 'Action'.
-#: python/midicontrols.py:1675
+#: python/midicontrols.py:1676
#, python-format
msgid "The '%s' pane determines how the input is handled, and to what effect."
msgstr ""
"Il pannello '%s' determina come viene gestito l'ingresso e con quale effetto."
-#: python/midicontrols.py:1732
+#: python/midicontrols.py:1733
msgid "Listening for input"
msgstr "In attesta di input"
#. TC: Refers to key modifiers including Ctrl, Alt, Shift, ....
-#: python/midicontrols.py:1753
+#: python/midicontrols.py:1754
msgid "Shifting"
msgstr "Modificatori"
-#: python/midicontrols.py:1952
+#: python/midicontrols.py:1953
msgid "Singular control"
msgstr "Controllo unico"
-#: python/midicontrols.py:2014
+#: python/midicontrols.py:2015
msgid "Target"
msgstr "Obiettivo"
@@ -2089,7 +2118,7 @@ msgid " Additional Text Frames "
msgstr " Riquadri di testo aggiuntivi "
#. TC: The album track number.
-#: python/mutagentagger.py:376 python/songdb.py:789 python/songdb.py:1160
+#: python/mutagentagger.py:376 python/songdb.py:906 python/songdb.py:1295
msgid "Track"
msgstr "Traccia"
@@ -2115,232 +2144,268 @@ msgstr "Nome file:"
msgid "Native"
msgstr "Nativo"
-#: python/songdb.py:174
+#: python/songdb.py:177
#, fuzzy
msgid "Connecting"
msgstr "Connessione"
-#: python/songdb.py:183
+#: python/songdb.py:188
#, fuzzy, python-format
msgid "Connection failed (try %d)"
msgstr "Timer di connessione:"
-#: python/songdb.py:195
-msgid "Connected: utf-8 mode failed"
+#: python/songdb.py:199
+msgid "Connected: autocommit mode failed"
+msgstr ""
+
+#: python/songdb.py:201
+msgid "Connected: autocommit mode set"
msgstr ""
-#: python/songdb.py:197
+#: python/songdb.py:202
#, fuzzy
msgid "Connected"
msgstr "Connetti"
-#: python/songdb.py:205
+#: python/songdb.py:210
msgid "Job dropped"
msgstr ""
-#: python/songdb.py:215 python/songdb.py:427
+#: python/songdb.py:220 python/songdb.py:431
#, fuzzy
msgid "Disconnected"
msgstr "Disconnetti"
-#: python/songdb.py:229
+#: python/songdb.py:233
msgid "Problem dropping connection"
msgstr ""
-#: python/songdb.py:231
+#: python/songdb.py:235
#, fuzzy
msgid "Connection dropped"
msgstr "Connessione"
-#: python/songdb.py:322
+#: python/songdb.py:326
#, fuzzy
msgid "Hostname[:Port]"
msgstr "Nome host"
-#: python/songdb.py:327
+#: python/songdb.py:331
#, fuzzy
msgid "User Name"
msgstr "Nome utente"
-#: python/songdb.py:330
+#: python/songdb.py:334
msgid "Database"
msgstr "Database"
-#: python/songdb.py:385
+#: python/songdb.py:389
#, fuzzy
msgid "Prokyon3 or Ampache (song title) Database"
msgstr "Prokyon3 (titolo canzone) Database"
-#: python/songdb.py:386
+#: python/songdb.py:390
msgid ""
"You can make certain media databases accessible in IDJC for easy drag and "
"drop into the playlists."
msgstr ""
-#: python/songdb.py:434
+#: python/songdb.py:438
#, fuzzy
msgid "Module mysql-python (MySQLdb) required"
msgstr "E' necessario il modulo Python MySQLdb"
-#: python/songdb.py:675 python/songdb.py:680
+#: python/songdb.py:707 python/songdb.py:723 python/songdb.py:747
+#: python/songdb.py:805
msgid "<unknown>"
msgstr "<sconosciuto>"
-#: python/songdb.py:761
+#: python/songdb.py:741
+#, fuzzy
+msgid "Not Played"
+msgstr "Ultima eseguita"
+
+#: python/songdb.py:878
msgid "Reload the database."
msgstr ""
-#: python/songdb.py:766
+#: python/songdb.py:883
msgid "Expand entire tree."
msgstr ""
-#: python/songdb.py:767
+#: python/songdb.py:884
#, fuzzy
msgid "Collapse tree."
msgstr "_Collassa"
-#: python/songdb.py:774
+#: python/songdb.py:891
msgid "Browse"
msgstr ""
#. TC: The disk number of the album track.
-#: python/songdb.py:787 python/songdb.py:1159
+#: python/songdb.py:904 python/songdb.py:1294
msgid "Disk"
msgstr ""
#. TC: Track playback time.
#. TC: Playback time.
-#: python/songdb.py:791 python/songdb.py:1162 python/playergui.py:312
+#: python/songdb.py:908 python/songdb.py:1296 python/playergui.py:313
msgid "Duration"
msgstr "Durata"
-#: python/songdb.py:792 python/songdb.py:1163
+#: python/songdb.py:910 python/songdb.py:1297 python/format.py:594
+#: python/format.py:615 python/format.py:701 python/format.py:722
+#: python/format.py:857 python/format.py:962 python/format.py:1012
+#: python/format.py:1022
msgid "Bitrate"
msgstr "Bitrate"
-#: python/songdb.py:793 python/songdb.py:1164
+#: python/songdb.py:911 python/songdb.py:1298
msgid "Filename"
msgstr "Nome file"
#. TC: Directory path to a file.
-#: python/songdb.py:795 python/songdb.py:1165
+#: python/songdb.py:913 python/songdb.py:1299
msgid "Path"
msgstr "Percorso"
-#: python/songdb.py:800
+#: python/songdb.py:918
msgid "Artist - Album - Title"
msgstr ""
-#: python/songdb.py:801
+#: python/songdb.py:919
msgid "Album - [Disk] - Title"
msgstr ""
-#: python/songdb.py:821
+#: python/songdb.py:939
msgid "Fetching"
msgstr ""
-#: python/songdb.py:953
+#: python/songdb.py:1084
msgid "Tree fetch failed"
msgstr ""
-#: python/songdb.py:955
+#: python/songdb.py:1085
msgid "Fetch Failed!"
msgstr ""
-#: python/songdb.py:968
+#: python/songdb.py:1098
msgid "Populating"
msgstr "Sto popolando"
-#: python/songdb.py:1094
+#: python/songdb.py:1224
#, python-format
msgid "Disk %d"
msgstr ""
#. TC: User specified search filter entry box title text.
-#: python/songdb.py:1113
+#: python/songdb.py:1243
msgid "Filters"
msgstr "Filtri"
#. TC: A type of search on any data field matching paritial strings.
-#: python/songdb.py:1125
+#: python/songdb.py:1255
msgid "Fuzzy Search"
msgstr "Ricerca approssimativa"
#. TC: WHERE is an SQL keyword.
-#: python/songdb.py:1134
+#: python/songdb.py:1264
msgid "WHERE"
msgstr "WHERE"
-#: python/songdb.py:1147
+#: python/songdb.py:1277
#, fuzzy
msgid "Search"
msgstr "Ricerca approssimativa"
-#: python/songdb.py:1440
+#: python/songdb.py:1514 python/songdb.py:1639
+msgid "Minutes"
+msgstr ""
+
+#: python/songdb.py:1514 python/songdb.py:1639
+#, fuzzy
+msgid "Hours"
+msgstr "Colori"
+
+#: python/songdb.py:1515 python/songdb.py:1639
+msgid "Days"
+msgstr ""
+
+#: python/songdb.py:1515 python/songdb.py:1639 python/songdb.py:1709
+#: python/songdb.py:1803
+msgid "Weeks"
+msgstr ""
+
+#: python/songdb.py:1609
msgid "Catalogs"
msgstr ""
-#: python/songdb.py:1445
+#: python/songdb.py:1616
#, fuzzy
msgid "Name"
msgstr "Nome utente"
-#: python/songdb.py:1446
+#: python/songdb.py:1617
msgid "Catalog Path"
msgstr ""
-#: python/songdb.py:1447
+#: python/songdb.py:1618
#, fuzzy
msgid "Prepend Path"
msgstr "Prependi"
-#: python/songdb.py:1462
+#: python/songdb.py:1626
+#, fuzzy
+msgid "Last Played Scale"
+msgstr "Ultima eseguita"
+
+#: python/songdb.py:1658
#, fuzzy
msgid "Path Peel"
msgstr "Percorso"
-#: python/songdb.py:1528
+#: python/songdb.py:1737
msgid "N/A"
msgstr ""
-#: python/songdb.py:1703
+#: python/songdb.py:1918
#, fuzzy
msgid "Failed to create FULLTEXT index"
msgstr "errore nella creazione del profilo: %s"
-#: python/songdb.py:1707
+#: python/songdb.py:1922
msgid "Found existing FULLTEXT index"
msgstr ""
-#: python/songdb.py:1721 python/songdb.py:1734
+#: python/songdb.py:1936 python/songdb.py:1949
#, fuzzy
msgid "Unrecognised database"
msgstr "data di registrazione"
-#: python/songdb.py:1729
+#: python/songdb.py:1944
msgid "Found Prokyon 3 schema"
msgstr ""
-#: python/playergui.py:235
+#: python/playergui.py:236
msgid "Cuesheet Playlist"
msgstr "Playlist da file cue"
#. TC: Column heading, the track number.
-#: python/playergui.py:301
+#: python/playergui.py:302
msgid "Trk"
msgstr "Trk"
#. TC: Column heading, the index number.
-#: python/playergui.py:304
+#: python/playergui.py:305
msgid "Ind"
msgstr "Ind"
-#: python/playergui.py:413
+#: python/playergui.py:414
msgid "External Playlist"
msgstr "Playlist esterna"
#. TC: Button text to activate an external playlist.
-#: python/playergui.py:424
+#: python/playergui.py:425
msgid "Active"
msgstr "Attivo"
@@ -2368,243 +2433,253 @@ msgstr "Crea un nuovo annuncio"
msgid "Modify or Delete this announcement"
msgstr "Modifica o elimina questo annuncio"
-#. TC: Playlist control.
#. TC: Embed a DJ announcement text into the playlist.
-#: python/playergui.py:528 python/playergui.py:3709 python/playergui.py:4347
+#: python/playergui.py:528 python/playergui.py:4430
msgid "Announcement"
msgstr "Avviso"
#. TC: The time format as minutes and seconds.
-#: python/playergui.py:555
+#: python/playergui.py:556
msgid "mm:ss"
msgstr "mm:ss"
#. TC: Alongside the name of the next track.
-#: python/playergui.py:608
+#: python/playergui.py:609
msgid "Next track"
msgstr "Traccia successiva"
-#: python/playergui.py:933
+#: python/playergui.py:934
msgid "By Extension"
msgstr "Per estensione"
-#: python/playergui.py:933
+#: python/playergui.py:934
msgid "M3U playlist"
msgstr "Playlist M3U"
#: python/playergui.py:934
+#, fuzzy
+msgid "M3U8 playlist"
+msgstr "Playlist M3U"
+
+#: python/playergui.py:935
msgid "XSPF playlist"
msgstr "XSPF playlist"
-#: python/playergui.py:934
+#: python/playergui.py:935
msgid "PLS playlist"
msgstr "PLS playlist"
-#: python/playergui.py:1006
+#: python/playergui.py:1007
#, python-format
msgid "%d Audio Tracks"
msgstr ""
#. TC: Missing metadata text.
-#: python/playergui.py:1016
+#: python/playergui.py:1017
msgid "Unknown"
msgstr "Sconosciuto"
-#: python/playergui.py:1020
+#: python/playergui.py:1021
msgid "(Cue sheet)"
msgstr "(Elementi del file cue)"
-#: python/playergui.py:1054
+#: python/playergui.py:1058
msgid "Bad Tag"
msgstr "Tag errato"
-#: python/playergui.py:1830 python/playergui.py:4185
+#: python/playergui.py:1888 python/playergui.py:4268
msgid "Manual"
msgstr "Manuale"
-#: python/playergui.py:1834 python/playergui.py:4182
+#: python/playergui.py:1892 python/playergui.py:4265
msgid "Play All"
msgstr "Riproduci tutto"
-#: python/playergui.py:1842 python/playergui.py:1851 python/playergui.py:4183
+#: python/playergui.py:1900 python/playergui.py:1909 python/playergui.py:4266
msgid "Loop All"
msgstr "Riproduci in ciclo"
-#: python/playergui.py:1842 python/playergui.py:4186
+#: python/playergui.py:1900 python/playergui.py:4269
msgid "Cue Up"
msgstr "Accoda"
-#: python/playergui.py:1843 python/playergui.py:4190
+#: python/playergui.py:1901 python/playergui.py:4273
msgid "Fade Over"
msgstr "Dissolvenza in uscita"
-#: python/playergui.py:1855 python/playergui.py:1926 python/playergui.py:4184
+#: python/playergui.py:1913 python/playergui.py:1984 python/playergui.py:4267
msgid "Random"
msgstr "Casuale"
-#: python/playergui.py:1895 python/playergui.py:4187
+#: python/playergui.py:1953 python/playergui.py:4270
msgid "External"
msgstr "Esterna"
-#: python/playergui.py:1907 python/playergui.py:1923 python/playergui.py:4189
+#: python/playergui.py:1965 python/playergui.py:1981 python/playergui.py:4272
msgid "Alternate"
msgstr "Alterna"
-#: python/playergui.py:1907 python/playergui.py:1925 python/playergui.py:4191
+#: python/playergui.py:1965 python/playergui.py:1983 python/playergui.py:4274
msgid "Random Hop"
msgstr "Salto casuale"
#. TC: The remaining playlist time.
-#: python/playergui.py:2080 python/playergui.py:2086
+#: python/playergui.py:2138 python/playergui.py:2144
msgid "Remaining"
msgstr "Restante"
#. TC: The estimated finish time of the playlist.
#. TC: The estimated finish time of the playlist (ETA).
-#: python/playergui.py:2082 python/playergui.py:2086 python/playergui.py:2100
+#: python/playergui.py:2140 python/playergui.py:2144 python/playergui.py:2158
msgid "Finish"
msgstr "Fine"
#. TC: The play duration of the block of audio tracks.
-#: python/playergui.py:2087 python/playergui.py:2098
+#: python/playergui.py:2145 python/playergui.py:2156
msgid "Block size"
msgstr "Dimensione blocco"
#. TC: File dialog title text.
-#: python/playergui.py:2485
+#: python/playergui.py:2546
msgid "Add music to left playlist"
msgstr "Aggiungi musica alla playlist di sinistra"
#. TC: File dialog title text.
-#: python/playergui.py:2488
+#: python/playergui.py:2549
msgid "Add music to right playlist"
msgstr "Aggiungi musica alla playlist di destra"
-#: python/playergui.py:2490
+#: python/playergui.py:2551
msgid "Add background music"
msgstr ""
#. TC: File filter text.
-#: python/playergui.py:2502
+#: python/playergui.py:2563
msgid "Supported Media Formats"
msgstr "Formati di media supportati"
#. TC: Expander text "Select File Type (.pls)" for the pls file type.
-#: python/playergui.py:2564
+#: python/playergui.py:2625
msgid "Select File Type"
msgstr "Seleziona il tipo di file"
-#: python/playergui.py:3308
+#: python/playergui.py:3383
msgid "Save left playlist"
msgstr "Salva la playlist di sinistra"
-#: python/playergui.py:3310
+#: python/playergui.py:3385
msgid "Save right playlist"
msgstr "Salva la playlist di destra"
-#: python/playergui.py:3312
+#: python/playergui.py:3387
#, fuzzy
msgid "Save background playlist"
msgstr "Salva la playlist di destra"
-#: python/playergui.py:3330
+#: python/playergui.py:3405
msgid "File Type"
msgstr "Tipo file"
-#: python/playergui.py:3335
+#: python/playergui.py:3410
msgid "Extension"
msgstr "Estensione"
#. TC: Playlist control.
#. TC: Insert playlist control to do a ten second fade to the next track.
-#: python/playergui.py:3693 python/playergui.py:4358
+#: python/playergui.py:3774 python/playergui.py:4441
msgid "Fade 10s"
msgstr "Dissolvi 10sec"
#. TC: Playlist control.
#. TC: Insert playlist control to do a five second fade to the next track.
-#: python/playergui.py:3699 python/playergui.py:4365
+#: python/playergui.py:3780 python/playergui.py:4448
msgid "Fade 5s"
msgstr "Dissolvi 5sec"
#. TC: Playlist control.
#. TC: Insert playlist control to not do a fade to the next track.
-#: python/playergui.py:3704 python/playergui.py:4372
+#: python/playergui.py:3785 python/playergui.py:4455
msgid "No Fade"
msgstr "Nessun dissolvenza"
#. TC: Playlist control.
-#: python/playergui.py:3714
+#: python/playergui.py:3793
msgid ">> Normal Speed <<"
msgstr ">> Velocità normale <<"
#. TC: Playlist control.
-#: python/playergui.py:3724
+#: python/playergui.py:3803
msgid "Player stop 2"
msgstr "Lettore ferma 2"
#. TC: Playlist control.
#. TC: Insert playlist control to jump to the top of the playlist.
-#: python/playergui.py:3729 python/playergui.py:4324
+#: python/playergui.py:3808 python/playergui.py:4407
msgid "Jump To Top"
msgstr "Passa all'inizio"
#. TC: Playlist control.
-#: python/playergui.py:3734 python/playergui.py:4384
+#: python/playergui.py:3813 python/playergui.py:4467
msgid "Stop streaming"
msgstr "Interrompi il flusso"
#. TC: Playlist control.
-#: python/playergui.py:3739 python/playergui.py:4392
+#: python/playergui.py:3818 python/playergui.py:4475
msgid "Stop recording"
msgstr "Interrompi la registrazione"
+#: python/playergui.py:3851
+#, fuzzy
+msgid "Announcement:"
+msgstr "Avviso"
+
#. TC: Playlist control.
-#: python/playergui.py:3774
+#: python/playergui.py:3857
msgid ">>> Transfer across >>>"
msgstr ">>> Trasferisci tra >>>"
#. TC: Playlist control.
-#: python/playergui.py:3777
+#: python/playergui.py:3860
msgid "<<< Transfer across <<<"
msgstr "<<< Trasferisci tra <<<"
#. TC: Playlist control.
-#: python/playergui.py:3782
+#: python/playergui.py:3865
msgid ">>> Fade across >>>"
msgstr ">>> Dissolvi tra >>>"
#. TC: Playlist control.
-#: python/playergui.py:3785
+#: python/playergui.py:3868
msgid "<<< Fade across <<<"
msgstr "<<< Dissolvi tra <<<"
#. TC: Playlist control.
-#: python/playergui.py:3791
+#: python/playergui.py:3874
msgid "Ignored playlist control"
msgstr "Controlli playlist ignorati"
-#: python/playergui.py:3859
+#: python/playergui.py:3942
+#, python-brace-format
msgid "Playing track {0} of {1}"
msgstr "Riproduzione traccia {0} di {1}"
#. TC: Previous line: Playing track {0} of {1}
-#: python/playergui.py:3872
+#: python/playergui.py:3955
#, python-format
msgid "From the album, %s"
msgstr "Dall'album, %s"
-#: python/playergui.py:3879
+#: python/playergui.py:3962
#, python-format
msgid "Total number of tracks %d"
msgstr "Numero totale di tracce %d"
-#: python/playergui.py:3883 python/playergui.py:3885
+#: python/playergui.py:3966 python/playergui.py:3968
#, python-format
msgid "Total play duration %s"
msgstr "Durata totale %s"
-#: python/playergui.py:3935
+#: python/playergui.py:4018
msgid ""
"Left click toggles between showing the amount of time elapsed or remaining "
"on the current track being played."
@@ -2612,7 +2687,7 @@ msgstr ""
"Il click sinistro cambia dal mostrare il tempo trascorso o restante della "
"traccia in esecuzione."
-#: python/playergui.py:3953
+#: python/playergui.py:4036
msgid ""
"This slider acts as both a play progress indicator and as a means for "
"seeking within the currently playing track."
@@ -2621,15 +2696,16 @@ msgstr ""
"strumento per spostarsi nella traccia attualmente in esecuzione."
#. TC: File filter text.
-#: python/playergui.py:4042
+#: python/playergui.py:4125
msgid "All file types"
msgstr "Tutti i tipi di file"
-#: python/playergui.py:4047
-msgid "Playlist types (*.m3u, *.xspf, *.pls)"
-msgstr "Tipi di playlist (*.m3u, *.xspf, *.pls)"
+#: python/playergui.py:4130
+#, fuzzy
+msgid "Playlist types"
+msgstr "Playlist 1"
-#: python/playergui.py:4062
+#: python/playergui.py:4145
msgid ""
"'Block size' indicates the amount of time that it will take to play from the "
"currently selected track to the next stop.\n"
@@ -2641,43 +2717,43 @@ msgstr ""
"'Restante' è il tempo fino al prossimo stop.\n"
"'Fine' è il tempo calcolato quando finirà la riproduzione delle tracce."
-#: python/playergui.py:4085
+#: python/playergui.py:4168
msgid "This adjusts the playback speed anywhere from 25% to 400%."
msgstr "Regola la velocità di riproduzione tra il 25% ed il 400%."
-#: python/playergui.py:4099
+#: python/playergui.py:4182
msgid "This sets the playback speed back to normal."
msgstr "Reimposta la normale velocità di riproduzione "
-#: python/playergui.py:4116
+#: python/playergui.py:4199
msgid "Previous track."
msgstr "Traccia precedente"
-#: python/playergui.py:4128
+#: python/playergui.py:4211
msgid "Play."
msgstr "Riproduci"
-#: python/playergui.py:4138
+#: python/playergui.py:4221
msgid "Pause."
msgstr "Pausa"
-#: python/playergui.py:4148
+#: python/playergui.py:4231
msgid "Stop."
msgstr "Ferma"
-#: python/playergui.py:4158
+#: python/playergui.py:4241
msgid "Next track."
msgstr "Traccia successiva"
-#: python/playergui.py:4170
+#: python/playergui.py:4253
msgid "Add tracks to the playlist."
msgstr "Aggiungi tracce alla playlist"
-#: python/playergui.py:4177 python/preferences.py:70
+#: python/playergui.py:4260 python/preferences.py:71
msgid "Playlist Mode"
msgstr "Modalità playlist"
-#: python/playergui.py:4196
+#: python/playergui.py:4279
msgid ""
"This sets the playlist mode which defines player behaviour after a track has "
"finished playing.\n"
@@ -2739,31 +2815,31 @@ msgstr ""
"'Salto casuale' sceglierà una traccia a caso dall'altra playlist."
#. TC: Fade time heading.
-#: python/playergui.py:4220 python/preferences.py:71
+#: python/playergui.py:4303 python/preferences.py:72
msgid "Fade"
msgstr "Dissolvenza"
-#: python/playergui.py:4232
+#: python/playergui.py:4315
msgid "This controls the amount of fade between tracks."
msgstr "Controlla il tempo di dissolvenza tra tracce"
-#: python/playergui.py:4239
+#: python/playergui.py:4322
msgid "Audio Feed"
msgstr "Audio Feed"
-#: python/playergui.py:4249
+#: python/playergui.py:4332
msgid "Make output from this player available for streaming."
msgstr "Manda in onda l'audio di questo lettore"
-#: python/playergui.py:4257
+#: python/playergui.py:4340
msgid "Make output from this player audible to the DJ."
msgstr "Rende l'uscita di questo lettore udibile dal DJ"
-#: python/playergui.py:4259
+#: python/playergui.py:4342
msgid "Force"
msgstr ""
-#: python/playergui.py:4265
+#: python/playergui.py:4348
msgid ""
"When selected this player will be treated like a main player.\n"
"It will be affected by microphone ducking and won't mute when a main player "
@@ -2771,142 +2847,142 @@ msgid ""
msgstr ""
#. TC: Insert playlist control.
-#: python/playergui.py:4278
+#: python/playergui.py:4361
msgid "Insert control"
msgstr "Inserisci controllo"
#. TC: The Item submenu.
-#: python/playergui.py:4287
+#: python/playergui.py:4370
msgid "Item"
msgstr "Elemento"
#. TC: The Playlist submenu.
-#: python/playergui.py:4292
+#: python/playergui.py:4375
msgid "Playlist"
msgstr "Playlist"
#. TC: Insert playlist control to set playback speed to normal.
-#: python/playergui.py:4303
+#: python/playergui.py:4386
msgid "Normal Speed"
msgstr "Velocità normale"
#. TC: Submenu Item. Parent menu is Playlist.
-#: python/playergui.py:4332 python/playergui.py:4486
+#: python/playergui.py:4415 python/playergui.py:4569
msgid "Transfer"
msgstr "Trasferisci"
-#: python/playergui.py:4340
+#: python/playergui.py:4423
msgid "Crossfade"
msgstr "Dissolvi"
#. TC: Menu item. Opens the metadata tagger on the selected track.
-#: python/playergui.py:4405
+#: python/playergui.py:4488
msgid "Meta Tag"
msgstr "Meta Tag"
#. TC: Menu Item. Duplicates the selected track in the playlist.
-#: python/playergui.py:4411
+#: python/playergui.py:4494
msgid "Duplicate"
msgstr "Duplica"
#. TC: Menu Item. Remove the selected track.
-#: python/playergui.py:4418
+#: python/playergui.py:4501
msgid "Remove"
msgstr "Rimuovi"
#. TC: Submenu Item. Parent menu item is Remove.
-#: python/playergui.py:4429
+#: python/playergui.py:4512
msgid "This"
msgstr "Questo"
#. TC: Submenu Item. Parent menu item is Remove.
-#: python/playergui.py:4436 python/preferences.py:1234
+#: python/playergui.py:4519 python/preferences.py:1237
msgid "All"
msgstr "Tutto"
#. TC: Submenu Item. Parent menu item is Remove.
-#: python/playergui.py:4443
+#: python/playergui.py:4526
msgid "From Here"
msgstr "Da qui"
#. TC: Submenu Item. Parent menu item is Remove.
-#: python/playergui.py:4450
+#: python/playergui.py:4533
msgid "To Here"
msgstr "Fino a qui"
#. TC: Open the file dialog for adding music to the chosen playlist.
-#: python/playergui.py:4463
+#: python/playergui.py:4546
msgid "Add Music"
msgstr "Aggiungi musica"
#. TC: Submenu Item. Parent menu is Playlist.
-#: python/playergui.py:4470
+#: python/playergui.py:4553
msgid "Save"
msgstr "Salva"
#. TC: Submenu Item. Parent menu is Playlist.
-#: python/playergui.py:4481
+#: python/playergui.py:4564
msgid "Copy"
msgstr "Copia"
-#: python/playergui.py:4492
+#: python/playergui.py:4575
msgid "Exchange"
msgstr "Scambia"
#. TC: Submenu Item. Parent menu is Playlist.
-#: python/playergui.py:4499
+#: python/playergui.py:4582
msgid "Empty"
msgstr "Vuoto"
#. TC: Submenu Item. Parent menus are Playlist->Copy.
#. TC: Submenu Item. Parent menus are Playlist->Transfer.
-#: python/playergui.py:4513 python/playergui.py:4552
+#: python/playergui.py:4596 python/playergui.py:4635
msgid "Append"
msgstr "Appendi"
#. TC: Submenu Item. Parent menus are Playlist->Copy.
#. TC: Submenu Item. Parent menus are Playlist->Transfer.
-#: python/playergui.py:4520 python/playergui.py:4559
+#: python/playergui.py:4603 python/playergui.py:4642
msgid "Prepend"
msgstr "Prependi"
#. TC: Submenu Item. Parent menus are Playlist->Copy.
-#: python/playergui.py:4531
+#: python/playergui.py:4614
msgid "Append Cursor"
msgstr "Accoda dal cursore"
#. TC: Submenu Item. Parent menus are Playlist->Copy.
-#: python/playergui.py:4538
+#: python/playergui.py:4621
msgid "Prepend Cursor"
msgstr "Prependi dal cursore"
#. TC: Submenu Item. Parent menus are Playlist->Transfer.
-#: python/playergui.py:4570
+#: python/playergui.py:4653
msgid "Append at Cursor"
msgstr "Accoda dal cursore"
#. TC: Submenu Item. Parent menus are Playlist->Transfer.
-#: python/playergui.py:4577
+#: python/playergui.py:4660
msgid "Prepend at Cursor"
msgstr "Prependi dal cursore"
-#: python/preferences.py:84
+#: python/preferences.py:85
msgid "Track time elapsed"
msgstr "Tempo trascorso"
-#: python/preferences.py:86
+#: python/preferences.py:87
msgid "Track time remaining"
msgstr "Tempo restante"
-#: python/preferences.py:88
+#: python/preferences.py:89
msgid "Audio to stream"
msgstr "Audio al flusso"
-#: python/preferences.py:89
+#: python/preferences.py:90
msgid "Audio to DJ"
msgstr "Audio al DJ"
-#: python/preferences.py:126
+#: python/preferences.py:127
#, fuzzy, python-format
msgid ""
"Stereo panning is the selection of where an audio source sits from left to "
@@ -2930,12 +3006,12 @@ msgstr ""
"Se volete i 0dB di potenza anche nel punto di mezzo allora dovrete "
"disattivare questa opzione."
-#: python/preferences.py:157
+#: python/preferences.py:158
#, fuzzy
msgid "Presets"
msgstr "Premuto"
-#: python/preferences.py:248
+#: python/preferences.py:249
msgid ""
"The pan preset selection buttons.\n"
"\n"
@@ -2946,42 +3022,42 @@ msgid ""
msgstr ""
#. TC: Microphone mode combobox text.
-#: python/preferences.py:273
+#: python/preferences.py:274
msgid "Deactivated"
msgstr "Disattivato"
#. TC: Microphone mode combobox text.
-#: python/preferences.py:275
+#: python/preferences.py:276
msgid "Basic input"
msgstr "Ingresso semplice"
#. TC: Microphone mode combobox text.
-#: python/preferences.py:277
+#: python/preferences.py:278
msgid "Processed input"
msgstr "Ingresso elaborato"
#. TC: Microphone mode combobox text.
-#: python/preferences.py:279
+#: python/preferences.py:280
#, python-format
msgid "Partnered with channel %s"
msgstr "Abbinato al canale %s"
-#: python/preferences.py:429
+#: python/preferences.py:432
msgid "A label so you may describe briefly the role of this audio channel."
msgstr ""
"Un'etichetta per descrivere in modo sintetico il ruolo di questo canale "
"audio."
-#: python/preferences.py:461
+#: python/preferences.py:464
msgid "The signal processing mode."
msgstr "La modalità di elaborazione del segnale"
#. TC: A frame heading. The channel opener is selected within.
-#: python/preferences.py:465
+#: python/preferences.py:468
msgid "Channel Opener"
msgstr "Gestore canale"
-#: python/preferences.py:468
+#: python/preferences.py:471
msgid ""
"This controls the allocation of front panel open/unmute buttons. Having one "
"button control multiple microphones can save time."
@@ -2990,28 +3066,28 @@ msgstr ""
"pulsante che controlla più microfoni può far risparmiare del tempo."
#. TC: Spinbutton label text.
-#: python/preferences.py:475
+#: python/preferences.py:478
msgid "Main Panel Button"
msgstr "Pulsante del pannello principale"
-#: python/preferences.py:492
+#: python/preferences.py:495
msgid "This:"
msgstr "Questo:"
-#: python/preferences.py:501
+#: python/preferences.py:504
msgid "Open"
msgstr "Apri"
-#: python/preferences.py:514
+#: python/preferences.py:517
msgid "Stereo Panning"
msgstr "Panorama Stereo"
#. TC: A set of controls that perform audio signal matching.
-#: python/preferences.py:527
+#: python/preferences.py:530
msgid "Signal Matching"
msgstr "Corrispondenza segnale"
-#: python/preferences.py:528
+#: python/preferences.py:531
msgid ""
"These controls are provided to obtain a decent match between the two "
"microphones."
@@ -3019,17 +3095,17 @@ msgstr ""
"Questi controlli servono per ottenere una corrispondenza decente tra "
"microfoni."
-#: python/preferences.py:537
+#: python/preferences.py:540
msgid "Relative Gain (dB)"
msgstr "Guadagno relativo (dB)"
#. TC: Mic audio phase inversion control.
-#: python/preferences.py:542 python/preferences.py:547
+#: python/preferences.py:545 python/preferences.py:550
msgid "Invert Signal"
msgstr "Inverti il segnale"
-#: python/preferences.py:548 python/preferences.py:568
-#: python/preferences.py:664
+#: python/preferences.py:551 python/preferences.py:571
+#: python/preferences.py:667
msgid ""
"Useful for when microphones are cancelling one another out, producing a "
"hollow sound."
@@ -3038,12 +3114,12 @@ msgstr ""
"ovattato."
#. TC: Control whether to mix microphone audio to the DJ mix.
-#: python/preferences.py:551
+#: python/preferences.py:554
msgid "In The DJ's Mix"
msgstr "Invia al mix del DJ"
-#: python/preferences.py:552 python/preferences.py:574
-#: python/preferences.py:674
+#: python/preferences.py:555 python/preferences.py:577
+#: python/preferences.py:677
msgid ""
"Make the microphone audio audible in the DJ mix. This may not always be "
"desirable."
@@ -3051,29 +3127,29 @@ msgstr ""
"Fa in modo che l'audio del microfono sia udibile nel mix del DJ. Non sempre "
"è desiderabile."
-#: python/preferences.py:560
+#: python/preferences.py:563
msgid "Basic Controls"
msgstr "Controlli base"
-#: python/preferences.py:561 python/preferences.py:616
+#: python/preferences.py:564 python/preferences.py:619
msgid "Boost/Cut (dB)"
msgstr "Aumenta/Taglia (dB)"
-#: python/preferences.py:582
+#: python/preferences.py:585
msgid "High Pass Filter"
msgstr "Filtro passa alto"
-#: python/preferences.py:583 python/preferences.py:598
-#: python/preferences.py:608
+#: python/preferences.py:586 python/preferences.py:601
+#: python/preferences.py:611
msgid "Cutoff Frequency"
msgstr "Frequenza di taglio"
#. TC: User can set the number of filter stages.
-#: python/preferences.py:587
+#: python/preferences.py:590
msgid "Stages"
msgstr "Livelli"
-#: python/preferences.py:590
+#: python/preferences.py:593
msgid ""
"Frequency in Hertz above which audio can pass to later stages. Use this "
"feature to restrict low frequency sounds such as mains hum. Setting too high "
@@ -3085,55 +3161,55 @@ msgstr ""
"suono della voce 'sottile'"
#. TC: this is the treble control. HF = high frequency.
-#: python/preferences.py:595
+#: python/preferences.py:598
msgid "HF Detail"
msgstr "Dettaglio HF"
-#: python/preferences.py:602
+#: python/preferences.py:605
msgid "You can use this to boost the amount of treble in the audio."
msgstr "Potete usarlo per aumentare la quantità di alte frequenze nell'audio."
#. TC: this is the bass control. LF = low frequency.
-#: python/preferences.py:605
+#: python/preferences.py:608
msgid "LF Detail"
msgstr "Dettagli LF"
-#: python/preferences.py:612
+#: python/preferences.py:615
msgid "You can use this to boost the amount of bass in the audio."
msgstr "Potete usarlo per aumentare la quantità di basse frequenze nell'audio."
#. TC: lookahead brick wall limiter.
-#: python/preferences.py:615
+#: python/preferences.py:618
msgid "Limiter"
msgstr "Limiter"
#. TC: this is the peak signal limit.
-#: python/preferences.py:620
+#: python/preferences.py:623
msgid "Upper Limit"
msgstr "Limite superiore"
-#: python/preferences.py:622
+#: python/preferences.py:625
msgid ""
"A look-ahead brick-wall limiter. Audio signals are capped at the upper limit."
msgstr ""
"Un limiter predittivo. I segnali audio vengono bloccati al limite superiore"
-#: python/preferences.py:625
+#: python/preferences.py:628
msgid "Noise Gate"
msgstr "Noise Gate"
#. TC: noise gate triggers at this level.
-#: python/preferences.py:627
+#: python/preferences.py:630
msgid "Threshold"
msgstr "Soglia"
#. TC: negative gain when the noise gate is active.
#. TC: The de-esser attenuation in ess-detected state.
-#: python/preferences.py:631 python/preferences.py:641
+#: python/preferences.py:634 python/preferences.py:644
msgid "Gain"
msgstr "Guadagno"
-#: python/preferences.py:633
+#: python/preferences.py:636
msgid ""
"Reduce the unwanted quietest sounds and background noise which you don't "
"want your listeners to hear with this."
@@ -3141,16 +3217,16 @@ msgstr ""
"Riduce i suoni sommessi indesiderati ed il rumore di fondo che non volete "
"venga udito dagli ascoltatori."
-#: python/preferences.py:636
+#: python/preferences.py:639
msgid "De-esser"
msgstr "De-esser"
#. TC: Bias has a numeric setting.
-#: python/preferences.py:638
+#: python/preferences.py:641
msgid "Bias"
msgstr "Bias"
-#: python/preferences.py:643
+#: python/preferences.py:646
msgid ""
"Reduce the S, T, and P sounds which microphones tend to exaggerate. Ideally "
"the Bias control will be set low so that the de-esser is off when there is "
@@ -3161,19 +3237,19 @@ msgstr ""
"spento nei momenti di silenzio ma sia sufficentemente alto da non rendere "
"udibili i click del mouse."
-#: python/preferences.py:648
+#: python/preferences.py:651
msgid "Ducker"
msgstr "Ducker"
-#: python/preferences.py:649
+#: python/preferences.py:652
msgid "Release"
msgstr "Rilascio"
-#: python/preferences.py:652
+#: python/preferences.py:655
msgid "Hold"
msgstr "Tenuta"
-#: python/preferences.py:655
+#: python/preferences.py:658
msgid ""
"The ducker automatically reduces the level of player audio when the DJ "
"speaks. These settings allow you to adjust the timings of that audio "
@@ -3183,15 +3259,15 @@ msgstr ""
"Queste impostazioni ti consentono di regolare la tempistica della riduzione "
"dell'audio."
-#: python/preferences.py:659
+#: python/preferences.py:662
msgid "Other options"
msgstr "Altre opzioni"
-#: python/preferences.py:666
+#: python/preferences.py:669
msgid "Phase Rotator"
msgstr "Rotatore di fase"
-#: python/preferences.py:669
+#: python/preferences.py:672
msgid ""
"This feature processes the microphone audio so that it sounds more even. The "
"effect is particularly noticable on male voices."
@@ -3199,34 +3275,34 @@ msgstr ""
"Questa funzionalità elabora l'audio del microfono in modo di renderlo più "
"costante. L'effetto è particolarmente distinguibile sulle voci maschili."
-#: python/preferences.py:852
+#: python/preferences.py:855
msgid "The volume control for the left music player."
msgstr "Il controllo del volume per il lettore di sinistra"
#. TC: preferences window title.
-#: python/preferences.py:908
+#: python/preferences.py:911
msgid "IDJC Preferences"
msgstr "Preferenze IDJC"
#. TC: The DJ's sound level controller.
-#: python/preferences.py:933
+#: python/preferences.py:936
msgid "DJ Audio Level"
msgstr "Livello audio DJ"
-#: python/preferences.py:945
+#: python/preferences.py:948
msgid "This adjusts the sound level of the DJ audio."
msgstr "Regola il livello dell'audio del DJ"
#. TC: The alarm sound level.
-#: python/preferences.py:950
+#: python/preferences.py:953
msgid "Alarm Level"
msgstr ""
-#: python/preferences.py:964
+#: python/preferences.py:967
msgid "Music Loudness Compensation"
msgstr ""
-#: python/preferences.py:962
+#: python/preferences.py:965
#, python-format
msgid ""
"This adjusts the sound level of the DJ alarm. Typically this should be set "
@@ -3234,11 +3310,11 @@ msgid ""
"louder."
msgstr ""
-#: python/preferences.py:970
+#: python/preferences.py:973
msgid "Player Resample Quality"
msgstr "Qualità di ricampionamento del lettore"
-#: python/preferences.py:976
+#: python/preferences.py:979
#, fuzzy
msgid ""
"This adjusts the quality of the audio resampling method used whenever the "
@@ -3253,50 +3329,50 @@ msgstr ""
"più CPU (non consigliato per sistemi antecedenti al 2006). Benché utilizzi "
"meno CPU la modalità 'Più veloce' dovrebbe essere evitata del tutto."
-#: python/preferences.py:984
+#: python/preferences.py:987
msgid "Best"
msgstr ""
-#: python/preferences.py:993
+#: python/preferences.py:996 python/format.py:512
msgid "Medium"
msgstr ""
-#: python/preferences.py:1002
+#: python/preferences.py:1005
msgid "Fast"
msgstr "Veloce"
#. TC: the set of features - section heading.
-#: python/preferences.py:1017
+#: python/preferences.py:1020
msgid "Feature Set"
msgstr "Impostazioni funzionalità"
#. TC: Start in the full featured user interface mode.
-#: python/preferences.py:1029
+#: python/preferences.py:1032
msgid "Start Full"
msgstr "Avvia completo"
-#: python/preferences.py:1034 python/preferences.py:1042
+#: python/preferences.py:1037 python/preferences.py:1045
msgid "Indicates which mode IDJC will be in when launched."
msgstr "Indica con quale modalità verrà avviato IDJC"
#. TC: Start in a reduced user interface mode.
-#: python/preferences.py:1037
+#: python/preferences.py:1040
msgid "Start Mini"
msgstr "Avvia minimale"
-#: python/preferences.py:1050
+#: python/preferences.py:1053
msgid "Fully Featured"
msgstr "Tutte le funzionalità"
-#: python/preferences.py:1055
+#: python/preferences.py:1058
msgid "Run in full functionality mode which uses more CPU power."
msgstr "Avvia con tutte le funzionalità, consuma più CPU"
-#: python/preferences.py:1057
+#: python/preferences.py:1060
msgid "Basic Streamer"
msgstr "Trasmettitore base"
-#: python/preferences.py:1061
+#: python/preferences.py:1064
msgid ""
"Run in a reduced functionality mode that lowers the burden on the CPU and "
"takes up less screen space."
@@ -3304,99 +3380,99 @@ msgstr ""
"Avvia con funzionalità ridotte, diminuisce il carico sulla CPU e occupa meno "
"spazio sullo schermo."
-#: python/preferences.py:1069
+#: python/preferences.py:1072
msgid "These settings take effect after restarting"
msgstr "Queste impostazioni avranno effetto dopo il riavvio."
-#: python/preferences.py:1090
+#: python/preferences.py:1093
msgid "Reserve 24 sound effects slots"
msgstr ""
-#: python/preferences.py:1091
+#: python/preferences.py:1094
msgid "Only 12"
msgstr ""
-#: python/preferences.py:1103
+#: python/preferences.py:1106
msgid "Audio input channels"
msgstr ""
-#: python/preferences.py:1108
+#: python/preferences.py:1111
msgid "Simultaneous stream(s)"
msgstr "Trasmissione(i) in simultanea"
-#: python/preferences.py:1114
+#: python/preferences.py:1117
msgid "Simultaneous recording(s)"
msgstr "Registrazione(i) in simultanea"
-#: python/preferences.py:1168
+#: python/preferences.py:1171
msgid "Fill channel meter void space"
msgstr "Riempi il vuoto dell'indicatore per il canale"
-#: python/preferences.py:1180
+#: python/preferences.py:1183
msgid "Player Loudness Normalisation"
msgstr ""
-#: python/preferences.py:1191
+#: python/preferences.py:1194
#, fuzzy
msgid "Indicate which tracks have loudness metadata"
msgstr "Indica quali tracce hanno il ReplayGain"
-#: python/preferences.py:1192
+#: python/preferences.py:1195
#, fuzzy
msgid ""
"Shows a marker in the playlists next to each track. Either a green circle or "
"a red triangle."
msgstr "Mostra un segno accanto ad ogni traccia nella playlist"
-#: python/preferences.py:1200
+#: python/preferences.py:1203
#, fuzzy
msgid "Adjust playback volume in dB"
msgstr "Regola il volume di riproduzione"
-#: python/preferences.py:1201
+#: python/preferences.py:1204
msgid "Effective only on newly started tracks."
msgstr "Efficace solo sulle tracce avviate ex-novo "
-#: python/preferences.py:1207
+#: python/preferences.py:1210
msgid "R128"
msgstr ""
-#: python/preferences.py:1211
+#: python/preferences.py:1214
msgid ""
"It may not be desirable to use the default level since it is rather quiet. "
"This should be set 4 or 5 dB higher than the ReplayGain setting."
msgstr ""
-#: python/preferences.py:1216
+#: python/preferences.py:1219
msgid "ReplayGain"
msgstr "ReplayGain"
-#: python/preferences.py:1220
+#: python/preferences.py:1223
msgid ""
"It may not be desirable to use the default level since it is rather quiet. "
"This should be set 4 or 5 dB lower than the R128 setting."
msgstr ""
-#: python/preferences.py:1225
+#: python/preferences.py:1228
msgid "Untagged"
msgstr ""
-#: python/preferences.py:1229
+#: python/preferences.py:1232
msgid ""
"Set this so that any unmarked tracks are playing at a roughly similar "
"loudness level as the marked ones."
msgstr ""
-#: python/preferences.py:1238
+#: python/preferences.py:1241
#, fuzzy
msgid "A master level control for the media players."
msgstr "Il controllo del volume per il lettore di sinistra"
-#: python/preferences.py:1249
+#: python/preferences.py:1252
msgid "Recorder Filename (excluding the file extension)"
msgstr ""
-#: python/preferences.py:1250
+#: python/preferences.py:1253
msgid ""
"The specifiers are $r for the number of the recorder with the rest being "
"documented in the strftime man page.\n"
@@ -3404,24 +3480,24 @@ msgid ""
"particular filesystems."
msgstr ""
-#: python/preferences.py:1267
+#: python/preferences.py:1270
msgid "Miscellaneous Features"
msgstr "Impostazioni varie"
-#: python/preferences.py:1276
+#: python/preferences.py:1279
msgid "Trim quiet song endings and trailing silence"
msgstr "Elimina i finali sommessi ed il silenzio iniziale delle canzoni"
-#: python/preferences.py:1282
+#: python/preferences.py:1285
msgid "End tracks containing long passages of silence"
msgstr "Interrompi tracce che contengono lunghi passaggi di silenzio"
-#: python/preferences.py:1288
+#: python/preferences.py:1291
msgid "Enable the main-player speed/pitch controls"
msgstr ""
"Abilita il controllo di velocità di riproduzione sul lettore principale"
-#: python/preferences.py:1292
+#: python/preferences.py:1295
msgid ""
"This option causes some extra widgets to appear below the playlists which "
"allow the playback speed to be adjusted from 25% to 400% and a normal speed "
@@ -3431,11 +3507,11 @@ msgstr ""
"regolare la velocità di riproduzione tra il 25% ed il 400% e un pulsante per "
"la velocità normale."
-#: python/preferences.py:1297
+#: python/preferences.py:1300
msgid "Separate left/right player volume faders"
msgstr "Cursori del volume separati per i lettori destro/sinistro"
-#: python/preferences.py:1301
+#: python/preferences.py:1304
msgid ""
"Select this option to use an independent volume fader for the left and right "
"music players."
@@ -3443,11 +3519,11 @@ msgstr ""
"Selezionare questa opzione per usare un cursore indipendente per il lettore "
"di destra e sinistra."
-#: python/preferences.py:1305
+#: python/preferences.py:1308
msgid "Enlarge the time elapsed/remaining windows"
msgstr "Allarga la finestra del tempo trascorso/restante"
-#: python/preferences.py:1309
+#: python/preferences.py:1312
msgid ""
"The time elapsed/remaining windows sometimes don't appear big enough for the "
"text that appears in them due to unusual DPI settings or the use of a "
@@ -3457,11 +3533,11 @@ msgstr ""
"abbastanza a causa di impostazioni anomale dei DPI o per l'utilizzo di "
"motori di rendering diversi. Questa opzione sistema le cose."
-#: python/preferences.py:1315
+#: python/preferences.py:1318
msgid "Sound an alarm when the music is due to end"
msgstr "Avviso sonoro quando la musica si avvicina alla fine"
-#: python/preferences.py:1318
+#: python/preferences.py:1321
#, fuzzy
msgid ""
"An alarm tone alerting the DJ that dead-air is just nine seconds away. This "
@@ -3474,12 +3550,12 @@ msgstr ""
"Funziona anche in fase di monitoraggio del flusso ma il suono di allarme non "
"viene mandato in onda."
-#: python/preferences.py:1328
+#: python/preferences.py:1331
#, fuzzy
msgid "Apply dither to 16 bit PCM playback"
msgstr "Applica il dither alla riproduzione MP3 e FLAC"
-#: python/preferences.py:1332
+#: python/preferences.py:1335
msgid ""
"This feature maybe improves the sound quality a little when listening on a "
"24 bit sound card."
@@ -3487,11 +3563,11 @@ msgstr ""
"Questa impostazione potrebbe migliorare la qualità del suondo su schede "
"audio a 24bit"
-#: python/preferences.py:1335
+#: python/preferences.py:1338
msgid "Enable tooltips"
msgstr "Abilita suggerimenti"
-#: python/preferences.py:1339
+#: python/preferences.py:1342
msgid ""
"This, what you are currently reading, is a tooltip. This feature turns them "
"on or off."
@@ -3499,15 +3575,15 @@ msgstr ""
"Questo che state leggendo adesso è un suggerimento. Questa opzione li "
"abilita o meno."
-#: python/preferences.py:1358
+#: python/preferences.py:1361
msgid "Player Settings At Startup"
msgstr "Impostazioni del lettore all'avvio"
-#: python/preferences.py:1369
+#: python/preferences.py:1372
msgid "Restore the previous session"
msgstr "Ripristina la sessione precedente"
-#: python/preferences.py:1374
+#: python/preferences.py:1377
msgid ""
"When starting IDJC most of the main window settings will be as they were "
"left. As an alternative you may specify below how you want the various "
@@ -3517,107 +3593,111 @@ msgstr ""
"saranno come le avete lasciate. In alternativa potete specificare qui sotto "
"come volete trovare le varie impostazioni all'avvio di IDJC."
-#: python/preferences.py:1384
+#: python/preferences.py:1387
msgid "Player 1"
msgstr "Lettore 1"
-#: python/preferences.py:1386
+#: python/preferences.py:1389
msgid "Player 2"
msgstr "Lettore 2"
#. TC: DJ hears the stream mix.
-#: python/preferences.py:1414
+#: python/preferences.py:1417
msgid "Monitor Stream Mix"
msgstr "Monitora il Flusso"
#. TC: A heading label for miscellaneous settings.
-#: python/preferences.py:1425
+#: python/preferences.py:1428
msgid "General"
msgstr "Generale"
-#: python/preferences.py:1475
+#: python/preferences.py:1478
msgid "VoIP panning + mono downmix"
msgstr ""
#. TC: Keyboard and MIDI bindings configuration.
-#: python/preferences.py:1489
+#: python/preferences.py:1492
msgid "Bindings"
msgstr "Scorciatoie"
-#: python/preferences.py:1537
+#: python/preferences.py:1540
msgid "Licence"
msgstr "Licenza"
-#: python/preferences.py:1560
+#: python/preferences.py:1563
msgid "Contributors"
msgstr "Collaboratori"
-#: python/preferences.py:1567
+#: python/preferences.py:1570
msgid "Translators"
msgstr "Traduttori"
-#: python/preferences.py:1573
+#: python/preferences.py:1574
+msgid "Build Info"
+msgstr ""
+
+#: python/preferences.py:1591
msgid "About"
msgstr "Circa"
-#: python/sourceclientgui.py:89
+#: python/sourceclientgui.py:91
msgid "Insert Attribute"
msgstr "Inserisci attributo"
-#: python/sourceclientgui.py:133
+#: python/sourceclientgui.py:135
msgid "Icecast 2 Master"
msgstr "Icecast 2 Master"
-#: python/sourceclientgui.py:133
+#: python/sourceclientgui.py:135
msgid "Shoutcast Master"
msgstr "Shoutcast Master"
-#: python/sourceclientgui.py:134
+#: python/sourceclientgui.py:136
msgid "Icecast 2 Stats/Relay"
msgstr "Icecast 2 Stats/Relay"
-#: python/sourceclientgui.py:134
+#: python/sourceclientgui.py:136
msgid "Shoutcast Stats/Relay"
msgstr "Icecast 2 Stats/Relay"
-#: python/sourceclientgui.py:137
+#: python/sourceclientgui.py:139
msgid "Enter new server connection details"
msgstr "Inserisci i dettagli della connessione al server"
-#: python/sourceclientgui.py:156
+#: python/sourceclientgui.py:158
msgid "Edit existing server connection details"
msgstr "Modifica i dettagli della connessione"
-#: python/sourceclientgui.py:193
+#: python/sourceclientgui.py:195
msgid "This server is to be scanned for audience figures"
msgstr "Da scansionare per il pubblico in ascolto"
-#: python/sourceclientgui.py:206
+#: python/sourceclientgui.py:208
msgid "Server type"
msgstr "Tipo server"
-#: python/sourceclientgui.py:206
+#: python/sourceclientgui.py:208
msgid "Port number"
msgstr "Numero porta"
-#: python/sourceclientgui.py:207
+#: python/sourceclientgui.py:209
msgid "Mount point"
msgstr "Punto di montaggio"
-#: python/sourceclientgui.py:207
+#: python/sourceclientgui.py:209
msgid "Login name"
msgstr "Nome utente"
-#: python/sourceclientgui.py:449
+#: python/sourceclientgui.py:475
msgid "Encoder Format Not Set/Compatible"
msgstr ""
#. TC: Connection button text when no details have been entered.
-#: python/sourceclientgui.py:452
+#: python/sourceclientgui.py:478
msgid "No Master Server Configured"
msgstr "Nessun server principale configurato"
-#: python/sourceclientgui.py:654
+#: python/sourceclientgui.py:680
msgid ""
"A table of servers with which to connect. Only one master server can be "
"added for the purpose of streaming. All other servers will appear below the "
@@ -3629,42 +3709,42 @@ msgstr ""
"sotto il server principale nella lista allo scopo di raccogliere statistiche "
"che possono essere attivate per ciascun server."
-#: python/sourceclientgui.py:670
+#: python/sourceclientgui.py:696
msgid "Hostname/IP address"
msgstr "Nomehost/Indirizzo IP"
#. TC: Mount point is a technical term in relation to icecast servers.
-#: python/sourceclientgui.py:683
+#: python/sourceclientgui.py:709
#, fuzzy
msgid "Mount point "
msgstr "Punto di mount "
#. TC: This is the listener count heading.
-#: python/sourceclientgui.py:692
+#: python/sourceclientgui.py:718
msgid "Listeners"
msgstr "Ascoltatori"
-#: python/sourceclientgui.py:707
+#: python/sourceclientgui.py:733
msgid "The sum total of listeners in this server tab."
msgstr "Il totale degli ascoltatori per questo server"
-#: python/sourceclientgui.py:734
+#: python/sourceclientgui.py:760
msgid "Never"
msgstr "Mai"
-#: python/sourceclientgui.py:737
+#: python/sourceclientgui.py:763
msgid "Always"
msgstr "Sempre"
-#: python/sourceclientgui.py:739
+#: python/sourceclientgui.py:765
msgid "If connected"
msgstr "Se connesso"
-#: python/sourceclientgui.py:995
+#: python/sourceclientgui.py:1021
msgid "Custom user agent string"
msgstr "Stringa personalizzata per i navigatori"
-#: python/sourceclientgui.py:1002
+#: python/sourceclientgui.py:1028
msgid ""
"Set this on the occasion that the server or its firewall specifically "
"refuses to allow libshout based clients."
@@ -3672,16 +3752,16 @@ msgstr ""
"Impostare questa opzione nell'eventualità che il server o il suo firewall "
"rifiutino esplicitamente connessioni da client che usano libshout."
-#: python/sourceclientgui.py:1007
+#: python/sourceclientgui.py:1033
msgid "If the connection breaks reconnect to the server"
msgstr "Se la connessione si interrompe riconnettiti al server"
#. TC: Label for a comma separated list of delay times.
-#: python/sourceclientgui.py:1017
+#: python/sourceclientgui.py:1043
msgid "Delay times"
msgstr "Tempi di ritardo"
-#: python/sourceclientgui.py:1021
+#: python/sourceclientgui.py:1047
msgid ""
"A comma separated list of delays in seconds between reconnection attempts. "
"Note that bad values or values less than 5 will be interpreted as 5."
@@ -3689,45 +3769,45 @@ msgstr ""
"Una lista di ritardi, separati da virgola, tra i vari tentativi di "
"riconnessione. Valori errati o inferiori a 5 verranno interpretati come 5."
-#: python/sourceclientgui.py:1027
+#: python/sourceclientgui.py:1053
msgid "Repeat the sequence of delays indefinitely."
msgstr "Ripeti all'infinito la sequenza dei ritardi"
#. TC: User specifies no dialog box to be shown.
-#: python/sourceclientgui.py:1030
+#: python/sourceclientgui.py:1056
msgid "Quiet"
msgstr "Calmo"
-#: python/sourceclientgui.py:1032
+#: python/sourceclientgui.py:1058
msgid "Keep the reconnection dialogue box hidden at all times."
msgstr "Tieni nascosta la finestra della riconnessone ad ogni tentativo."
-#: python/sourceclientgui.py:1037
+#: python/sourceclientgui.py:1063
msgid "The contingency plan upon the stream buffer becoming full is..."
msgstr "Il piano da attuare nel caso il buffer si stia riempiendo è..."
-#: python/sourceclientgui.py:1046
+#: python/sourceclientgui.py:1072
msgid "Discard audio data for as long as needed."
msgstr "Scarta i dati audio finché è necessario."
-#: python/sourceclientgui.py:1048
+#: python/sourceclientgui.py:1074
msgid "Assume the connection is beyond saving and reconnect."
msgstr "Assumi che la connessione sia in fase di salvataggio e riconnettiti."
-#: python/sourceclientgui.py:1300
+#: python/sourceclientgui.py:1357 python/format.py:1140
msgid "Shoutcast"
msgstr "Shoucast"
-#: python/sourceclientgui.py:1337
+#: python/sourceclientgui.py:1394
#, fuzzy
msgid "[Metadata suppressed]"
msgstr "Sorgente dei metadati"
-#: python/sourceclientgui.py:1416
+#: python/sourceclientgui.py:1473
msgid "Individual Controls"
msgstr "Controlli individuali"
-#: python/sourceclientgui.py:1430
+#: python/sourceclientgui.py:1487
#, fuzzy
msgid ""
"Connect to or disconnect from the radio server. If the button does not stay "
@@ -3752,12 +3832,12 @@ msgstr ""
"server principale."
#. TC: Kick whoever is on the server.
-#: python/sourceclientgui.py:1447
+#: python/sourceclientgui.py:1504
#, fuzzy
msgid "Kick Source"
msgstr "Fonte"
-#: python/sourceclientgui.py:1449
+#: python/sourceclientgui.py:1506
msgid ""
"This will disconnect whoever is currently using the server, freeing it up "
"for personal use."
@@ -3765,17 +3845,17 @@ msgstr ""
"Questo disconnetterà chiunque stia utilizzando il server, liberandolo per un "
"uso personale."
-#: python/sourceclientgui.py:1459
+#: python/sourceclientgui.py:1516
#, fuzzy
msgid "Timer:"
msgstr "Cronometro"
-#: python/sourceclientgui.py:1463
+#: python/sourceclientgui.py:1520
#, fuzzy
msgid "From"
msgstr "Da qui"
-#: python/sourceclientgui.py:1464
+#: python/sourceclientgui.py:1521
msgid ""
"Automatically connect to the server at a specific time in 24 hour format, "
"midnight being 00:00"
@@ -3783,19 +3863,19 @@ msgstr ""
"Connessione automatica al server ad un orario specifico nel formato a 24 "
"ore, la mezzanotte è indicata con 00:00"
-#: python/sourceclientgui.py:1469
+#: python/sourceclientgui.py:1526
msgid "Kick"
msgstr ""
-#: python/sourceclientgui.py:1471
+#: python/sourceclientgui.py:1528
msgid "Disconnect whoever is using the server just before start time."
msgstr "Disconnetti chiunque stia usando il server poco prima dell'inizio."
-#: python/sourceclientgui.py:1480
+#: python/sourceclientgui.py:1537
msgid "To"
msgstr ""
-#: python/sourceclientgui.py:1481
+#: python/sourceclientgui.py:1538
msgid ""
"Automatically disconnect from the server at a specific time in 24 hour "
"format."
@@ -3803,25 +3883,25 @@ msgstr ""
"Disconnessione automatica al server ad un orario specifico nel formato a 24 "
"ore, la mezzanotte è indicata con 00:00"
-#: python/sourceclientgui.py:1484
+#: python/sourceclientgui.py:1541
#, fuzzy
msgid "Fade out"
msgstr "Dissolvi 5sec"
-#: python/sourceclientgui.py:1486
+#: python/sourceclientgui.py:1543
msgid "Fade audio before disconnecting."
msgstr ""
-#: python/sourceclientgui.py:1500
+#: python/sourceclientgui.py:1557
msgid "At connect:"
msgstr "Una volta connesso:"
#. TC: [x] Start player (*) 1 ( ) 2
-#: python/sourceclientgui.py:1504
+#: python/sourceclientgui.py:1561
msgid "Start player"
msgstr "Lettore iniziale"
-#: python/sourceclientgui.py:1509
+#: python/sourceclientgui.py:1566
msgid ""
"Have one of the players start automatically when a radio server connection "
"is successfully made."
@@ -3830,11 +3910,11 @@ msgstr ""
"buon fine."
#. TC: [x] Start recorder (*) 1 ( ) 2
-#: python/sourceclientgui.py:1517
+#: python/sourceclientgui.py:1574
msgid "Start recorder"
msgstr "Avvia il registratore"
-#: python/sourceclientgui.py:1524
+#: python/sourceclientgui.py:1581
msgid ""
"Have a recorder start automatically when a radio server connection is "
"successfully made."
@@ -3842,20 +3922,21 @@ msgstr ""
"Avvia uno dei registratori automaticamente quando una connessione al server "
"va a buon fine."
-#: python/sourceclientgui.py:1529
+#: python/sourceclientgui.py:1586 python/format.py:521 python/format.py:532
+#: python/format.py:542
msgid "Metadata"
msgstr "Metadati"
-#: python/sourceclientgui.py:1539
+#: python/sourceclientgui.py:1596
msgid "Format String"
msgstr "Stringa di formattazione"
#. TC: Label for the metadata fallback value.
-#: python/sourceclientgui.py:1541
+#: python/sourceclientgui.py:1598
msgid "Fallback"
msgstr "Alternativa"
-#: python/sourceclientgui.py:1555
+#: python/sourceclientgui.py:1612
msgid ""
"You can enter text to accompany the stream here and can specify placemarkers "
"%r %t %l %s for the artist, title, album, and songname respectively, or "
@@ -3879,7 +3960,7 @@ msgstr ""
"Se lasciato vuoto, i flussi Ogg utilizzeranno i tag standard e gli mp3 "
"utilizzeranno %s."
-#: python/sourceclientgui.py:1563
+#: python/sourceclientgui.py:1620
msgid ""
"The fallback text to use when %r %t %l metadata is unavailable. See the "
"format string to the left."
@@ -3887,7 +3968,7 @@ msgstr ""
"Il testo cui ricorrere quando i metadati %r %t %l non sono disponibili. "
"Guarda il formato dell stringa sulla sinitra."
-#: python/sourceclientgui.py:1565
+#: python/sourceclientgui.py:1622
msgid ""
"Metadata normally updates only on song title changes but you can force an "
"immediate update here."
@@ -3895,28 +3976,28 @@ msgstr ""
"I metadati di solito vengono aggiornati quando cambia il titolo della song "
"in esecuzione ma potete forzare un aggiornamento automatico qui."
-#: python/sourceclientgui.py:1584
+#: python/sourceclientgui.py:1641
msgid "Configuration"
msgstr "Configurazione"
-#: python/sourceclientgui.py:1585
+#: python/sourceclientgui.py:1642
msgid "The controls for configuring a stream."
msgstr "I controlli per configurare un flusso."
-#: python/sourceclientgui.py:1593
+#: python/sourceclientgui.py:1650
msgid "Connection"
msgstr "Connessione"
-#: python/sourceclientgui.py:1598
+#: python/sourceclientgui.py:1655
msgid "Format"
msgstr "Formato"
#. TC: Tab heading. User can enter information about the stream here.
-#: python/sourceclientgui.py:1607
+#: python/sourceclientgui.py:1664
msgid "Stream Info"
msgstr "Informazioni flusso"
-#: python/sourceclientgui.py:1612
+#: python/sourceclientgui.py:1669
msgid ""
"Enter your DJ name or station name here. Typically this information will be "
"displayed by listener clients."
@@ -3925,7 +4006,7 @@ msgstr ""
"informazioni saranno visualizzate attraverso i programmi usati dagli "
"ascoltatori."
-#: python/sourceclientgui.py:1615
+#: python/sourceclientgui.py:1672
msgid ""
"The URL of your radio station. This and the rest of the information below is "
"intended for display on a radio station listings website."
@@ -3934,19 +4015,19 @@ msgstr ""
"informazioni qui sotto sono da intendersi come visualizzabili su di un sito "
"web che fornisce una lista di stazioni."
-#: python/sourceclientgui.py:1620
+#: python/sourceclientgui.py:1677
msgid "A description of your radio station."
msgstr "Descrizione della vostra stazione."
-#: python/sourceclientgui.py:1625
+#: python/sourceclientgui.py:1682
msgid "The musical genres you are likely to play."
msgstr "Il genere musicale che offrirete."
-#: python/sourceclientgui.py:1628
+#: python/sourceclientgui.py:1685
msgid "Make Public"
msgstr "Rendi pubblico"
-#: python/sourceclientgui.py:1629
+#: python/sourceclientgui.py:1686
msgid ""
"Publish your radio station on a listings website. The website in question "
"will depend on how the server to which you connect is configured."
@@ -3954,15 +4035,15 @@ msgstr ""
"Pubblicate la vostra stazione su un sito. Il sito in questione dipenderà "
"dalla configurazione del server cui vi connettete."
-#: python/sourceclientgui.py:1641
+#: python/sourceclientgui.py:1698
msgid "Genre(s)"
msgstr "Genere(i)"
-#: python/sourceclientgui.py:1651
+#: python/sourceclientgui.py:1709
msgid "Master server admin password"
msgstr "Password di amministrazione del server principale"
-#: python/sourceclientgui.py:1656
+#: python/sourceclientgui.py:1714
msgid ""
"This is for kick and stats on Shoutcast master servers that have an "
"administrator password. For those that don't leave this blank (the source "
@@ -3972,47 +4053,56 @@ msgstr ""
"password di amministrazione impostata. Per chi riempie questo campo (la "
"password della fonte è sufficente)"
-#: python/sourceclientgui.py:1665
+#: python/sourceclientgui.py:1723
msgid "Contact Details"
msgstr "Dettagli del contatto"
-#: python/sourceclientgui.py:1670
+#: python/sourceclientgui.py:1727
msgid "Internet Relay Chat connection info goes here."
msgstr "Le informazioni per IRC vanno inserite qui"
-#: python/sourceclientgui.py:1673
+#: python/sourceclientgui.py:1730
msgid "Connection info for AOL instant messenger goes here."
msgstr "Le informazioni per AOL vanno inserite qui."
-#: python/sourceclientgui.py:1676
+#: python/sourceclientgui.py:1733
msgid "ICQ instant messenger connection info goes here."
msgstr "Le informazioni per ICQ vanno inserite qui."
-#: python/sourceclientgui.py:1679
+#: python/sourceclientgui.py:1736
msgid "IRC"
msgstr "IRC"
-#: python/sourceclientgui.py:1680
+#: python/sourceclientgui.py:1737
msgid "AIM"
msgstr "AIM"
-#: python/sourceclientgui.py:1681
+#: python/sourceclientgui.py:1738
msgid "ICQ"
msgstr "ICQ"
-#: python/sourceclientgui.py:1690
+#: python/sourceclientgui.py:1748
+#, fuzzy
+msgid "Use ISO-8859-1 encoding for fixed metadata"
+msgstr "Usa la codifica utf-8 quando si inviano i metadati"
+
+#: python/sourceclientgui.py:1750
+msgid "Enable this if sending to a Shoutcast V1 server."
+msgstr ""
+
+#: python/sourceclientgui.py:1754
msgid "Extra Shoutcast"
msgstr "Extra Shoutcast"
-#: python/sourceclientgui.py:1695
+#: python/sourceclientgui.py:1759
msgid "Troubleshooting"
msgstr "Risoluzione problemi"
-#: python/sourceclientgui.py:1821
+#: python/sourceclientgui.py:1890
msgid "Stop recording."
msgstr "Ferma la registrazione"
-#: python/sourceclientgui.py:1823
+#: python/sourceclientgui.py:1892
msgid ""
"Start recording.\n"
"\n"
@@ -4020,20 +4110,20 @@ msgid ""
"not valid or write permission is not granted on the selected folder."
msgstr ""
-#: python/sourceclientgui.py:1828
+#: python/sourceclientgui.py:1897
msgid "Pause recording."
msgstr "Metti in pausa"
-#: python/sourceclientgui.py:1865
+#: python/sourceclientgui.py:1934
msgid "Recording time elapsed."
msgstr "Tempo di registrazione trascorso."
#. TC: Dialog title bar text.
-#: python/sourceclientgui.py:1919
+#: python/sourceclientgui.py:1988
msgid "Select the folder to record to"
msgstr "Seleziona la cartella in cui registrare"
-#: python/sourceclientgui.py:1930
+#: python/sourceclientgui.py:1999
msgid ""
"Choose which stream to record or the 24 bit FLAC option. If the stream isn't "
"already running the encoder will be started automatically using whatever "
@@ -4043,7 +4133,7 @@ msgstr ""
"già attivo il codificatore verrà avviato automaticamente con le impostazioni "
"attualmente configurate."
-#: python/sourceclientgui.py:1934
+#: python/sourceclientgui.py:2003
msgid ""
"Choose which directory you want to save to. All file names will be in a "
"timestamp format and have either an oga, mp3, or flac file extension. "
@@ -4055,74 +4145,75 @@ msgstr ""
"Importante: dovete scegliere una cartella per la quale avete i permessi "
"necessari alla scrittura."
-#: python/sourceclientgui.py:2038
+#: python/sourceclientgui.py:2110
msgid "Perform operations on multiple servers in unison."
msgstr "Esegue le operazioni su più server alla volta."
-#: python/sourceclientgui.py:2050
+#: python/sourceclientgui.py:2122
msgid "Connect"
msgstr "Connetti"
-#: python/sourceclientgui.py:2067
+#: python/sourceclientgui.py:2139
msgid "Disconnect"
msgstr "Disconnetti"
-#: python/sourceclientgui.py:2075
+#: python/sourceclientgui.py:2147
#, fuzzy
msgid "Kick Sources"
msgstr "Fonte"
-#: python/sourceclientgui.py:2084
+#: python/sourceclientgui.py:2156
msgid "Metadata:"
msgstr "Metadati:"
-#: python/sourceclientgui.py:2114
+#: python/sourceclientgui.py:2186
msgid "Group Controls"
msgstr "Controlli di gruppo"
-#: python/sourceclientgui.py:2610
+#: python/sourceclientgui.py:2692
msgid "Recording Facility Unavailable"
msgstr ""
-#: python/sourceclientgui.py:2613
+#: python/sourceclientgui.py:2695
#, fuzzy
msgid "No Recorders Are Correctly Configured"
msgstr "Nessun server principale configurato"
#. TC: Recorder menu format string.
-#: python/sourceclientgui.py:2626
+#: python/sourceclientgui.py:2708
+#, python-brace-format
msgid "{numericid} [{source}] > [{directory}]"
msgstr ""
-#: python/sourceclientgui.py:2628
+#: python/sourceclientgui.py:2710
msgid "Misconfigured"
msgstr ""
-#: python/sourceclientgui.py:2649
+#: python/sourceclientgui.py:2731
msgid "Streaming Facility Unavailable"
msgstr ""
-#: python/sourceclientgui.py:2651
+#: python/sourceclientgui.py:2733
#, fuzzy
msgid "No Streams Are Currently Configured"
msgstr "Nessun server principale configurato"
-#: python/sourceclientgui.py:2654
+#: python/sourceclientgui.py:2736
#, fuzzy
msgid "Group Connect"
msgstr "Controlli di gruppo"
-#: python/sourceclientgui.py:2660
+#: python/sourceclientgui.py:2742
#, fuzzy
msgid "Group Disconnect"
msgstr "Disconnetti"
#. TC: Window title bar text.
-#: python/sourceclientgui.py:2691
+#: python/sourceclientgui.py:2773
msgid "IDJC Output"
msgstr "Uscita IDJC"
-#: python/sourceclientgui.py:2707
+#: python/sourceclientgui.py:2789
msgid ""
"Each one of these tabs represents a separate stream recorder. The LED "
"indicator colours represent the following: Clear=Stopped Yellow=Paused "
@@ -4131,7 +4222,7 @@ msgstr ""
"Ognuna di queste linguette rappresenta un registratore di flusso. I colori "
"del LED indicano: Vuoto=Fermo Giallo=Pausa Rosso=Registrazione."
-#: python/sourceclientgui.py:2715
+#: python/sourceclientgui.py:2797
msgid ""
"Each one of these tabs represents a separate radio streamer. The LED "
"indicator colours represent the following: Clear=No connection "
@@ -4142,11 +4233,11 @@ msgstr ""
"Vuoto=Non connesso Giallo=In attesa di autenticazione. Verde=Connesso. "
"Lampeggiante=Perdita di pacchetti a causa di una cattiva connessione."
-#: python/sourceclientgui.py:2733
+#: python/sourceclientgui.py:2815
msgid " Stream "
msgstr " Flusso "
-#: python/sourceclientgui.py:2768
+#: python/sourceclientgui.py:2850
msgid ""
"<span weight=\"bold\" size=\"12000\">A connection to a radio server has "
"failed.</span>\n"
@@ -4158,7 +4249,7 @@ msgstr ""
"\n"
"Non verrà effettuato un altro tentativo."
-#: python/sourceclientgui.py:2773
+#: python/sourceclientgui.py:2855
msgid ""
"<span weight=\"bold\" size=\"12000\">A scheduled stream disconnection has "
"occurred.</span>"
@@ -4166,6 +4257,524 @@ msgstr ""
"<span weight=\"bold\" size=\"12000\">E' intervenuta una disconnessione "
"pianificata.</span>"
+#: python/format.py:419
+msgid "Right click for suggested values."
+msgstr ""
+
+#: python/format.py:438
+#, fuzzy
+msgid "Suggested Values"
+msgstr "Imposta valore"
+
+#: python/format.py:494
+#, fuzzy
+msgid "Pregain"
+msgstr "Lettore imposta il gain"
+
+#: python/format.py:495 python/format.py:913
+msgid "0 dB"
+msgstr ""
+
+#: python/format.py:496 python/format.py:914
+msgid "-0.5 dB"
+msgstr ""
+
+#: python/format.py:497 python/format.py:915
+msgid "-1.0 dB"
+msgstr ""
+
+#: python/format.py:498 python/format.py:916
+msgid "-1.5 dB"
+msgstr ""
+
+#: python/format.py:499 python/format.py:917
+msgid "-2.0 dB"
+msgstr ""
+
+#: python/format.py:500 python/format.py:918
+msgid "-2.5 dB"
+msgstr ""
+
+#: python/format.py:501 python/format.py:919
+msgid "-3.0 dB"
+msgstr ""
+
+#: python/format.py:502
+msgid ""
+"A blanket gain reduction to promote audio quality when using long "
+"established lossy audio codecs like mp3 with loud audio material.\n"
+"\n"
+"ReplayGain makes this feature generally unnecessary and the correct setting "
+"in that case is 0 dB."
+msgstr ""
+
+#: python/format.py:510
+#, fuzzy
+msgid "Resample Quality"
+msgstr "Qualità di ricampionamento del lettore"
+
+#: python/format.py:511
+msgid "Highest"
+msgstr "Elevata"
+
+#: python/format.py:513
+#, fuzzy
+msgid "Lowest"
+msgstr "Inferiore %"
+
+#: python/format.py:514
+msgid ""
+"All of these settings will provide adequate audio quality. The highest "
+"setting will preserve more of the original audio bandwidth at the expense of "
+"many CPU cycles."
+msgstr ""
+
+#: python/format.py:522 python/format.py:533 python/format.py:543
+#, fuzzy
+msgid "Suppressed"
+msgstr "Premuto"
+
+#: python/format.py:523 python/format.py:534
+msgid "UTF-8"
+msgstr ""
+
+#: python/format.py:524
+msgid "Latin1 *"
+msgstr ""
+
+#: python/format.py:525
+msgid ""
+"This affects the stream metadata only. Recordings will use UTF-8 for their "
+"metadata."
+msgstr ""
+
+#: python/format.py:535
+msgid ""
+"Choose whether the stream will carry dynamic metadata. In the case of Ogg "
+"streams this is important as a great many players can't handle chained Ogg "
+"streams which result from the metadata updates."
+msgstr ""
+
+#: python/format.py:544
+msgid "Latin1"
+msgstr ""
+
+#: python/format.py:545
+msgid "Choose whether to send metadata. Recordings will use UTF-8 metadata."
+msgstr ""
+
+#: python/format.py:561 python/format.py:572 python/format.py:583
+#: python/format.py:690 python/format.py:818 python/format.py:888
+#: python/format.py:897 python/format.py:971 python/format.py:994
+#: python/format.py:1003
+msgid "Mode"
+msgstr "Modo"
+
+#: python/format.py:562 python/format.py:573 python/format.py:584
+#: python/format.py:691 python/format.py:819 python/format.py:889
+#: python/format.py:898 python/format.py:972 python/format.py:995
+#: python/format.py:1004
+msgid "Mono"
+msgstr "Mono"
+
+#: python/format.py:563 python/format.py:574 python/format.py:585
+#: python/format.py:692 python/format.py:820 python/format.py:890
+#: python/format.py:899 python/format.py:973 python/format.py:996
+#: python/format.py:1005
+msgid "Stereo"
+msgstr "Stereo"
+
+#: python/format.py:564 python/format.py:575 python/format.py:586
+#: python/format.py:693
+#, fuzzy
+msgid "Joint Stereo"
+msgstr "Stereo"
+
+#: python/format.py:565
+msgid "Joint Stereo is a good choice on streams with low bitrates."
+msgstr ""
+
+#: python/format.py:576
+msgid "Due to the high bitrate selected, this codec will only support stereo."
+msgstr ""
+
+#: python/format.py:587
+msgid "Due to the low bitrate selected, this codec will only support mono."
+msgstr ""
+
+#: python/format.py:636 python/format.py:646 python/format.py:743
+#: python/format.py:753 python/format.py:763 python/format.py:869
+#: python/format.py:879 python/format.py:1032 python/format.py:1052
+#, fuzzy
+msgid "Samplerate"
+msgstr "Frequenza di campionamento"
+
+#. TC: Abbreviation of the word, standard.
+#: python/format.py:657 python/format.py:774
+msgid "Std."
+msgstr ""
+
+#. TC: v stands for version.
+#: python/format.py:659 python/format.py:776
+msgid "V 1"
+msgstr ""
+
+#. TC: v stands for version.
+#: python/format.py:661 python/format.py:778
+msgid "V 2"
+msgstr ""
+
+#: python/format.py:662
+msgid ""
+"MPEG2 introduced lower samplerate options and corresponding lower bitrates. "
+"Choose 2 if those are required."
+msgstr ""
+
+#: python/format.py:669 python/format.py:797
+msgid "Quality"
+msgstr "Qualità"
+
+#: python/format.py:670
+msgid "0 most"
+msgstr ""
+
+#. TC: * means is the recommended setting.
+#: python/format.py:673
+msgid "2 *"
+msgstr ""
+
+#: python/format.py:675
+msgid "Higher quality costs more in terms of CPU cycles."
+msgstr ""
+
+#: python/format.py:694
+msgid "Joint Stereo is a good choice on streams with low bitrates"
+msgstr ""
+
+#. TC: v stands for version.
+#: python/format.py:780
+msgid "V 2.5"
+msgstr ""
+
+#: python/format.py:787
+msgid "Complexity"
+msgstr ""
+
+#: python/format.py:790
+msgid "A quality setting that affects how heavily the CPU is used."
+msgstr ""
+
+#: python/format.py:800
+msgid "The higher this setting, the higher the bitrate."
+msgstr ""
+
+#: python/format.py:807
+msgid "Bandwidth"
+msgstr ""
+
+#: python/format.py:808
+#, fuzzy
+msgid "Ultrawide"
+msgstr "Banda ultra larga"
+
+#: python/format.py:809
+#, fuzzy
+msgid "Wide"
+msgstr "Banda larga"
+
+#: python/format.py:810
+#, fuzzy
+msgid "Narrow"
+msgstr "Banda stretta"
+
+#: python/format.py:811
+msgid "Essentially a samplerate setting."
+msgstr ""
+
+#: python/format.py:828
+msgid "24 bit"
+msgstr ""
+
+#: python/format.py:829
+msgid "20 bit"
+msgstr ""
+
+#: python/format.py:830
+msgid "16 bit"
+msgstr ""
+
+#: python/format.py:831
+msgid ""
+"24 bit records with the highest level of detail. If file size is a concern "
+"maybe FLAC is not the right codec."
+msgstr ""
+
+#: python/format.py:838 python/format.py:927
+msgid "Variability"
+msgstr ""
+
+#: python/format.py:839
+msgid "Constant"
+msgstr ""
+
+#: python/format.py:840
+msgid "±10%"
+msgstr ""
+
+#: python/format.py:841
+msgid "±20%"
+msgstr ""
+
+#: python/format.py:842
+msgid "±30%"
+msgstr ""
+
+#: python/format.py:843
+msgid "±40%"
+msgstr ""
+
+#: python/format.py:844
+msgid "±50%"
+msgstr ""
+
+#: python/format.py:845
+#, fuzzy
+msgid "This control is for enabling variable bitrate on Vorbis streams."
+msgstr "I controlli per configurare un flusso."
+
+#: python/format.py:906
+#, fuzzy
+msgid "Postgain"
+msgstr "VoIP imposta guadagno"
+
+#: python/format.py:907
+msgid "3.0 dB"
+msgstr ""
+
+#: python/format.py:908
+msgid "2.5 dB"
+msgstr ""
+
+#: python/format.py:909
+msgid "2.0 dB"
+msgstr ""
+
+#: python/format.py:910
+msgid "1.5 dB"
+msgstr ""
+
+#: python/format.py:911
+msgid "1.0 dB"
+msgstr ""
+
+#: python/format.py:912
+msgid "0.5 dB"
+msgstr ""
+
+#: python/format.py:920
+msgid "A gain adjustment for the player to apply."
+msgstr ""
+
+#: python/format.py:928
+msgid "CBR *"
+msgstr ""
+
+#: python/format.py:929
+msgid "CVBR"
+msgstr ""
+
+#: python/format.py:930
+msgid "VBR"
+msgstr ""
+
+#: python/format.py:931
+msgid ""
+"Bitrate variability. Actual VBR operation may require a higher frame size."
+msgstr ""
+
+#: python/format.py:938
+msgid "Frame Size"
+msgstr ""
+
+#: python/format.py:939
+msgid "60 ms"
+msgstr ""
+
+#: python/format.py:940
+msgid "40 ms"
+msgstr ""
+
+#: python/format.py:941
+msgid "20 ms"
+msgstr ""
+
+#: python/format.py:942
+msgid "A higher frame size may sound better on very low bitrates."
+msgstr ""
+
+#: python/format.py:949
+msgid "CPU"
+msgstr "CPU"
+
+#: python/format.py:952
+msgid "The encoder complexity setting which affects CPU load."
+msgstr ""
+
+#: python/format.py:980 python/format.py:1083
+msgid "Codec"
+msgstr ""
+
+#: python/format.py:981
+msgid "Vorbis"
+msgstr ""
+
+#: python/format.py:982
+msgid "FLAC"
+msgstr ""
+
+#: python/format.py:983
+msgid "Speex"
+msgstr ""
+
+#: python/format.py:984
+msgid "Opus"
+msgstr ""
+
+#: python/format.py:987
+msgid "Codecs of the Ogg container."
+msgstr ""
+
+#: python/format.py:1033
+msgid "96000 Hz"
+msgstr ""
+
+#: python/format.py:1034
+msgid "88200 Hz"
+msgstr ""
+
+#: python/format.py:1035
+msgid "64000 Hz"
+msgstr ""
+
+#: python/format.py:1036 python/format.py:1053
+msgid "48000 Hz"
+msgstr ""
+
+#: python/format.py:1037 python/format.py:1054
+msgid "44100 Hz"
+msgstr ""
+
+#: python/format.py:1038
+msgid "32000 Hz"
+msgstr ""
+
+#: python/format.py:1039
+msgid "24000 Hz"
+msgstr ""
+
+#: python/format.py:1040
+msgid "22050 Hz"
+msgstr ""
+
+#: python/format.py:1041
+msgid "16000 Hz"
+msgstr ""
+
+#: python/format.py:1042
+msgid "12000 Hz"
+msgstr ""
+
+#: python/format.py:1043
+msgid "11025 Hz"
+msgstr ""
+
+#: python/format.py:1044
+msgid "8000 Hz"
+msgstr ""
+
+#: python/format.py:1045
+msgid "7350 Hz"
+msgstr ""
+
+#: python/format.py:1067
+msgid "The MP2 option requires IDJC be rebuilt against libtwolame."
+msgstr ""
+
+#: python/format.py:1070
+msgid "Enable the MP3 option by installing libmp3lame."
+msgstr ""
+
+#: python/format.py:1073
+msgid "The AAC options require IDJC be rebuilt against libav libraries."
+msgstr ""
+
+#: python/format.py:1076
+msgid ""
+"Specific AAC support not present in libavcodec. More info: idjc.sourceforge."
+"net."
+msgstr ""
+
+#: python/format.py:1078
+msgid ""
+"Specific AAC+ support not present in libavcodec. More info: idjc.sourceforge."
+"net."
+msgstr ""
+
+#: python/format.py:1081
+msgid "Codecs of the MPEG family."
+msgstr ""
+
+#: python/format.py:1084
+msgid "MP2"
+msgstr ""
+
+#: python/format.py:1085
+msgid "MP3"
+msgstr ""
+
+#: python/format.py:1086
+msgid "AAC"
+msgstr ""
+
+#: python/format.py:1087
+msgid "AAC+ v2"
+msgstr ""
+
+#. TC: Codec family e.g. Xiph/Ogg, MPEG etc.
+#: python/format.py:1099
+msgid "Family"
+msgstr ""
+
+#. TC: Xiph.org Ogg container format.
+#: python/format.py:1101
+msgid "Xiph/Ogg"
+msgstr ""
+
+#: python/format.py:1102
+msgid "MPEG"
+msgstr ""
+
+#: python/format.py:1103
+msgid "Codecs have been grouped by standards body and or container format."
+msgstr ""
+
+#: python/format.py:1128
+msgid "Capabilities"
+msgstr ""
+
+#: python/format.py:1140
+#, fuzzy
+msgid "Icecast"
+msgstr "Icecast 2 Master"
+
+#: python/format.py:1140
+#, fuzzy
+msgid "Recordable"
+msgstr "Registratore"
+
+#~ msgid "Playlist types (*.m3u, *.xspf, *.pls)"
+#~ msgstr "Tipi di playlist (*.m3u, *.xspf, *.pls)"
+
#~ msgid "Connection timer:"
#~ msgstr "Timer di connessione:"
@@ -4250,13 +4859,6 @@ msgstr ""
#~ "sensibilmente la dinamica. L'indicatore 'Str Peak' è utile per regolare "
#~ "questo valore."
-#~ msgid "Highest"
-#~ msgstr "Elevata"
-
-#, fuzzy
-#~ msgid "Lowest"
-#~ msgstr "Inferiore %"
-
#~ msgid "Prefs enable tooltips"
#~ msgstr "Preferenze abilita suggerimenti"
@@ -4428,9 +5030,6 @@ msgstr ""
#~ "all'ingresso del codificatore impedirà all'audio decodificato di superare "
#~ "0dB"
-#~ msgid "Use utf-8 encoding when streaming mp3 metadata"
-#~ msgstr "Usa la codifica utf-8 quando si inviano i metadati"
-
#~ msgid ""
#~ "It is standard to stream mp3 metadata with iso-8859-1 character encoding "
#~ "on shoutcast. This option should therefore not be used."
@@ -4445,15 +5044,9 @@ msgstr ""
#~ msgid "Fastest"
#~ msgstr "Più veloce"
-#~ msgid "Sample rate"
-#~ msgstr "Frequenza di campionamento"
-
#~ msgid "Use JACK sample rate"
#~ msgstr "Usa la frequenza di campionamento di JACK"
-#~ msgid "Quality"
-#~ msgstr "Qualità"
-
#~ msgid ""
#~ "No additional resampling will occur. The stream sample rate will be that "
#~ "of the JACK sound server."
@@ -4578,12 +5171,6 @@ msgstr ""
#~ msgid "This chooses the Speex format for streaming and recording."
#~ msgstr "Sceglie il formato Speex per il flusso e la registrazione."
-#~ msgid "Stereo"
-#~ msgstr "Stereo"
-
-#~ msgid "Mono"
-#~ msgstr "Mono"
-
#~ msgid "Upper %"
#~ msgstr "Superiore %"
@@ -4653,15 +5240,6 @@ msgstr ""
#~ msgid "Feature Disabled"
#~ msgstr "Configurazione disabilitata"
-#~ msgid "Ultra Wide Band"
-#~ msgstr "Banda ultra larga"
-
-#~ msgid "Wide Band"
-#~ msgstr "Banda larga"
-
-#~ msgid "Narrow Band"
-#~ msgstr "Banda stretta"
-
#~ msgid ""
#~ "Apply intensity stereo to the audio stream. This is a very efficient "
#~ "implementation of stereo but is only suited to voice."
@@ -4676,9 +5254,6 @@ msgstr ""
#~ "L'invio dei metadati può essere fuorviante per l'ascoltatore durante il "
#~ "cambio. Disattivando questa opzione potete evitarlo."
-#~ msgid "Mode"
-#~ msgstr "Modo"
-
#~ msgid ""
#~ "This is the audio bandwidth selector. Ultra Wide Band has a bandwidth of "
#~ "16kHz; Wide Band, 8kHz; Narrow Band, 4kHz. The samplerate is twice the "
@@ -4701,9 +5276,6 @@ msgstr ""
#~ "base alla qualità. Q8 è un buon compromesso per il parlato e Q10 "
#~ "rappresenta la scelta migliore per la musica."
-#~ msgid "CPU"
-#~ msgstr "CPU"
-
#~ msgid ""
#~ "This sets the level of complexity in the encoder. Higher values use more "
#~ "CPU but result in better sounding audio though not as great an "
diff --git a/python/Makefile.am b/python/Makefile.am
index da8f9ab..a0b0e1f 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -14,11 +14,12 @@ nodist_idjcpkgpython_PYTHON = __init__.py
dist_noinst_PYTHON = __init__.py.in.in
__init__.py: __init__.py.in
- @sed -e 's|$${pkgdatadir}|${pkgdatadir}|g' \
+ sed -e 's|$${pkgdatadir}|${pkgdatadir}|g' \
-e 's|$${pkglibdir}|${pkglibdir}|g' \
-e 's|$${exec_prefix}|${exec_prefix}|g' \
-e 's|$${prefix}|${prefix}|g' \
- -e 's|$${datarootdir}|${datarootdir}|g' $? >$@
+ -e 's|$${datarootdir}|${datarootdir}|g' \
+ $? >$@
clean-local:
rm -f __init__.py
diff --git a/python/Makefile.in b/python/Makefile.in
index e487d8c..50bb270 100644
--- a/python/Makefile.in
+++ b/python/Makefile.in
@@ -242,6 +242,7 @@ EXEEXT = @EXEEXT@
EXT = @EXT@
FGREP = @FGREP@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GIT_PROG_EXISTS = @GIT_PROG_EXISTS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
GMSGFMT = @GMSGFMT@
@@ -299,6 +300,7 @@ LN_S = @LN_S@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
@@ -888,11 +890,12 @@ uninstall-am: uninstall-idjcpkgpythonPYTHON \
__init__.py: __init__.py.in
- @sed -e 's|$${pkgdatadir}|${pkgdatadir}|g' \
+ sed -e 's|$${pkgdatadir}|${pkgdatadir}|g' \
-e 's|$${pkglibdir}|${pkglibdir}|g' \
-e 's|$${exec_prefix}|${exec_prefix}|g' \
-e 's|$${prefix}|${prefix}|g' \
- -e 's|$${datarootdir}|${datarootdir}|g' $? >$@
+ -e 's|$${datarootdir}|${datarootdir}|g' \
+ $? >$@
clean-local:
rm -f __init__.py
diff --git a/python/dialogs.py b/python/dialogs.py
index c91f895..4cc9afa 100644
--- a/python/dialogs.py
+++ b/python/dialogs.py
@@ -26,7 +26,7 @@ import pango
from idjc import FGlobs
from idjc.prelims import ProfileManager
-from .gtkstuff import threadslock
+from .gtkstuff import threadslock, idle_add
import gettext
t = gettext.translation(FGlobs.package_name, FGlobs.localedir, fallback=True)
@@ -207,7 +207,7 @@ class ReconnectionDialog(gtk.Dialog):
self.label2.set_text(self.lines[1].format(countdown=self.remaining))
if self.remaining == 0:
self.hide()
- glib.idle_add(self.reconnect_idle)
+ idle_add(self.reconnect_idle)
@threadslock
def reconnect_idle(self):
diff --git a/python/gtkstuff.py b/python/gtkstuff.py
index 3d12f71..9dc79d4 100644
--- a/python/gtkstuff.py
+++ b/python/gtkstuff.py
@@ -437,7 +437,7 @@ class WindowSizeTracker(object):
self._window.unmaximize()
self._window.resize(self._x, self._y)
if self._max:
- gobject.idle_add(threadslock(self._window.maximize))
+ idle_add(threadslock(self._window.maximize))
def _on_configure_event(self, widget, event):
if self._is_tracking and not self._max:
@@ -719,3 +719,36 @@ class FolderChooserButton(gtk.Button):
self._current_folder = new_folder
self._update_visual()
+
+def _source_wrapper(data):
+ if data[0]:
+ ret = data[1](*data[2], **data[3])
+ if ret:
+ return ret
+ data[0] = False
+
+
+def source_remove(data):
+ if data[0]:
+ glib.source_remove(data[4])
+ data[0] = False
+
+
+def timeout_add(interval, callback, *args, **kwargs):
+ data = [True, callback, args, kwargs]
+ data.append(glib.timeout_add(interval, _source_wrapper, data))
+ return data
+
+
+def timeout_add_seconds(interval, callback, *args, **kwargs):
+ data = [True, callback, args, kwargs]
+ data.append(glib.timeout_add_seconds(interval, _source_wrapper, data))
+ return data
+
+
+def idle_add(callback, *args, **kwargs):
+ data = [True, callback, args, kwargs]
+ data.append(glib.idle_add(_source_wrapper, data))
+ return data
+
+
diff --git a/python/idjcmonitor.py b/python/idjcmonitor.py
index cd3e549..76c4c75 100644
--- a/python/idjcmonitor.py
+++ b/python/idjcmonitor.py
@@ -36,7 +36,7 @@ def pid_exists(pid):
try:
os.kill(pid, 0)
except OSError, e:
- return e.errno == errno.EPERM
+ return e.errno == os.errno.EPERM
else:
return True
@@ -55,13 +55,20 @@ class IDJCMonitor(gobject.GObject):
(gobject.TYPE_STRING, gobject.TYPE_UINT)),
'streamstate-changed' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE,
(gobject.TYPE_INT, gobject.TYPE_BOOLEAN, gobject.TYPE_STRING)),
-
+ 'recordstate-changed' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE,
+ (gobject.TYPE_INT, gobject.TYPE_BOOLEAN, gobject.TYPE_STRING)),
+ 'channelstate-changed' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE,
+ (gobject.TYPE_UINT, gobject.TYPE_BOOLEAN)),
+ 'voip-mode-changed' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE,
+ (gobject.TYPE_UINT,)),
'metadata-changed' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE,
(gobject.TYPE_STRING,) * 5),
'effect-started': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE,
(gobject.TYPE_STRING,) * 2 + (gobject.TYPE_UINT,)),
'effect-stopped': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE,
(gobject.TYPE_UINT,)),
+ 'tracks-finishing': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE,
+ ()),
'frozen' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE,
(gobject.TYPE_STRING, gobject.TYPE_UINT, gobject.TYPE_BOOLEAN))
}
@@ -77,11 +84,17 @@ class IDJCMonitor(gobject.GObject):
'the song name from metadata tags when available'
' and from the filenmame when not',
"", gobject.PARAM_READABLE),
- 'music_filename' : (gobject.TYPE_STRING, 'music_filename',
+ 'music-filename' : (gobject.TYPE_STRING, 'music_filename',
'the audio file pathname of the track',
"", gobject.PARAM_READABLE),
'streaminfo' : (gobject.TYPE_PYOBJECT, 'streaminfo',
- 'information about the streams', gobject.PARAM_READABLE)
+ 'information about the streams', gobject.PARAM_READABLE),
+ 'recordinfo' : (gobject.TYPE_PYOBJECT, 'recordinfo',
+ 'information about the recorders', gobject.PARAM_READABLE),
+ 'channelinfo' : (gobject.TYPE_PYOBJECT, 'channelinfo',
+ 'toggle state of the audio channels', gobject.PARAM_READABLE),
+ 'voip-mode' : (gobject.TYPE_UINT, 'voip-mode', 'voice over ip mixer mode',
+ 0, 2, 0, gobject.PARAM_READABLE)
}
def __init__(self, profile):
@@ -174,19 +187,32 @@ class IDJCMonitor(gobject.GObject):
self._effect_stopped_handler)
self.__main.connect_to_signal("quitting", self._quit_handler)
self.__main.connect_to_signal("heartbeat", self._heartbeat_handler)
+ self.__main.connect_to_signal("channelstate_changed",
+ self._channelstate_handler)
+ self.__main.connect_to_signal("voip_mode_changed",
+ self._voip_mode_handler)
+ self.__main.connect_to_signal("tracks_finishing",
+ self._tracks_finishing_handler)
self.__output.connect_to_signal("streamstate_changed",
self._streamstate_handler)
+ self.__output.connect_to_signal("recordstate_changed",
+ self._recordstate_handler)
# Start watchdog thread.
self.__watchdog_id = gobject.timeout_add_seconds(3, self._watchdog)
self.__streams = {n : (False, "unknown") for n in xrange(10)}
+ self.__recorders = {n : (False, "unknown") for n in xrange(4)}
+ self.__channels = [False] * 12
+ self.__voip_mode = 0
+ main_iface = dbus.Interface(self.__main, self.__base_interface)
output_iface = dbus.Interface(self.__output, self.__base_interface)
self.emit("launch", self.__profile, self.__pid)
# Tell IDJC to initialize as empty its cache of sent data.
# This yields a dump of server related info.
+ main_iface.new_plugin_started()
output_iface.new_plugin_started()
except dbus.exceptions.DBusException:
self._start_probing()
@@ -205,6 +231,15 @@ class IDJCMonitor(gobject.GObject):
for id_, (conn, where) in self.__streams.iteritems():
if conn:
self._streamstate_handler(id_, 0, where)
+
+ for id_, (rec, where) in self.__recorders.iteritems():
+ if rec:
+ self._recordstate_handler(id_, 0, where)
+
+ for index, open_ in enumerate(self.__channels):
+ if open_:
+ self._channelstate_handler(index, 0)
+
self._quit_handler()
return False
elif self.__frozen:
@@ -233,6 +268,30 @@ class IDJCMonitor(gobject.GObject):
self.notify("streaminfo")
self.emit("streamstate-changed", numeric_id, connected, where)
+ def _recordstate_handler(self, numeric_id, recording, where):
+ numeric_id = int(numeric_id)
+ recording = bool(recording)
+ where = where.encode("utf-8")
+ self.__recorders[numeric_id] = (recording, where)
+ self.notify("recordinfo")
+ self.emit("recordstate-changed", numeric_id, recording, where)
+
+ def _channelstate_handler(self, numeric_id, open_):
+ numeric_id = int(numeric_id)
+ open_ = bool(open_)
+ self.__channels[numeric_id] = open_
+ self.notify("channelinfo")
+ self.emit("channelstate-changed", numeric_id, open_)
+
+ def _voip_mode_handler(self, mode):
+ mode = int(mode)
+ self.__voip_mode = mode
+ self.notify("voip-mode")
+ self.emit("voip-mode-changed", mode)
+
+ def _tracks_finishing_handler(self):
+ self.emit("tracks-finishing")
+
def _metadata_handler(self, artist, title, album, songname, music_filename):
def update_property(name, value):
@@ -269,6 +328,12 @@ class IDJCMonitor(gobject.GObject):
return getattr(self, "_IDJCMonitor__" + name)
if name == "streaminfo":
return tuple(self.__streams[n] for n in xrange(10))
+ elif name == "recordinfo":
+ return tuple(self.__recorders[n] for n in xrange(4))
+ elif name == "channelinfo":
+ return tuple(self.__channels[n] for n in xrange(12))
+ elif name == "voip-mode":
+ return self.__voip_mode
else:
raise AttributeError("Unknown property %s in %s" % (
name, repr(self)))
diff --git a/python/irc.py b/python/irc.py
index 855d880..46af7ae 100644
--- a/python/irc.py
+++ b/python/irc.py
@@ -24,6 +24,7 @@ import json
import time
import sys
import threading
+import traceback
import gettext
from inspect import getargspec
from functools import wraps, partial
@@ -36,6 +37,8 @@ try:
from irc import client
from irc import events
except ImportError:
+ traceback.print_exc()
+ print "No IRC support"
HAVE_IRC = False
else:
HAVE_IRC = True
@@ -46,6 +49,7 @@ from .gtkstuff import DefaultEntry
from .gtkstuff import NamedTreeRowReference
from .gtkstuff import ConfirmationDialog
from .gtkstuff import threadslock, gdklock
+from .gtkstuff import timeout_add, source_remove
from .utils import string_multireplace
from .tooltips import set_tip
@@ -81,13 +85,15 @@ MESSAGE_CATEGORIES = (
# TC: IRC message subcategory, triggered once when the stream starts.
_("On stream up"),
# TC: IRC message subcategory, triggered once at the stream's end.
- _("On stream down"))
+ _("On stream down"),
+ # TC: IRC message subcategory, triggered once at the stream's end.
+ _("Operations"))
ASCII_C0 = "".join(chr(x) for x in range(32))
-CODES_AND_DESCRIPTIONS = zip((u"%r", u"%t", u"%l", u"%s", u"%n", u"%d", u"%u"),
+CODES_AND_DESCRIPTIONS = zip((u"%r", u"%t", u"%l", u"%s", u"%n", u"%d", u"%u", u"%U"),
(_('Artist'), _('Title'), _('Album'), _('Song name'),
- _('DJ name'), _('Description'), _('Listen URL')))
+ _('DJ name'), _('Description'), _('Listen URL'), _('Source URI')))
class IRCEntry(gtk.Entry): # pylint: disable=R0904
@@ -534,10 +540,11 @@ message_offset_adj = gtk.Adjustment(0, 0, 9999, 1, 10)
message_interval_adj = gtk.Adjustment(600, 60, 9999, 1, 10)
-class MessageDialog(gtk.Dialog):
- """Base class for a message creation dialog."""
+class ChannelsDialog(gtk.Dialog):
+ """Channels entry dialog."""
icon = gtk.STOCK_NEW
+ title = "missing title"
def __init__(self, title=None):
if title is None:
@@ -546,56 +553,84 @@ class MessageDialog(gtk.Dialog):
gtk.Dialog.__init__(
self, title + " - IDJC" + ProfileManager().title_extra)
- hbox1 = gtk.HBox()
- hbox1.set_spacing(6)
+ chbox = gtk.HBox()
+ chbox.set_spacing(6)
# TC: An IRC channel #chan or user name entry box label.
l = gtk.Label(_("Channels/Users"))
self.channels = gtk.Entry()
- hbox1.pack_start(l, False)
- hbox1.pack_start(self.channels, True)
+ chbox.pack_start(l, False)
+ chbox.pack_start(self.channels, True)
set_tip(self.channels, _("The comma or space separated list of channels"
" and/or users to whom the message will be sent.\n\nProtected channels "
"are included with the form:\n#channel:keyword."))
- hbox2 = gtk.HBox()
- hbox2.set_spacing(6)
+ self.mainbox = gtk.VBox()
+ self.mainbox.set_spacing(5)
+ self.mainbox.pack_start(chbox, False)
+
+ self.hbox = gtk.HBox()
+ self.hbox.set_border_width(16)
+ self.hbox.set_spacing(5)
+ self.image = gtk.image_new_from_stock(self.icon, gtk.ICON_SIZE_DIALOG)
+ self.image.set_alignment(0.5, 0)
+ self.hbox.pack_start(self.image, False, padding=20)
+ self.hbox.pack_start(self.mainbox)
+
+ self.get_content_area().add(self.hbox)
+ self.channels.grab_focus()
+
+ def _from_channels(self):
+ text = self.channels.get_text().replace(",", " ").split()
+ return ",".join(x for x in text if x)
+
+ def as_tuple(self):
+ """Data extraction method."""
+
+ return (self._from_channels(),)
+
+
+class EditChannelsDialog(ChannelsDialog, EditDialogMixin):
+ """Adds delete and restore buttons to a channels dialog."""
+
+ icon = gtk.STOCK_EDIT
+
+ def __init__(self, title, orig_data):
+ ChannelsDialog.__init__(self, title)
+ EditDialogMixin.__init__(self, orig_data)
+
+ def from_tuple(self, orig_data):
+ """The data restore method."""
+
+ self.channels.set_text(orig_data[0])
+
+
+class MessageDialog(ChannelsDialog):
+ """Message entry dialog."""
+
+ def __init__(self, title=None):
+ ChannelsDialog.__init__(self, title)
+
+ hbox = gtk.HBox()
+ hbox.set_spacing(6)
# TC: Message text to send to an IRC channel. Widget label.
l = gtk.Label(_("Message"))
self.message = IRCEntry()
- hbox2.pack_start(l, False)
- hbox2.pack_start(self.message)
+ hbox.pack_start(l, False)
+ hbox.pack_start(self.message)
set_tip(self.message, _("The message to send.\n\nOn the pop-up window "
"(mouse right click) are some useful options for embedding metadata and"
" for text formatting.\n\nThe window below displays how the message "
"will appear to users of XChat."))
+ self.mainbox.pack_start(hbox, False)
sw = gtk.ScrolledWindow()
sw.set_policy(gtk.POLICY_NEVER, gtk.POLICY_ALWAYS)
irc_view = IRCView()
sw.add(irc_view)
- vbox = gtk.VBox()
- vbox.set_spacing(5)
- vbox.pack_start(hbox1, False)
- vbox.pack_start(hbox2, False)
- vbox.pack_start(sw)
-
- self.hbox = gtk.HBox()
- self.hbox.set_border_width(16)
- self.hbox.set_spacing(5)
- self.image = gtk.image_new_from_stock(self.icon, gtk.ICON_SIZE_DIALOG)
- self.image.set_alignment(0.5, 0)
- self.hbox.pack_start(self.image, False, padding=20)
- self.hbox.pack_start(vbox)
+ self.mainbox.pack_start(sw, False)
self.message.connect("changed",
lambda w: irc_view.set_text(w.get_text()))
-
- self.get_content_area().add(self.hbox)
- self.channels.grab_focus()
-
- def _from_channels(self):
- text = self.channels.get_text().replace(",", " ").split()
- return ",".join(x for x in text if x)
def _pack(self, widgets):
vbox = gtk.VBox()
@@ -818,7 +853,9 @@ class IRCRowReference(NamedTreeRowReference):
7: {"channels":5, "message":6},
- 9: {"channels":5, "message":6}
+ 9: {"channels":5, "message":6},
+
+ 11: {"channels":5}
}
def get_index_for_name(self, tree_row_ref, name):
@@ -1029,25 +1066,31 @@ class IRCPane(gtk.VBox):
text += " " + ", ".join(opt)
else:
channels = row.channels
- message = row.message
+
+ if row.type < 11:
+ message = row.message
- if row.type == 3:
- text = "+%d;%s; %s" % (row.delay, channels, message)
- elif row.type == 5:
- text = "%d/%d;%s; %s" % (
- row.offset, row.interval, channels, message)
- else:
- text = channels + "; " + message
+ if row.type == 3:
+ text = "+%d;%s; %s" % (row.delay, channels, message)
+ elif row.type == 5:
+ text = "%d/%d;%s; %s" % (
+ row.offset, row.interval, channels, message)
+ elif row.type in (7, 9):
+ text = channels + "; " + message
+ elif row.type == 11:
+ text = channels
else:
text = (("Server", ) + MESSAGE_CATEGORIES)[row.type / 2]
cell.props.text = text
- # TC: Expander text encapsulating messages that play when stream goes up.
+ # TC: Dialog title text.
_dsu = _("IRC stream up message")
- # TC: Expander text encapsulating messages that play when stream goes down.
+ # TC: Dialog title text.
_dsd = _("IRC stream down message")
+ # TC: Dialog title text.
+ _dso = _("IRC station operations")
@glue
def _on_new(self, mode, model, iter, dialog):
@@ -1060,28 +1103,32 @@ class IRCPane(gtk.VBox):
elif mode in (6, 8):
title = self._dsu if mode == 6 else self._dsd
dialog(MessageDialog(title), self._add_message, mode)
+ elif mode == 10:
+ dialog(ChannelsDialog(self._dso), self._add_channels, mode)
else:
- if mode / 2 < len(MESSAGE_CATEGORIES):
- print "there is no data entry dialog implemented for the '%s'" \
- " message category" % MESSAGE_CATEGORIES[mode / 2]
- else:
- print "unknown message category with numerical code,", mode
+ self._unhandled_mode(mode)
@glue
def _on_edit(self, mode, model, iter, dialog):
+ row = tuple(model[model.get_path(iter)])
+
if mode == 1:
- dialog(EditServerDialog(tuple(model[model.get_path(iter)])[2:14]),
- self._standard_edit, 2)
- if mode == 3:
- dialog(EditAnnounceMessageDialog(tuple(model[model.get_path(iter)])
- [4:7]), self._standard_edit, 4)
- if mode == 5:
- dialog(EditTimerMessageDialog(tuple(model[model.get_path(iter)])
- [3:7]), self._standard_edit, 3)
- if mode in (7, 9):
+ dialog(EditServerDialog(row[2:14]), self._standard_edit, 2)
+ elif mode == 3:
+ dialog(EditAnnounceMessageDialog(row[4:7]), self._standard_edit, 4)
+ elif mode == 5:
+ dialog(EditTimerMessageDialog(row[3:7]), self._standard_edit, 3)
+ elif mode in (7, 9):
title = self._dsu if mode == 7 else self._dsd
- dialog(EditMessageDialog(title, tuple(
- model[model.get_path(iter)])[5:7]), self._standard_edit, 5)
+ dialog(EditMessageDialog(title, row[5:7]), self._standard_edit, 5)
+ elif mode == 11:
+ dialog(EditChannelsDialog(self._dso, row[5:6]), self._standard_edit, 5)
+ else:
+ self._unhandled_mode(mode)
+
+ @staticmethod
+ def _unhandled_mode(mode):
+ print "unhandled message category with numerical code,", mode
def _standard_edit(self, d, model, iter, start):
model.row_changed_block()
@@ -1120,6 +1167,11 @@ class IRCPane(gtk.VBox):
return model.insert(parent_iter, 0, (mode + 1, 1, 0, 0, 0)
+ d.as_tuple() + ("", ) * 8)
+ @highlight
+ def _add_channels(self, d, model, parent_iter, mode):
+ return model.insert(parent_iter, 0, (mode + 1, 1, 0, 0, 0)
+ + d.as_tuple() + ("", ) * 9)
+
class ConnectionsController(list):
"""Layer between the user interface and the ServerConnection classes.
@@ -1184,8 +1236,12 @@ class IRCConnection(gtk.TreeRowReference, threading.Thread):
self._keepalive = True
self._have_welcome = False
self._stream_active = stream_active
- self.irc = client.IRC()
- self.server = self.irc.server()
+ try:
+ self.reactor = client.Reactor()
+ except AttributeError:
+ self.reactor = client.IRC() # Old API compatibility
+
+ self.server = self.reactor.server()
self.start()
self._hooks.append((model, model.connect("row-inserted",
self._on_row_inserted)))
@@ -1333,9 +1389,9 @@ class IRCConnection(gtk.TreeRowReference, threading.Thread):
while len(self._queue):
self._queue.pop(0)()
- self.irc.process_once(0.2)
+ self.reactor.process_once(0.2)
- self.irc.process_once()
+ self.reactor.process_once()
def cleanup(self):
for each in self._message_handlers:
@@ -1542,10 +1598,10 @@ class MessageHandler(gobject.GObject):
def stream_active(self):
return self._stream_active
- subst_keys = ("artist", "title", "album", "songname",
- "djname", "description", "url")
+ subst_keys = ("artist", "title", "album", "songname", "djname",
+ "description", "url", "source")
- subst_tokens = ("%r", "%t", "%l", "%s", "%n", "%d", "%u")
+ subst_tokens = ("%r", "%t", "%l", "%s", "%n", "%d", "%u", "%U")
subst = dict.fromkeys(subst_keys, "<No data>")
@@ -1624,7 +1680,7 @@ class MessageHandler(gobject.GObject):
else:
raise AttributeError("unknown property '%s'" % prop.name)
- def issue_messages(self, delay_calc=lambda row: 0):
+ def issue_messages(self, delay_calc=lambda row: 0, forced_message=None):
model = self.tree_row_ref.get_model()
iter = model.get_iter(self.tree_row_ref.get_path())
iter = model.iter_children(iter)
@@ -1637,7 +1693,10 @@ class MessageHandler(gobject.GObject):
targets = [x.split("!")[0] for x in row.channels.split(",")]
table = [("%%", "%")] + zip(self.subst_tokens, (
self.subst[x] for x in self.subst_keys))
- message = string_multireplace(row.message, table)
+ if forced_message is not None:
+ message = string_multireplace(forced_message, table)
+ else:
+ message = string_multireplace(row.message, table)
self.emit("privmsg-ready", targets, message, delay_s)
iter = model.iter_next(iter)
@@ -1657,11 +1716,11 @@ class MessageHandlerForType_5(MessageHandler):
self.on_stream_active()
def on_stream_active(self):
- self._timeout_id = gobject.timeout_add(500, self._timeout)
+ self._timeout_id = timeout_add(500, self._timeout)
def on_stream_inactive(self):
if self._timeout_id is not None:
- gobject.source_remove(self._timeout_id)
+ source_remove(self._timeout_id)
self._timeout_id = None
@threadslock
@@ -1680,7 +1739,7 @@ class MessageHandlerForType_5(MessageHandler):
def cleanup(self):
if self._timeout_id is not None:
- gobject.source_remove(self._timeout_id)
+ source_remove(self._timeout_id)
class MessageHandlerForType_7(MessageHandler):
@@ -1691,3 +1750,10 @@ class MessageHandlerForType_7(MessageHandler):
class MessageHandlerForType_9(MessageHandler):
def on_stream_inactive(self):
self.issue_messages()
+
+class MessageHandlerForType_11(MessageHandler):
+ def on_stream_active(self):
+ self.issue_messages(forced_message="!handover acquired %U")
+
+ def on_stream_inactive(self):
+ self.issue_messages(forced_message="!handover dropped %U")
diff --git a/python/jingles.py b/python/jingles.py
index 1a39e4e..56f1d85 100644
--- a/python/jingles.py
+++ b/python/jingles.py
@@ -34,6 +34,7 @@ from .gtkstuff import LEDDict
from .gtkstuff import WindowSizeTracker
from .gtkstuff import DefaultEntry
from .gtkstuff import threadslock
+from .gtkstuff import timeout_add, source_remove
from .tooltips import set_tip
from .utils import LinkUUIDRegistry
@@ -222,7 +223,7 @@ class Effect(gtk.HBox):
if self.effect_length == 0.0:
self.effect_length = self.interlude.get_media_metadata(self.pathname, True)
self.effect_start = time.time()
- self.timeout_source_id = gobject.timeout_add(playergui.PROGRESS_TIMEOUT,
+ self.timeout_source_id = timeout_add(playergui.PROGRESS_TIMEOUT,
self._progress_timeout)
self.tabeffectname.set_text(self.trigger_label.get_text())
self.tabeffecttime.set_text('0.0')
@@ -258,7 +259,7 @@ class Effect(gtk.HBox):
def _stop_progress(self):
if self.timeout_source_id:
- gobject.source_remove(self.timeout_source_id)
+ source_remove(self.timeout_source_id)
self.timeout_source_id = None
self.progress.set_fraction(0.0)
self.approot.jingles.nb_effects_box.remove(self.tabwidget)
diff --git a/python/maingui.py b/python/maingui.py
index 2d09228..b80eccd 100644
--- a/python/maingui.py
+++ b/python/maingui.py
@@ -53,6 +53,7 @@ from .utils import PathStr
from .gtkstuff import threadslock, WindowSizeTracker, ConfirmationDialog
from .gtkstuff import IconChooserButton, IconPreviewFileChooserDialog, LEDDict
from .gtkstuff import LabelSubst, gdklock, nullcm
+from .gtkstuff import idle_add, timeout_add, timeout_add_seconds, source_remove
from . import midicontrols
from .tooltips import set_tip
from . import songdb
@@ -728,7 +729,7 @@ class OpenerTab(gtk.VBox):
self.pack_start(self.is_microphone, False)
self.freewheel_cancel = gtk.CheckButton(
- 'This button will automatically cancel JACK freewheel mode')
+ _('This button will automatically cancel JACK freewheel mode'))
self.pack_start(self.freewheel_cancel, False)
set_tip(self.freewheel_cancel, _('This should be set for all buttons'
' that control input from a live sound source or device.'))
@@ -1180,8 +1181,8 @@ class MicOpener(gtk.HBox):
self._flashing_mode = False
self._flashing_timer = 0
self._headroom = 0.0
- timeout = glib.timeout_add(700, self.cb_flash_timeout)
- self.connect("destroy", lambda w: glib.source_remove(timeout))
+ timeout = timeout_add(700, self.cb_flash_timeout)
+ self.connect("destroy", lambda w: source_remove(timeout))
self.opener_settings = OpenerSettings()
self.opener_settings.connect("changed", self.cb_reconfigure)
@@ -2034,6 +2035,20 @@ class MainWindow(dbus.service.Object):
print "song title: %s\n" % self.songname
+ @dbus.service.method(dbus_interface=PGlobs.dbus_bus_basename)
+ def new_plugin_started(self):
+ self.channel_states = [-1, ] * 12
+ self.dbus_voip_mode = -1
+
+ @dbus.service.signal(dbus_interface=PGlobs.dbus_bus_basename, signature="u")
+ def voip_mode_changed(self, mode):
+ pass
+
+ @dbus.service.method(dbus_interface=PGlobs.dbus_bus_basename,
+ out_signature="s")
+ def get_database_credentials(self):
+ return json.dumps(self.topleftpane.prefs_controls.credentials())
+
@dbus.service.method(dbus_interface=PGlobs.dbus_bus_basename,
in_signature="sssssb")
def set_track_metadata(self, artist, title, album, songname, filename, log):
@@ -2083,6 +2098,12 @@ class MainWindow(dbus.service.Object):
"""DBus signal for plugins to attach to when new effects play"""
pass
+ @dbus.service.signal(dbus_interface=PGlobs.dbus_bus_basename,
+ signature="ub")
+ def channelstate_changed(self, index, is_open):
+ """DBus signal indicating audio channel toggle state"""
+ self.channel_states[index] = is_open
+
def songname_decode(self, data):
i = 1
while 1:
@@ -2159,7 +2180,7 @@ class MainWindow(dbus.service.Object):
time_lag = 0
else:
time_lag = int(time_lag / player.pbspeedfactor)
- gobject.timeout_add(time_lag, self.new_songname_timeout,
+ timeout_add(time_lag, self.new_songname_timeout,
(song, artist, title, album, player, player_context))
@threadslock
@@ -2226,7 +2247,7 @@ class MainWindow(dbus.service.Object):
self.player_right.advance()
if data.startswith("cfm"):
if self.crosspass:
- gobject.source_remove(self.crosspass)
+ source_remove(self.crosspass)
self.crosspass = 0
self.crossfade.set_value(data == "cfmright" and 100 \
or data == "cfmmidl" and 48 \
@@ -2237,7 +2258,7 @@ class MainWindow(dbus.service.Object):
self.crossdirection = not self.crossdirection
else:
self.crossdirection = (self.crossadj.get_value() <= 50)
- self.crosspass = gobject.timeout_add(
+ self.crosspass = timeout_add(
int(self.passspeed_adj.get_value() * 10), self.cb_crosspass)
if data == "Clear History":
self.history_buffer.set_text("")
@@ -2568,7 +2589,7 @@ class MainWindow(dbus.service.Object):
self.freewheel_button.set_active(False)
self.save_session("atexit")
if self.crosspass:
- gobject.source_remove(self.crosspass)
+ source_remove(self.crosspass)
self.server_window.cleanup()
self.mic_opener.close_all()
self.player_left.cleanup()
@@ -2578,9 +2599,9 @@ class MainWindow(dbus.service.Object):
self.player_right.flush = True
self.send_new_mixer_stats()
self.prefs_window.songdbprefs.disconnect()
- gobject.source_remove(self.statstimeout)
- gobject.source_remove(self.vutimeout)
- gobject.source_remove(self.savetimeout)
+ source_remove(self.statstimeout)
+ source_remove(self.vutimeout)
+ source_remove(self.savetimeout)
self._mixer_ctrl.close()
self.quitting()
self.window.hide()
@@ -2609,6 +2630,12 @@ class MainWindow(dbus.service.Object):
pass
+ @dbus.service.signal(dbus_interface=PGlobs.dbus_bus_basename, signature="")
+ def tracks_finishing(self):
+ """Called to notify DJ that music tracks are ending."""
+
+ pass
+
@dbus.service.method(dbus_interface=PGlobs.dbus_bus_basename, out_signature="u")
def pid(self):
"""Reply with the process ID."""
@@ -2874,7 +2901,16 @@ class MainWindow(dbus.service.Object):
player.check_mixer_signal()
elif player.pl_mode.get_active() == 0:
player.update_time_stats()
-
+
+ ch = self.mic_opener.mic_list
+ for i in xrange(PGlobs.num_micpairs * 2):
+ if self.channel_states[i] == -1:
+ ch[i].open.emit("toggled")
+
+ if self.dbus_voip_mode != self.mixermode:
+ self.dbus_voip_mode = self.mixermode
+ self.voip_mode_changed(self.mixermode)
+
return True
@@ -3769,6 +3805,8 @@ class MainWindow(dbus.service.Object):
self.jingles.interlude.silence = SlotObject(0.0)
self.sample_rate = SlotObject(0)
self.effects_playing = SlotObject(0)
+ self.channel_states = [-1, ] * 12
+ self.dbus_voip_mode = -1
self.feature_set = gtk.ToggleButton()
self.feature_set.set_active(True)
@@ -3854,15 +3892,14 @@ class MainWindow(dbus.service.Object):
self.prefs_window.load_player_prefs()
self.prefs_window.apply_player_prefs()
- self.vutimeout = gobject.timeout_add(50, self.vu_update)
- self.statstimeout = gobject.timeout_add(100, self.stats_update)
+ self.vutimeout = timeout_add(50, self.vu_update)
+ self.statstimeout = timeout_add(100, self.stats_update)
- self.savetimeout = gobject.timeout_add_seconds(
+ self.savetimeout = timeout_add_seconds(
120, threadslock(self.save_session), "periodic")
for sig in (signal.SIGINT, signal.SIGTERM, signal.SIGHUP):
- signal.signal(sig, lambda s, f: glib.idle_add(
- threadslock(self.destroy)))
+ signal.signal(sig, lambda s, f: idle_add(threadslock(self.destroy)))
(self.full_wst, self.min_wst)[bool(self.simplemixer)].apply()
self.window.connect("configure_event", self.configure_event)
@@ -3894,7 +3931,7 @@ class MainWindow(dbus.service.Object):
self.window.connect("key-release-event", self.cb_key_capture)
self.window.show()
- gobject.idle_add(lambda: self.prefs_window.window.realize() and False)
+ idle_add(lambda: self.prefs_window.window.realize() and False)
self.player_left.treeview.emit("cursor-changed")
self.player_right.treeview.emit("cursor-changed")
diff --git a/python/midicontrols.py b/python/midicontrols.py
index c9a4eaf..9fb0e5c 100644
--- a/python/midicontrols.py
+++ b/python/midicontrols.py
@@ -32,6 +32,7 @@ import dbus.service
from idjc import FGlobs, PGlobs
from .gtkstuff import threadslock
+from .gtkstuff import timeout_add, source_remove
from .prelims import ProfileManager
from .tooltips import set_tip
@@ -2167,9 +2168,8 @@ class BindingListModel(gtk.GenericTreeModel):
self.highlights= owner.owner.highlights
def on_realize(self, tree, column0, model_sort):
- source= gobject.timeout_add(
- 100, self.cb_highlights, tree, column0, model_sort)
- tree.connect_object('destroy', gobject.source_remove, source)
+ source= timeout_add(100, self.cb_highlights, tree, column0, model_sort)
+ tree.connect_object('destroy', source_remove, source)
@threadslock
def cb_highlights(self, tree, column0, model_sort):
diff --git a/python/playergui.py b/python/playergui.py
index a027c6b..fbbe24d 100644
--- a/python/playergui.py
+++ b/python/playergui.py
@@ -53,6 +53,7 @@ from .utils import SlotObject
from .utils import LinkUUIDRegistry
from .utils import PathStr
from .gtkstuff import threadslock, FolderChooserButton
+from .gtkstuff import idle_add, timeout_add, source_remove, nullcm, gdklock
from .prelims import *
from .tooltips import set_tip
@@ -66,9 +67,9 @@ def N_(text):
PM = ProfileManager()
+EasyID3.RegisterTXXXKey('TXXX_replaygain_track_gain', 'replaygain_track_gain')
link_uuid_reg = LinkUUIDRegistry()
-
# Suppress the warning that occurs when None is placed in a ListStore element
# where some kind of GObject is expected.
warnings.filterwarnings("ignore",
@@ -427,9 +428,8 @@ class ExternalPL(gtk.Frame):
self.active.show()
filefilter = gtk.FileFilter()
- filefilter.add_pattern("*.m3u")
- filefilter.add_pattern("*.pls")
- filefilter.add_pattern("*.xspf")
+ for each in supported.playlists:
+ filefilter.add_pattern(each)
self.filechooser = gtk.FileChooserDialog(title =
_('Choose a playlist file') + PM.title_extra, buttons = \
@@ -482,7 +482,7 @@ class AnnouncementDialog(gtk.Dialog):
gtk.Dialog.destroy(self)
def timeout_remove(self, widget):
- gobject.source_remove(self.timeout)
+ source_remove(self.timeout)
def timer_update(self, lock=True):
with (gdklock if lock else nullcm)():
@@ -540,6 +540,7 @@ class AnnouncementDialog(gtk.Dialog):
ivbox.pack_start(sw, True, True, 0)
sw.show()
self.tv = gtk.TextView()
+ self.tv.set_wrap_mode(gtk.WRAP_WORD_CHAR)
if mode == "active":
self.tv.unset_flags(gtk.CAN_FOCUS)
sw.add(self.tv)
@@ -582,7 +583,7 @@ class AnnouncementDialog(gtk.Dialog):
self.countdownlabel.set_attributes(self.attrlist)
self.oldinttime = -2
self.timer_update(False)
- self.timeout = gobject.timeout_add(100, self.timer_update)
+ self.timeout = timeout_add(100, self.timer_update)
self.connect("destroy", self.timeout_remove)
chbox.pack_start(self.countdownlabel, True, False, 0)
self.countdownlabel.show()
@@ -665,7 +666,7 @@ class Supported(object):
def __init__(self):
self.media = [".ogg", ".oga", ".wav", ".aiff", ".au", ".txt", ".cue"]
- self.playlists = [".m3u", ".xspf", ".pls"]
+ self.playlists = [".m3u", ".m3u8", ".xspf", ".pls"]
if FGlobs.have_libmpg123:
self.media.insert(0, ".mp3")
@@ -930,9 +931,9 @@ class CueSheet(object):
class IDJC_Media_Player:
playlisttype_extension = tuple(zip(
# File format selection items from a list (user can pick only one).
- (_('By Extension'), _('M3U playlist'),
+ (_('By Extension'), _('M3U playlist'), _('M3U8 playlist'),
_('XSPF playlist'), _('PLS playlist')),
- ('', 'm3u', 'xspf', 'pls'),))
+ ('', 'm3u', 'm3u8', 'xspf', 'pls'),))
def make_cuesheet_playlist_entry(self, cue_pathname):
cuesheet_liststore = CueSheetListStore()
@@ -1036,7 +1037,10 @@ class IDJC_Media_Player:
# Strip away any file:// prefix
if filename.count("file://", 0, 7):
- filename = filename[7:]
+ host, filename = filename[7:].split("/", 1)
+ filename = "/" + urllib.unquote(filename)
+ if host not in ("", "localhost", "127.0.0.1", "::1"):
+ return NOTVALID._replace(filename=filename)
elif filename.count("file:", 0, 5):
filename = filename[5:]
@@ -1054,6 +1058,50 @@ class IDJC_Media_Player:
_('Bad Tag'), glib.markup_escape_text(meta_name))
title_retval = meta_name
+ def gain(handle=None, prefix="", gain=None, ref=None):
+ try:
+ if ref is None:
+ ref = str(handle[prefix + "REPLAYGAIN_REFERENCE_LOUDNESS"][0])
+ except Exception:
+ ref = None
+ else:
+ try:
+ ref = float(ref.rstrip("dbDBLUlu"))
+ except Exception:
+ ref = None
+ else:
+ ref = "R128" if -23.1 < ref < -22.9 else "RG"
+
+ if gain is None:
+ gain = str(handle[prefix + "REPLAYGAIN_TRACK_GAIN"][0]).rstrip().upper()
+ else:
+ gain = gain.upper()
+ if gain.endswith("DB"):
+ if ref is None or ref == "RG":
+ gain = gain[:-2] + "RG"
+ else:
+ gain = gain[:-2] + "R128"
+ elif gain.endswith("LU"):
+ if ref is None or ref == "R128":
+ gain = gain[:-2] + "R128"
+ else:
+ gain = gain[:-2] + "RG"
+ else:
+ if ref is None or ref == "RG":
+ gain += " RG"
+ else:
+ gain += " R128"
+
+ try:
+ v1, v2 = gain.split()
+ if v2 not in ("RG", "R128"):
+ raise Exception
+ float(v1)
+ except Exception:
+ return RGDEF
+
+ return gain
+
# Obtain as much metadata from ubiquitous tags as possible.
# Files can have ape and id3 tags. ID3 has priority in this case.
@@ -1064,7 +1112,7 @@ class IDJC_Media_Player:
artist = title = ""
else:
try:
- rg = str(audio["REPLAYGAIN_TRACK_GAIN"][0].rstrip(" dB")) + " RG"
+ rg = gain(audio)
except:
rg = RGDEF
artist = audio.get("ARTIST", [u""])
@@ -1077,9 +1125,12 @@ class IDJC_Media_Player:
pass
else:
try:
- rg = str(audio["replaygain_track_gain"][0].rstrip(" dB")) + " RG"
+ rg = gain(audio, "TXXX_")
except:
- pass
+ try:
+ rg = gain(audio)
+ except:
+ pass
try:
artist = audio["artist"]
except:
@@ -1119,6 +1170,10 @@ class IDJC_Media_Player:
elif filext == ".ogg" or filext == ".oga" or filext == ".spx":
self.parent.mixer_write("OGGP=%s\nACTN=ogginforequest\nend\n" %
filename)
+
+ gval = None
+ ref = None
+
while 1:
line = self.parent.mixer_read()
if line == "OIR:NOT VALID\n" or line == "":
@@ -1132,13 +1187,17 @@ class IDJC_Media_Player:
if line.startswith("OIR:LENGTH="):
length = float(line[11:].strip())
if line.startswith("OIR:REPLAYGAIN_TRACK_GAIN="):
- val = line[26:].rstrip(" dB\n")
- if not val:
- rg = RGDEF
- else:
- rg = val + " RG"
+ gval = line[26:].rstrip()
+ if line.startswith("OIR:REPLAYGAIN_REFERENCE_LOUDNESS="):
+ ref = line[34:].rstrip()
if line == "OIR:end\n":
break
+
+ if gval is None:
+ rg = RGDEF
+ else:
+ rg = gain(gain=gval, ref=ref)
+
elif filext == ".aac":
try:
id3 = ID3(filename)
@@ -1204,8 +1263,7 @@ class IDJC_Media_Player:
album = "/".join((unicode(y) for y in x))
try:
- rg = str(unicode(audio["replaygain_track_gain"][-1]
- ).rstrip(" dB")) + " RG"
+ rg = gain(audio)
except:
pass
@@ -1425,7 +1483,7 @@ class IDJC_Media_Player:
print self.playername + (" player: the stored playlist data is not "
"compatible with this version\nfiles placed"
" in a queue for rescanning")
- gobject.idle_add(self.cb_playlist_todo)
+ idle_add(self.cb_playlist_todo)
@threadslock
def cb_playlist_todo(self):
@@ -1490,7 +1548,7 @@ class IDJC_Media_Player:
if self.is_playing == True:
self.is_playing = False
if self.timeout_source_id:
- gobject.source_remove(self.timeout_source_id)
+ source_remove(self.timeout_source_id)
# This will enable the play button to be toggled off.
self.is_stopping = True
self.play.set_active(False)
@@ -1685,12 +1743,12 @@ class IDJC_Media_Player:
print "player startup was unsuccessful for file", \
self.music_filename
# The regular code path can handle this.
- self.timeout_source_id = gobject.idle_add(
+ self.timeout_source_id = idle_add(
self.cb_play_progress_timeout, self.player_cid)
else:
print "player context id is %d\n" % self.player_cid
if self.player_cid & 1:
- self.timeout_source_id = gobject.timeout_add(PROGRESS_TIMEOUT,
+ self.timeout_source_id = timeout_add(PROGRESS_TIMEOUT,
self.cb_play_progress_timeout, self.player_cid)
else:
self.invoke_end_of_track_policy()
@@ -1713,7 +1771,7 @@ class IDJC_Media_Player:
self.player_is_playing = False
if self.timeout_source_id:
- gobject.source_remove(self.timeout_source_id)
+ source_remove(self.timeout_source_id)
self.progress_current_figure = 0
self.playtime_elapsed.set_value(0)
@@ -1738,7 +1796,7 @@ class IDJC_Media_Player:
print "player_restart %s" % self.playername
self.parent.last_player = self.playername
- gobject.source_remove(self.timeout_source_id)
+ source_remove(self.timeout_source_id)
self.start_time = int (self.progressadj.get_value())
self.silence_count = 0
@@ -1791,7 +1849,7 @@ class IDJC_Media_Player:
print "player context id is %d\n" % self.player_cid
# Restart a callback to update the progressbar.
- self.timeout_source_id = gobject.timeout_add(
+ self.timeout_source_id = timeout_add(
PROGRESS_TIMEOUT, self.cb_play_progress_timeout, self.player_cid)
self.parent.send_new_mixer_stats()
return True
@@ -2295,8 +2353,7 @@ class IDJC_Media_Player:
# Calclulate whether to sound the DJ alarm (end of music notification)
if self.playername in ("left", "right"):
if rem == 10 and self.progressadj.upper > 11 and \
- self.alarm_cid != cid and \
- self.parent.prefs_window.djalarm.get_active():
+ self.alarm_cid != cid:
# DJ Alarm is on and we are at the correct play position.
# The alarm has not sounded yet.
fader = "left" if self.parent.crossadj.value < 50.0 else "right"
@@ -2304,7 +2361,8 @@ class IDJC_Media_Player:
if self.playername == fader and (pl_mode in (3, 4) or
(pl_mode == 0 and self.stop_inspect())):
self.parent.freewheel_button.set_active(False)
- gobject.timeout_add(1000, self.deferred_alarm)
+ timeout_add(1000, self.deferred_alarm,
+ self.parent.prefs_window.djalarm.get_active())
self.alarm_cid = cid
# Check if the crossfade needs scheduling.
@@ -2330,9 +2388,12 @@ class IDJC_Media_Player:
return True
@threadslock
- def deferred_alarm(self):
- self.parent.alarm = True
- self.parent.send_new_mixer_stats()
+ def deferred_alarm(self, make_sound):
+ if make_sound:
+ self.parent.alarm = True
+ self.parent.send_new_mixer_stats()
+
+ self.parent.tracks_finishing()
return False
def stop_inspect(self):
@@ -2529,7 +2590,7 @@ class IDJC_Media_Player:
if response_id != gtk.RESPONSE_ACCEPT:
return
gen = self.filter_allowed_controls(self.get_elements_from(chosenfiles))
- glib.idle_add(self.file_response_idle, iter(gen))
+ idle_add(self.file_response_idle, iter(gen))
@threadslock
def file_response_idle(self, iterator):
@@ -2592,113 +2653,120 @@ class IDJC_Media_Player:
ext = useext
chosenfile = main + ext
- validlist = [x for x in self.liststore if x[0][0] != ">" and x[2] >= 0]
+ if ext != ".xspf":
+ # Filter out playlist controls.
+ data = [x for x in self.liststore if x[0][0] != ">" and x[2] >= 0]
+ else:
+ data = self.liststore
print "Chosenfile is", chosenfile
try:
- pl = open(chosenfile, "w")
- except IOError:
- print "Can't open file for writing. Permissions problem?"
- else:
- if (ext == ".m3u"):
- try:
- pl.write("#EXTM3U\r\n")
- for each in validlist:
- pl.write("#EXTINF:%d,%s\r\n" % (each[2], each[3].decode(
- "UTF-8").encode("ISO8859-1", "replace")))
- pl.write(each[1] + "\r\n")
- except IndexError:
- pl.close()
- except IOError:
- pl.close()
- print "That was odd\n"
-
- if ext == ".pls":
- pl.write("[playlist]\r\nNumberOfEntries=%d\r\n\r\n" % \
- len(validlist))
- for i in range(1, len(validlist) + 1):
- each = validlist[i - 1]
- pl.write("File%d=%s\r\n" % (i, each[1]))
- pl.write("Title%d=%s\r\n" % (i, each[3]))
- pl.write("Length%d=%d\r\n\r\n" % (i, each[2]))
- pl.write("Version=2\r\n")
-
- if ext == ".xspf":
- doc = mdom.getDOMImplementation().createDocument(
- 'http://xspf.org/ns/0/', 'playlist', None)
-
- playlist = doc.documentElement
- playlist.setAttribute('version', '1')
- playlist.setAttribute('xmlns', 'http://xspf.org/ns/0/')
- playlist.setAttribute(
- 'xmlns:idjc', 'http://idjc.sourceforge.net/ns/')
-
- trackList = doc.createElement('trackList')
- playlist.appendChild(trackList)
-
- for each in self.liststore:
- row = PlayerRow(*each)
-
- track = doc.createElement('track')
- trackList.appendChild(track)
-
- if row.rsmeta.startswith(">"):
- extension = doc.createElement('extension')
- track.appendChild(extension)
- extension.setAttribute(
- 'application', 'http://idjc.sourceforge.net/ns/')
-
- pld = doc.createElementNS(
- 'http://idjc.sourceforge.net/ns/', 'idjc:pld')
- extension.appendChild(pld)
- pld.setAttribute('rsmeta', row.rsmeta)
- pld.setAttribute('length', str(row.length))
+ with open(chosenfile, "w") as h:
+ if ext in (".m3u", ".m3u8"):
+ if ext == ".m3u":
+ proc = lambda x: x.decode("UTF-8").encode("ISO8859-1", "replace")
else:
- location = doc.createElement('location')
- track.appendChild(location)
- locationText = doc.createTextNode(
- "file://" + urllib.quote(each[1]))
- location.appendChild(locationText)
-
- if each[6]:
- creator = doc.createElement('creator')
- track.appendChild(creator)
- creatorText = doc.createTextNode(each[6])
- creator.appendChild(creatorText)
-
- if each[5]:
- title = doc.createElement('title')
- track.appendChild(title)
- titleText = doc.createTextNode(each[5])
- title.appendChild(titleText)
-
- if each[9]:
- album = doc.createElement('album')
- track.appendChild(album)
- albumText = doc.createTextNode(each[9])
- album.appendChild(albumText)
-
- duration = doc.createElement('duration')
- track.appendChild(duration)
- durationText = doc.createTextNode(str(each[2] * 1000))
- duration.appendChild(durationText)
-
- xmltext = doc.toxml("UTF-8").replace("><", ">\n<").splitlines()
- spc = ""
- for i in range(len(xmltext)):
- if xmltext[i][1] == "/":
- spc = spc[2:]
- if len(xmltext[i]) < 3 or xmltext[i].startswith("<?") or \
- xmltext[i][-2] == "/" or xmltext[i].count("<") == 2:
- xmltext[i] = spc + xmltext[i]
- else:
- xmltext[i] = spc + xmltext[i]
- if xmltext[i][len(spc) + 1] != "/":
- spc = spc + " "
- pl.write("\r\n".join(xmltext))
- pl.write("\r\n")
- doc.unlink()
- pl.close()
+ proc = lambda x: x
+ self.write_m3u_playlist(h, data, proc)
+ elif ext == ".pls":
+ self.write_pls_playlist(h, data)
+ elif ext == ".xspf":
+ self.write_xspf_playlist(h, data)
+ except IOError:
+ print "problem writing out playlist file"
+
+ def write_m3u_playlist(self, h, data, proc):
+ h.write("#EXTM3U\r\n")
+ for each in data:
+ h.write("#EXTINF:%d,%s\r\n" % (each[2], proc(each[3])))
+ h.write("file://" + urllib.quote(each[1]) + "\r\n")
+
+ def write_pls_playlist(self, h, data):
+ h.write("[playlist]\r\nNumberOfEntries=%d\r\n\r\n" % len(data))
+ for i in range(1, len(data) + 1):
+ each = data[i - 1]
+ h.write("File%d=%s\r\n" % (i, each[1]))
+ h.write("Title%d=%s\r\n" % (i, each[3]))
+ h.write("Length%d=%d\r\n\r\n" % (i, each[2]))
+ h.write("Version=2\r\n")
+
+ def write_xspf_playlist(self, h, data):
+ doc = mdom.getDOMImplementation().createDocument(
+ 'http://xspf.org/ns/0/', 'playlist', None)
+
+ playlist = doc.documentElement
+ playlist.setAttribute('version', '1')
+ playlist.setAttribute('xmlns', 'http://xspf.org/ns/0/')
+ playlist.setAttribute('xmlns:idjc', 'http://idjc.sourceforge.net/ns/')
+
+ trackList = doc.createElement('trackList')
+ playlist.appendChild(trackList)
+
+ for each in data:
+ row = PlayerRow(*each)
+
+ track = doc.createElement('track')
+ trackList.appendChild(track)
+
+ if row.rsmeta.startswith(">"):
+ extension = doc.createElement('extension')
+ track.appendChild(extension)
+ extension.setAttribute(
+ 'application', 'http://idjc.sourceforge.net/ns/')
+
+ pld = doc.createElementNS(
+ 'http://idjc.sourceforge.net/ns/', 'idjc:pld')
+ extension.appendChild(pld)
+
+ for field, value in zip(row._fields, row):
+ if isinstance(value, (str, int, float)):
+ pld.setAttribute(field, str(value))
+
+ else:
+ location = doc.createElement('location')
+ track.appendChild(location)
+ locationText = doc.createTextNode(
+ "file://" + urllib.quote(each[1]))
+ location.appendChild(locationText)
+
+ if each[6]:
+ creator = doc.createElement('creator')
+ track.appendChild(creator)
+ creatorText = doc.createTextNode(each[6])
+ creator.appendChild(creatorText)
+
+ if each[5]:
+ title = doc.createElement('title')
+ track.appendChild(title)
+ titleText = doc.createTextNode(each[5])
+ title.appendChild(titleText)
+
+ if each[9]:
+ album = doc.createElement('album')
+ track.appendChild(album)
+ albumText = doc.createTextNode(each[9])
+ album.appendChild(albumText)
+
+ duration = doc.createElement('duration')
+ track.appendChild(duration)
+ durationText = doc.createTextNode(str(each[2] * 1000))
+ duration.appendChild(durationText)
+
+ xmltext = doc.toxml("UTF-8").replace("><", ">\n<").splitlines()
+ spc = ""
+ for i in range(len(xmltext)):
+ if xmltext[i][1] == "/":
+ spc = spc[2:]
+ if len(xmltext[i]) < 3 or xmltext[i].startswith("<?") or \
+ xmltext[i][-2] == "/" or xmltext[i].count("<") == 2:
+ xmltext[i] = spc + xmltext[i]
+ else:
+ xmltext[i] = spc + xmltext[i]
+ if xmltext[i][len(spc) + 1] != "/":
+ spc = spc + " "
+ h.write("\r\n".join(xmltext))
+ h.write("\r\n")
+ doc.unlink()
def plfile_destroy(self, widget):
self.showing_pl_save_requester = False
@@ -2779,13 +2847,13 @@ class IDJC_Media_Player:
if callback_data == "ProgressPress":
self.progress_press = True
if self.timeout_source_id:
- gobject.source_remove(self.timeout_source_id)
+ source_remove(self.timeout_source_id)
elif callback_data == "ProgressRelease":
self.progress_press = False
if self.player_is_playing:
self.progress_current_figure = self.progressadj.get_value()
self.handle_motion_as_drop = True
- gobject.idle_add(self.player_progress_value_changed_emitter)
+ idle_add(self.player_progress_value_changed_emitter)
return False
@threadslock
@@ -2806,7 +2874,7 @@ class IDJC_Media_Player:
ext = os.path.splitext(pathnames[0])[1]
if ext in (".cue", ".txt"):
return self.get_elements_from_cue(pathnames[0])
- if ext == ".m3u":
+ elif ext in (".m3u", ".m3u8"):
return self.get_elements_from_m3u(pathnames[0])
elif ext == ".pls":
return self.get_elements_from_pls(pathnames[0])
@@ -2879,11 +2947,18 @@ class IDJC_Media_Player:
return
basepath = os.path.split(filename)[0] + "/"
data = data.splitlines()
+
for line, each in enumerate(data):
if each[0] == "#":
continue
if each[0] != "/":
- each = basepath + each
+ if each.startswith("file://"):
+ host, abspathname = each[7:].split("/", 1)
+ if host not in ("", "localhost", "127.0.0.1", "::1"):
+ continue
+ each = "/" + urllib.unquote(abspathname)
+ else:
+ each = basepath + each
# handle special case of a single element referring to a directory
if line == 0 and len(data) == 1 and os.path.isdir(each):
gen = self.get_elements_from_directory(each)
@@ -3083,7 +3158,7 @@ class IDJC_Media_Player:
try:
path, pos = treeview.get_dest_row_at_pos(x, y)
except (ValueError, TypeError):
- glib.idle_add(self.file_response_idle, elements)
+ idle_add(self.file_response_idle, elements)
else:
for element in elements:
model = treeview.get_model()
@@ -3094,7 +3169,7 @@ class IDJC_Media_Player:
else:
iter_ = model.insert_after(iter_, element)
- glib.idle_add(self.drag_data_received_data_idle,
+ idle_add(self.drag_data_received_data_idle,
model, iter_, elements)
break
else:
@@ -3122,7 +3197,7 @@ class IDJC_Media_Player:
else:
for element in elements:
iter_ = model.insert_after(iter_, element)
- glib.idle_add(self.drag_data_received_data_idle,
+ idle_add(self.drag_data_received_data_idle,
model, iter_, elements)
break
else:
@@ -3640,18 +3715,24 @@ class IDJC_Media_Player:
def rgrowconfig(self, tv_column, cell_renderer, model, iter):
if self.exiting:
return
+
self.rowconfig(tv_column, cell_renderer, model, iter)
- if model.get_value(iter, 0)[0] == ">":
- cell_renderer.set_property("text", " ")
- else:
- if model.get_value(iter, 7) == RGDEF:
- # Red triangle.
- cell_renderer.set_property("markup",
- '<span foreground="dark red">▵</span>')
- else:
- # Small green bullet point.
- cell_renderer.set_property("markup",
- '<span foreground="dark green">•</span>')
+ cell_renderer.set_property("markup", " ")
+ if model.get_value(iter, 0)[0] != ">":
+ rg = model.get_value(iter, 7)
+ if rg is not None:
+ if rg == RGDEF:
+ # Red triangle.
+ cell_renderer.set_property("markup",
+ '<span foreground="dark red">▵</span>')
+ elif rg.endswith(" RG"):
+ # Small green bullet point.
+ cell_renderer.set_property("markup",
+ '<span foreground="dark green">•</span>')
+ elif rg.endswith(" R128"):
+ # Small blue bullet point.
+ cell_renderer.set_property("markup",
+ '<span foreground="dark blue">•</span>')
def playtimerowconfig(self, tv_column, cell_renderer, model, iter):
if self.exiting:
@@ -3704,9 +3785,7 @@ class IDJC_Media_Player:
("text", _('No Fade'))),
">announcement": (("cell-background", "dark blue"),
("background-gdk", gray),
- ("foreground", "dark blue"),
- # TC: Playlist control.
- ("text", _('Announcement'))),
+ ("foreground", "dark blue"),),
">normalspeed": (("cell-background", "dark green"),
("background-gdk", gray),
("foreground", "dark green"),
@@ -3767,7 +3846,11 @@ class IDJC_Media_Player:
else:
for name, value in properties:
crprop(name, value)
-
+
+ if celltext == ">announcement":
+ crprop("text", _('Announcement:') + " " + urllib.unquote(
+ model.get_value(iter, 4)))
+
if celltext == ">transfer":
if self.playername == "left":
# TC: Playlist control.
@@ -4044,7 +4127,7 @@ class IDJC_Media_Player:
self.plfilefilter_playlists = gtk.FileFilter()
# TC: File filter text.
self.plfilefilter_playlists.set_name(
- _('Playlist types (*.m3u, *.xspf, *.pls)'))
+ _('Playlist types') + " " + supported.playlists_as_text())
self.plfilefilter_playlists.add_mime_type("audio/x-mpegurl")
self.plfilefilter_playlists.add_mime_type("application/xspf+xml")
self.plfilefilter_playlists.add_mime_type("audio/x-scpls")
diff --git a/python/popupwindow.py b/python/popupwindow.py
index 0b66724..b87c5d6 100644
--- a/python/popupwindow.py
+++ b/python/popupwindow.py
@@ -20,7 +20,7 @@ __all__ = ['PopupWindow']
import gobject
import gtk
-from .gtkstuff import threadslock
+from .gtkstuff import threadslock, timeout_add, source_remove
class PopupWindow:
@@ -102,23 +102,24 @@ class PopupWindow:
# Any event triggers destruction of popup windows currently open.
if self.popup_window is not None:
self.popup_window.destroy()
- gobject.source_remove(self.timeout)
+ source_remove(self.timeout_id)
self.popup_window = None
self.message("popup window destroyed due to the sensing of an "
"event, timer removed")
if data == "leave": return False
if data == "enter" and self.inside_widget == False:
- self.timeout = gobject.timeout_add(100, self.timeout_callback)
+ self.timeout_id = timeout_add(100, self.timeout_callback)
self.inside_widget = True
self.total_timer_count = 0
self.message("timer started")
if data == "leave":
- gobject.source_remove(self.timeout)
- self.inside_widget = False
- self.message("timer removed")
+ if self.inside_widget:
+ source_remove(self.timeout_id)
+ self.inside_widget = False
+ self.message("timer removed")
if data == "button" or data == "scroll" or self.inhibit_callback() \
and self.inside_widget:
- gobject.source_remove(self.timeout)
+ source_remove(self.timeout_id)
self.message("timer removed")
def dummy(self): return False
diff --git a/python/preferences.py b/python/preferences.py
index 193bef6..e2269cc 100644
--- a/python/preferences.py
+++ b/python/preferences.py
@@ -29,6 +29,7 @@ from . import licence_window
from . import songdb
from . import midicontrols
from .gtkstuff import WindowSizeTracker, DefaultEntry, threadslock
+from .gtkstuff import timeout_add, source_remove
from .prelims import ProfileManager
from .utils import PathStr
from .tooltips import set_tip, MAIN_TIPS
@@ -176,9 +177,9 @@ class PanWidget(gtk.Frame):
print "Attempt made to load a non existent pan preset"
else:
if self._source_id:
- glib.source_remove(self._source_id)
+ source_remove(self._source_id)
- self._source_id = glib.timeout_add(5, self._timeout, target)
+ self._source_id = timeout_add(5, self._timeout, target)
@threadslock
def _timeout(self, target):
@@ -377,6 +378,8 @@ class AGCControl(gtk.Frame):
def cb_open(self, widget):
active = widget.get_active()
self.meter.set_led(active)
+ if gtk.main_level():
+ self.approot.channelstate_changed(self.index, active)
def cb_mode(self, combobox):
mode = combobox.get_active()
@@ -1568,6 +1571,21 @@ class mixprefs:
("<b>fr</b> nvignot (nicotux at users.sf.net)",
"<b>it</b> Raffaele Morelli (raffaele.morelli at gmail.com)"))
+ label = gtk.Label(_('Build Info'))
+ ivbox = gtk.VBox()
+ ivbox.set_spacing(10)
+ ivbox.set_border_width(10)
+ nb.append_page(ivbox, label)
+ ivbox.show()
+
+ with open(FGlobs.pkgdatadir / "buildinfo") as f:
+ for each in f:
+ label = gtk.Label(each.rstrip())
+ label.set_use_markup(True)
+ label.set_selectable(True)
+ ivbox.pack_start(label, False)
+ label.show()
+
vbox.show()
aboutlabel = gtk.Label(_('About'))
diff --git a/python/prelims/Makefile.in b/python/prelims/Makefile.in
index 2aa0f28..959aceb 100644
--- a/python/prelims/Makefile.in
+++ b/python/prelims/Makefile.in
@@ -182,6 +182,7 @@ EXEEXT = @EXEEXT@
EXT = @EXT@
FGREP = @FGREP@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GIT_PROG_EXISTS = @GIT_PROG_EXISTS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
GMSGFMT = @GMSGFMT@
@@ -239,6 +240,7 @@ LN_S = @LN_S@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
diff --git a/python/prelims/profiledialog.py b/python/prelims/profiledialog.py
index 63c7663..522a8ff 100644
--- a/python/prelims/profiledialog.py
+++ b/python/prelims/profiledialog.py
@@ -42,6 +42,7 @@ from ..gtkstuff import CellRendererTime
from ..gtkstuff import threadslock
from ..gtkstuff import IconChooserButton
from ..gtkstuff import IconPreviewFileChooserDialog
+from ..gtkstuff import timeout_add
import gettext
@@ -421,7 +422,7 @@ class ProfileDialog(gtk.Dialog):
def _cb_visible(self, *args):
self._update_data()
if self.props.visible:
- gobject.timeout_add(200, threadslock(self._update_data))
+ timeout_add(200, threadslock(self._update_data))
def _cb_selection(self, ts):
diff --git a/python/songdb.py b/python/songdb.py
index ce01ada..2192c6b 100644
--- a/python/songdb.py
+++ b/python/songdb.py
@@ -44,16 +44,19 @@ else:
from idjc import FGlobs
from .tooltips import set_tip
from .gtkstuff import threadslock, gdklock, DefaultEntry, NotebookSR
+from .gtkstuff import idle_add, timeout_add, source_remove
__all__ = ['MediaPane', 'have_songdb']
AMPACHE = "Ampache"
+AMPACHE_3_7 = "Ampache 3.7"
PROKYON_3 = "Prokyon 3"
FUZZY, CLEAN, WHERE, DIRTY = xrange(4)
t = gettext.translation(FGlobs.package_name, FGlobs.localedir, fallback=True)
_ = t.gettext
+N_ = lambda t: t
def dirname(pathname):
@@ -131,7 +134,7 @@ class DBAccessor(threading.Thread):
def run(self):
"""This is the worker thread."""
- notify = partial(glib.idle_add, threadslock(self.notify))
+ notify = partial(idle_add, threadslock(self.notify))
try:
while self.keepalive:
@@ -177,7 +180,9 @@ class DBAccessor(threading.Thread):
self._handle = sql.Connection(
host=self.hostname, port=self.port,
user=self.user, passwd=self.password,
- db=self.database, connect_timeout=6)
+ db=self.database, connect_timeout=6,
+ charset='utf8',
+ compress=True)
self._cursor = self._handle.cursor()
except sql.Error as e:
notify(_("Connection failed (try %d)") %
@@ -185,16 +190,16 @@ class DBAccessor(threading.Thread):
print e
time.sleep(0.5)
else:
+ # This causes problems if other
+ # processes try to access the database,
+ # so set autocommit to 1
try:
- self._cursor.execute('set names utf8')
- self._cursor.execute(
- 'set character set utf8')
- self._cursor.execute(
- 'set character_set_connection=utf8')
+ self._handle.autocommit(True)
except sql.MySQLError:
- notify(_('Connected: utf-8 mode failed'))
+ notify(_('Connected: autocommit mode failed'))
else:
- notify(_('Connected'))
+ notify(_('Connected: autocommit mode set'))
+ notify(_('Connected'))
else:
if not self.keepalive:
return
@@ -225,10 +230,9 @@ class DBAccessor(threading.Thread):
try:
self._handle.close()
except sql.Error:
- glib.idle_add(threadslock(self.notify),
- _('Problem dropping connection'))
+ idle_add(threadslock(self.notify), _('Problem dropping connection'))
else:
- glib.idle_add(threadslock(self.notify), _('Connection dropped'))
+ idle_add(threadslock(self.notify), _('Connection dropped'))
@thread_only
def replace_cursor(self, cursor):
@@ -443,6 +447,20 @@ class PrefsControls(gtk.Frame):
for each in self._settings:
self.textdict.update(each.textdict)
+ def credentials(self):
+ if self.dbtoggle.get_active():
+ active = self._notebook.get_current_page()
+ else:
+ active = None
+
+ pages = []
+ for i, settings in enumerate(self._notebook.get_children()):
+ creddict = settings.get_data()[0]
+ creddict.update({"active": i == active})
+ pages.append(creddict)
+
+ return pages
+
def disconnect(self):
self.dbtoggle.set_active(False)
@@ -526,14 +544,14 @@ class PageCommon(gtk.VBox):
return False
def set_col_widths(self, data):
- """Restore column width values."""
-
- c = self.tree_cols.__iter__()
- for w in data.split(","):
- if w != "0":
- c.next().set_fixed_width(int(w))
- else:
- c.next()
+ """Restore column width values. Includes a data validity check."""
+
+ if len(self.tree_cols) == data.count(",") + 1:
+ for width, col in zip(data.split(","), self.tree_cols):
+ if width != "0":
+ col.set_fixed_width(int(width))
+ else:
+ print "can't restore column widths"
def activate(self, accessor, db_type, usesettings):
self._acc = accessor
@@ -544,7 +562,7 @@ class PageCommon(gtk.VBox):
while self._update_id:
context, namespace = self._update_id.popleft()
namespace[0] = True
- glib.source_remove(context)
+ source_remove(context)
self._acc = None
model = self.tree_view.get_model()
@@ -560,9 +578,14 @@ class PageCommon(gtk.VBox):
"""Build a TreeViewColumn list from a table of data."""
list_ = []
- for label, data_index, data_function, mw, el in parameters:
- renderer = gtk.CellRendererText()
- renderer.props.ellipsize = el
+ for p in parameters:
+ try:
+ # Check if there is an extra parameter to set the renderer
+ label, data_index, data_function, mw, el, renderer = p
+ except:
+ label, data_index, data_function, mw, el = p
+ renderer = gtk.CellRendererText()
+ renderer.props.ellipsize = el
column = gtk.TreeViewColumn(label, renderer)
if mw != -1:
column.set_resizable(True)
@@ -583,7 +606,7 @@ class PageCommon(gtk.VBox):
with gdklock():
while self._update_id:
context, namespace = self._update_id.popleft()
- glib.source_remove(context)
+ source_remove(context)
# Idle functions to receive the following and know to clean-up.
namespace[0] = True
@@ -599,7 +622,7 @@ class PageCommon(gtk.VBox):
# Scrap intermediate jobs whose output would merely slow down the
# user interface responsiveness.
namespace = [False, ()]
- context = glib.idle_add(self._update_1, acc, cursor, rows, namespace)
+ context = idle_add(self._update_1, acc, cursor, rows, namespace)
self._update_id.append((context, namespace))
class ViewerCommon(PageCommon):
@@ -666,21 +689,65 @@ class ViewerCommon(PageCommon):
renderer.set_property("text", "")
elif self._db_type == "P3":
renderer.set_property("text", "%dk" % bitrate)
- elif bitrate > 9999 and self._db_type == AMPACHE:
+ elif bitrate > 9999 and self._db_type in (AMPACHE, AMPACHE_3_7):
renderer.set_property("text", "%dk" % (bitrate // 1000))
renderer.set_property("xalign", 1.0)
- @staticmethod
- def _cell_show_unknown(column, renderer, model, iter, cell):
- text = model.get_value(iter, cell) or _('<unknown>')
+ def _query_cook_common(self, query):
+ if self._db_type == AMPACHE:
+ query = query.replace("__played_by_me__", "'1' as played_by_me")
+ else:
+ query = query.replace("__played_by_me__", """SUBSTR(MAX(CONCAT(object_count.date, IF(ISNULL(agent), NULL,
+ IF(STRCMP(LEFT(agent,5), "IDJC:"), 2,
+ IF(STRCMP(agent, "IDJC:1"), 0, 1))))), 11) AS played_by_me""")
+ return query.replace("__catalogs__", self.catalogs.sql())
+
+ def _cell_show_unknown(self, column, renderer, model, iter, data):
+ text, max_lastplay_date, played_by, played, played_by_me, cat = model.get(iter, *data)
+ if text is None: text = _('<unknown>')
+ weight = pango.WEIGHT_NORMAL
+ if not played:
+ col = 'black'
+ renderer.props.background_set = False
+ else:
+ value, percent, weight = self._get_played_percent(cat, max_lastplay_date)
+ col, bg_col = ViewerCommon._set_color(played_by_me, percent)
+ renderer.props.background_set = True
+ renderer.props.background = bg_col
renderer.props.text = text
-
- @staticmethod
- def _cell_show_nested(column, renderer, model, iter, cell):
- text = model.get_value(iter, cell) or _('<unknown>')
- col = "red" if model.iter_depth(iter) == 0 else "black"
+ renderer.props.foreground = col
+ renderer.props.weight = weight
+
+ def _cell_show_nested(self, column, renderer, model, iter, data):
+ text, max_lastplay_date, played_by, played, played_by_me, cat = model.get(iter, *data)
+ if text is None: text = _('<unknown>')
+ col = "black"
+ weight = pango.WEIGHT_NORMAL
+ renderer.props.background_set = False
+ if model.iter_depth(iter) == 0:
+ col = "red"
+ elif played:
+ value, percent, weight = self._get_played_percent(cat, max_lastplay_date)
+ col, bg_col = ViewerCommon._set_color(played_by_me, percent)
+ renderer.props.background_set = True
+ renderer.props.background = bg_col
renderer.props.text = text
renderer.props.foreground = col
+ renderer.props.weight = weight
+
+ def _cell_progress(self, column, renderer, model, iter, data):
+ max_lastplay_date, played_by, played, cat= model.get(iter, *data)
+ if not played:
+ text = _("Not Played")
+ value = 0
+ renderer.props.visible = False
+ else:
+ value, percent, weight = self._get_played_percent(cat, max_lastplay_date)
+ text = ViewerCommon._format_lastplay_date(max_lastplay_date)
+ text += "(" + (played_by or _('<unknown>')) + ")"
+ renderer.props.visible = True
+ renderer.props.text = text
+ renderer.props.value = value
@staticmethod
def _cell_pathname(column, renderer, model, iter, data, partition, transform):
@@ -705,9 +772,7 @@ class ViewerCommon(PageCommon):
@staticmethod
def _cell_secs_to_h_m_s(column, renderer, model, iter, cell):
v_in = model.get_value(iter, cell)
- m, s = divmod(v_in, 60)
- h, m = divmod(m, 60)
- d, h = divmod(h, 24)
+ d, h, m, s = ViewerCommon._secs_to_h_m_s(v_in)
if d:
v_out = "%dd:%02d:%02d" % (d, h, m)
else:
@@ -727,6 +792,54 @@ class ViewerCommon(PageCommon):
else:
renderer.set_property("text", "")
+ @staticmethod
+ def _secs_to_h_m_s(value):
+ m, s = divmod(value, 60)
+ h, m = divmod(m, 60)
+ d, h = divmod(h, 24)
+ return d, h, m, s
+
+ @staticmethod
+ def _format_lastplay_date(value):
+ if value is None:
+ return _("<unknown>") + " "
+ difftime = time.time() - int(value)
+ d, h, m, s = ViewerCommon._secs_to_h_m_s(difftime)
+ return "%dd %dh %dm ago " % (d, h, m)
+
+ def _get_played_percent(self, catalog, value):
+ if value is None:
+ return 0, 0.0, pango.WEIGHT_NORMAL + 50
+ now = time.time()
+ max_days_ago = self.catalogs.lpscale(catalog)
+ diff = now - int(value)
+ if diff > max_days_ago:
+ value = 0
+ percent = 0.35
+ weight = pango.WEIGHT_NORMAL + 100
+ else:
+ percent = 1.0 - (float(diff) / float(max_days_ago))
+ value = 100 * percent
+ # Refactor percent used for colors to be .4 to 1.0, as anything
+ # below about .35 starts to look to much like black.
+ percent = (percent * .6) + .4
+ # Get a weight from 500 to 900
+ weight = ((percent * .4) * 1000) + pango.WEIGHT_NORMAL + 100
+ return value, percent, weight
+
+ @staticmethod
+ def _set_color(text, percent=1.0):
+ #print "text: ", text
+ if percent == 1.0:
+ bg_col = "white"
+ elif int(text) == 1:
+ bg_col = "Powder Blue"
+ else:
+ bg_col = "Light Pink"
+ return (gtk.gdk.color_from_hsv(0.0, 1.0, percent),
+ gtk.gdk.color_from_hsv(0.6666, 1.0, percent),
+ gtk.gdk.color_from_hsv(0.3333, 1.0, percent))[int(text)], bg_col
+
class ExpandAllButton(gtk.Button):
def __init__(self, expanded, tooltip=None):
expander = gtk.Expander()
@@ -741,10 +854,14 @@ class ExpandAllButton(gtk.Button):
class TreePage(ViewerCommon):
"""Browsable UI with tree structure."""
- # *depth*, *treecol*, album, album_prefix, year, disk, album_id,
- # tracknumber, title, artist, artist_prefix, pathname, bitrate, length, catalog_id
+ # *depth*(0), *treecol*(1), album(2), album_prefix(3), year(4), disk(5),
+ # album_id(6), tracknumber(7), title(8), artist(9), artist_prefix(10),
+ # pathname(11), bitrate(12), length(13), catalog_id(14), max_date_played(15),
+ # played_by(16), played(17), played_by_me(18)
# The order chosen negates the need for a custom sort comparison function.
- DATA_SIGNATURE = int, str, str, str, int, int, int, int, str, str, str, str, int, int, int
+ DATA_SIGNATURE = int, str, str, str, int,\
+ int, int, int, str, str, str, str,\
+ int, int, int, str, str, int, str
BLANK_ROW = tuple(x() for x in DATA_SIGNATURE[2:])
def __init__(self, notebook, catalogs):
@@ -780,7 +897,7 @@ class TreePage(ViewerCommon):
tree_collapse.connect_object("clicked", gtk.TreeView.collapse_all,
self.tree_view)
self.tree_cols = self._make_tv_columns(self.tree_view, (
- ("", 1, self._cell_show_nested, 180, pango.ELLIPSIZE_END),
+ ("", (1, 15, 16, 17, 18, 14), self._cell_show_nested, 180, pango.ELLIPSIZE_END),
# TC: Track artist.
(_('Artist'), (10, 9), self._data_merge, 100, pango.ELLIPSIZE_END),
# TC: The disk number of the album track.
@@ -789,6 +906,7 @@ class TreePage(ViewerCommon):
(_('Track'), 7, self._cell_ralign, -1, pango.ELLIPSIZE_NONE),
# TC: Track playback time.
(_('Duration'), 13, self._cond_cell_secs_to_h_m_s, -1, pango.ELLIPSIZE_NONE),
+ (_('Last Played'), (15, 16, 17, 14), self._cell_progress, -1, None, gtk.CellRendererProgress()),
(_('Bitrate'), 12, self._cell_k, -1, pango.ELLIPSIZE_NONE),
(_('Filename'), (14, 11), self._cell_filename, 100, pango.ELLIPSIZE_END),
# TC: Directory path to a file.
@@ -839,7 +957,7 @@ class TreePage(ViewerCommon):
def deactivate(self):
while self._pulse_id:
- glib.source_remove(self._pulse_id.popleft())
+ source_remove(self._pulse_id.popleft())
self.progress_bar.set_fraction(0.0)
super(TreePage, self).deactivate()
@@ -873,12 +991,16 @@ class TreePage(ViewerCommon):
"" as art_prefix,
CONCAT_WS('/',path,filename) as file,
bitrate, length,
- 0 as catalog_id
+ 0 as catalog_id,
+ 0 as max_date_played,
+ "" as played_by,
+ 0 as played,
+ 0 as played_by_me
FROM tracks
LEFT JOIN albums on tracks.album = albums.name
AND tracks.artist = albums.artist
ORDER BY tracks.artist, album, tracknumber, title"""
- elif self._db_type == AMPACHE:
+ elif self._db_type in (AMPACHE, AMPACHE_3_7):
query = """SELECT
album.name as album,
album.prefix as alb_prefix,
@@ -892,19 +1014,28 @@ class TreePage(ViewerCommon):
file,
bitrate,
time as length,
- catalog.id as catalog_id
+ catalog.id as catalog_id,
+ MAX(object_count.date) as max_date_played,
+ SUBSTR(MAX(CONCAT(object_count.date, user.fullname)), 11) AS played_by,
+ played,
+ __played_by_me__
FROM song
LEFT JOIN artist ON song.artist = artist.id
LEFT JOIN album ON song.album = album.id
+ LEFT JOIN object_count ON song.id = object_count.object_id
+ AND object_count.object_type = "song"
+ LEFT JOIN user ON user.id = object_count.user
LEFT JOIN catalog ON song.catalog = catalog.id
WHERE __catalogs__
+ GROUP BY song.id
ORDER BY artist.name, album, disk, tracknumber, title"""
- query = query.replace("__catalogs__", self.catalogs.sql())
+
+ query = self._query_cook_common(query)
else:
print "unsupported database type:", self._db_type
return
- self._pulse_id.append(glib.timeout_add(1000, self._progress_pulse))
+ self._pulse_id.append(timeout_add(1000, self._progress_pulse))
self._acc.request((query,), self._handler, self._failhandler)
def _drag_data(self, model, path):
@@ -951,10 +1082,9 @@ class TreePage(ViewerCommon):
print exception
notify(_('Tree fetch failed'))
- glib.idle_add(threadslock(self.loading_label.set_text),
- _('Fetch Failed!'))
+ idle_add(threadslock(self.loading_label.set_text), _('Fetch Failed!'))
while self._pulse_id:
- glib.source_remove(self._pulse_id.popleft())
+ source_remove(self._pulse_id.popleft())
return True # Drop job. Don't run handler.
@@ -968,7 +1098,7 @@ class TreePage(ViewerCommon):
self.loading_label.set_text(_('Populating'))
# Turn off progress bar pulser.
while self._pulse_id:
- glib.source_remove(self._pulse_id.popleft())
+ source_remove(self._pulse_id.popleft())
# Clean away old data.
self.tree_view.set_model(None)
@@ -978,7 +1108,7 @@ class TreePage(ViewerCommon):
namespace = [False, (0.0, None, None, None, {}, None, None, None, None)]
do_max = min(max(30, rows / 100), 200) # Data size to process.
total = 2.0 * rows
- context = glib.idle_add(self._update_2, acc, cursor, total, do_max,
+ context = idle_add(self._update_2, acc, cursor, total, do_max,
[], namespace)
self._update_id.append((context, namespace))
return False
@@ -997,7 +1127,7 @@ class TreePage(ViewerCommon):
if not rows:
store.sort()
namespace = [False, (done, ) + (None, ) * 11]
- context = glib.idle_add(self._update_3, acc, total, do_max,
+ context = idle_add(self._update_3, acc, total, do_max,
store, namespace)
self._update_id.append((context, namespace))
return False
@@ -1018,7 +1148,7 @@ class TreePage(ViewerCommon):
iter_l = letter[art_letter] = r_append(None, (-1, art_letter) + BLANK_ROW)
if album == row[0] and artist == row[7] and \
alb_prefix == row[1] and art_prefix == row[8]:
- r_append(iter_2, (0, row[6]) + row)
+ iter_3 = r_append(iter_2, (0, row[6]) + row)
continue
else:
if artist != row[7] or art_prefix != row[8]:
@@ -1035,7 +1165,7 @@ class TreePage(ViewerCommon):
else:
albumtext = album
iter_2 = r_append(iter_1, (-3, albumtext) + BLANK_ROW)
- r_append(iter_2, (0, row[6]) + row)
+ iter_3 = r_append(iter_2, (0, row[6]) + row)
done += do_max
self.progress_bar.set_fraction(sorted((0.0, done / total, 1.0))[1])
@@ -1073,7 +1203,7 @@ class TreePage(ViewerCommon):
else:
iter_l = letter[alb_letter] = append(None, (-1, alb_letter) + BLANK_ROW)
if album_id == row[4]:
- append(iter_2, (0, row[6]) + row)
+ iter_3 = append(iter_2, (0, row[6]) + row)
continue
else:
if album != row[0] or year != row[2] or alb_prefix != row[1]:
@@ -1093,7 +1223,7 @@ class TreePage(ViewerCommon):
else:
iter_2 = append(iter_1, (-3, _('Disk %d') % disk)
+ BLANK_ROW)
- append(iter_2, (0, row[6]) + row)
+ iter_3 = append(iter_2, (0, row[6]) + row)
done += do_max
self.progress_bar.set_fraction(min(done / total, 1.0))
@@ -1148,17 +1278,21 @@ class FlatPage(ViewerCommon):
catalogs)
# Row data specification:
- # index, ARTIST, ALBUM, TRACKNUM, TITLE, DURATION, BITRATE,
- # pathname, disk, catalog_id
+ # index(0), ARTIST(1), ALBUM(2), TRACKNUM(3), TITLE(4), DURATION(5), BITRATE(6),
+ # pathname(7), disk(8), catalog_id(9), max_date_played(10),
+ # played_by(11), played(12), played_by_me(13)
self.list_store = gtk.ListStore(
- int, str, str, int, str, int, int, str, int, int)
+ int, str, str, int, str, int, int,
+ str, int, int, str,
+ str, int, str)
self.tree_cols = self._make_tv_columns(self.tree_view, (
("(0)", 0, self._cell_ralign, -1, pango.ELLIPSIZE_NONE),
- (_('Artist'), 1, self._cell_show_unknown, 100, pango.ELLIPSIZE_END),
- (_('Album'), 2, self._cell_show_unknown, 100, pango.ELLIPSIZE_END),
+ (_('Artist'), (1, 10, 11, 12, 13, 9), self._cell_show_unknown, 100, pango.ELLIPSIZE_END),
+ (_('Album'), (2, 10, 11, 12, 13, 9), self._cell_show_unknown, 100, pango.ELLIPSIZE_END),
+ (_('Title'), (4, 10, 11, 12, 13, 9), self._cell_show_unknown, 100, pango.ELLIPSIZE_END),
+ (_('Last Played'), (10, 11, 12, 9), self._cell_progress, -1, None, gtk.CellRendererProgress()),
(_('Disk'), 8, self._cell_ralign, -1, pango.ELLIPSIZE_NONE),
(_('Track'), 3, self._cell_ralign, -1, pango.ELLIPSIZE_NONE),
- (_('Title'), 4, self._cell_show_unknown, 100, pango.ELLIPSIZE_END),
(_('Duration'), 5, self._cell_secs_to_h_m_s, -1, pango.ELLIPSIZE_NONE),
(_('Bitrate'), 6, self._cell_k, -1, pango.ELLIPSIZE_NONE),
(_('Filename'), (9, 7), self._cell_filename, 100, pango.ELLIPSIZE_END),
@@ -1191,7 +1325,11 @@ class FlatPage(ViewerCommon):
{FUZZY: (CLEAN, """
SELECT artist,album,tracknumber,title,length,bitrate,
CONCAT_WS('/',path,filename) as file,
- 0 as disk, 0 as catalog_id
+ 0 as disk, 0 as catalog_id,
+ 0 as max_date_played,
+ "" as played_by,
+ 0 as played,
+ 0 as played_by_me
FROM tracks
WHERE MATCH (artist,album,title,filename) AGAINST (%s)
"""),
@@ -1199,7 +1337,11 @@ class FlatPage(ViewerCommon):
WHERE: (DIRTY, """
SELECT artist,album,tracknumber,title,length,bitrate,
CONCAT_WS('/',path,filename) as file,
- 0 as disk, 0 as catalog_id
+ 0 as disk, 0 as catalog_id,
+ 0 as max_date_played,
+ "" as played_by,
+ 0 as played,
+ 0 as played_by_me
FROM tracks WHERE (%s)
ORDER BY artist,album,path,tracknumber,title
""")},
@@ -1212,15 +1354,23 @@ class FlatPage(ViewerCommon):
track as tracknumber, title, time as length,bitrate,
file,
album.disk as disk,
- catalog.id as catalog_id
+ catalog.id as catalog_id,
+ MAX(object_count.date) as max_date_played,
+ SUBSTR(MAX(CONCAT(object_count.date, user.fullname)), 11) AS played_by,
+ played,
+ __played_by_me__
FROM song
LEFT JOIN artist ON artist.id = song.artist
LEFT JOIN album ON album.id = song.album
+ LEFT JOIN object_count ON song.id = object_count.object_id
+ AND object_count.object_type = "song"
+ LEFT JOIN user ON user.id = object_count.user
LEFT JOIN catalog ON song.catalog = catalog.id
WHERE
(MATCH(album.name) against(%s)
OR MATCH(artist.name) against(%s)
OR MATCH(title) against(%s)) AND __catalogs__
+ GROUP BY song.id
"""),
WHERE: (DIRTY, """
@@ -1230,15 +1380,25 @@ class FlatPage(ViewerCommon):
track as tracknumber, title,time as length, bitrate,
file,
album.disk as disk,
- catalog.id as catalog_id
+ catalog.id as catalog_id,
+ MAX(object_count.date) as max_date_played,
+ SUBSTR(MAX(CONCAT(object_count.date, user.fullname)), 11) AS played_by,
+ played,
+ __played_by_me__
FROM song
LEFT JOIN album on album.id = song.album
LEFT JOIN artist on artist.id = song.artist
+ LEFT JOIN object_count ON song.id = object_count.object_id
+ AND object_count.object_type = "song"
+ LEFT JOIN user ON user.id = object_count.user
LEFT JOIN catalog ON song.catalog = catalog.id
- WHERE (%s) AND __catalogs__ ORDER BY
+ WHERE (%s) AND __catalogs__
+ GROUP BY song.id
+ ORDER BY
artist.name, album.name, file, album.disk, track, title
""")}
}
+ _queries_table[AMPACHE_3_7] = _queries_table[AMPACHE]
def _cb_update(self, widget):
self._old_cat_data = self.catalogs.copy_data()
@@ -1258,13 +1418,12 @@ class FlatPage(ViewerCommon):
self.where_entry.set_text("")
while self._update_id:
context, namespace = self._update_id.popleft()
- glib.source_remove(context)
+ source_remove(context)
namespace[0] = True
self.list_store.clear()
return
- query = query.replace("__catalogs__", self.catalogs.sql())
-
+ query = self._query_cook_common(query)
qty = query.count("(%s)")
if access_mode == CLEAN:
query = (query, (user_text,) * qty)
@@ -1304,8 +1463,8 @@ class FlatPage(ViewerCommon):
if exception[0] == 2006:
raise
- glib.idle_add(self.tree_view.set_model, None)
- glib.idle_add(self.list_store.clear)
+ idle_add(self.tree_view.set_model, None)
+ idle_add(self.list_store.clear)
###########################################################################
@@ -1315,7 +1474,7 @@ class FlatPage(ViewerCommon):
self.tree_view.set_model(None)
self.list_store.clear()
namespace[1] = (0, ) # found = 0
- context = glib.idle_add(self._update_2, acc, cursor, namespace)
+ context = idle_add(self._update_2, acc, cursor, namespace)
self._update_id.append((context, namespace))
return False
@@ -1352,6 +1511,8 @@ class FlatPage(ViewerCommon):
class CatalogsInterface(gobject.GObject):
__gsignals__ = { "changed" : (gobject.SIGNAL_RUN_LAST, None, ()) }
+ time_unit_table = {N_('Minutes'): 60, N_('Hours'): 3600,
+ N_('Days'): 86400, N_('Weeks'): 604800}
def __init__(self):
gobject.GObject.__init__(self)
@@ -1372,14 +1533,19 @@ class CatalogsInterface(gobject.GObject):
self._dict.clear()
for row in liststore:
if row[0]:
- self._dict[row[3]] = {
+ self._dict[row[5]] = {
"peel" : row[1], "prepend" : row[2],
- "name" : row[4], "path" : row[5], "last_update" : row[6],
- "last_clean" : row[7], "last_add" : row[8]
+ "lpscale" : self._lpscale_calc(row[3], row[4]),
+ "name" : row[6], "path" : row[7], "last_update" : row[8],
+ "last_clean" : row[9], "last_add" : row[10]
}
self.emit("changed")
+ @classmethod
+ def _lpscale_calc(cls, qty, unit):
+ return qty * cls.time_unit_table[unit]
+
def transform_path(self, catalog, path):
if len(path) < 4:
return False, path # Path too short to be valid.
@@ -1420,13 +1586,16 @@ class CatalogsInterface(gobject.GObject):
return self._stripped_copy(self._dict) != self._stripped_copy(other)
+ def lpscale(self, catalog):
+ return self._dict[catalog]["lpscale"]
+
@staticmethod
def _stripped_copy(_dict):
copy = {}
for key1, val1 in _dict.iteritems():
copy[key1] = {}
for key2, val2 in val1.iteritems():
- if key2 not in ("peel", "prepend"):
+ if key2 not in ("peel", "prepend", "lpscale"):
copy[key1][key2] = val2
return copy
@@ -1438,12 +1607,14 @@ class CatalogsPage(PageCommon):
self.refresh = gtk.Button(stock=gtk.STOCK_REFRESH)
self.refresh.connect("clicked", self._on_refresh)
PageCommon.__init__(self, notebook, _("Catalogs"), self.refresh)
- # active, peel, prepend, id, name, path, last_update, last_clean, last_add
+
+ # active, peel, prepend, lpscale_qty, lpscale_unit, id, name, path,
+ # last_update, last_clean, last_add
self.list_store = gtk.ListStore(
- int, int, str, int, str, str, int, int, int)
+ int, int, str, int, str, int, str, str, int, int, int)
self.tree_cols = self._make_tv_columns(self.tree_view, (
- (_('Name'), 4, None, 65, pango.ELLIPSIZE_END),
- (_('Catalog Path'), 5, None, 100, pango.ELLIPSIZE_END),
+ (_('Name'), 6, None, 65, pango.ELLIPSIZE_END),
+ (_('Catalog Path'), 7, None, 100, pango.ELLIPSIZE_END),
(_('Prepend Path'), 2, None, -1, pango.ELLIPSIZE_NONE)
))
@@ -1452,21 +1623,46 @@ class CatalogsPage(PageCommon):
rend1.connect("toggled", self._on_toggle)
self.tree_view.insert_column_with_attributes(0, "", rend1, active=0)
+ col = gtk.TreeViewColumn(_('Last Played Scale'))
+
adj = gtk.Adjustment(0.0, 0.0, 999.0, 1.0, 1.0)
rend2 = gtk.CellRendererSpin()
rend2.props.editable = True
rend2.props.adjustment = adj
rend2.props.xalign = 1.0
- rend2.connect("editing-started", self._on_peel_editing_started)
- rend2.connect("edited", self._on_peel_edited)
- col = self.tree_view.insert_column_with_attributes(3, _("Path Peel"),
- rend2, text=1)
+ rend2.connect("editing-started", self._on_spin_editing_started, 3)
+ rend2.connect("edited", self._on_spin_edited, 3)
+ col.pack_start(rend2, False)
+ col.add_attribute(rend2, "text", 3)
+
+ lp_unit_scale_store = gtk.ListStore(str)
+ for each in (N_('Minutes'), N_('Hours'), N_('Days'), N_('Weeks')):
+ lp_unit_scale_store.append((each,))
+ lp_unit_scale_cr = gtk.CellRendererCombo()
+ lp_unit_scale_cr.props.has_entry = False
+ lp_unit_scale_cr.props.editable = True
+ lp_unit_scale_cr.props.model = lp_unit_scale_store
+ lp_unit_scale_cr.props.text_column = 0
+ lp_unit_scale_cr.connect("changed", self._on_lp_unit_changed)
+ col.pack_start(lp_unit_scale_cr, False)
+ col.set_cell_data_func(lp_unit_scale_cr, self._translate_scale)
+ self.tree_view.insert_column(col, 3)
- rend3 = self.tree_view.get_column(4).get_cell_renderers()[0]
+ adj = gtk.Adjustment(0.0, 0.0, 999.0, 1.0, 1.0)
+ rend3 = gtk.CellRendererSpin()
rend3.props.editable = True
- rend3.connect("edited", self._on_prepend_edited)
-
- for rend in (rend2, rend3):
+ rend3.props.adjustment = adj
+ rend3.props.xalign = 1.0
+ rend3.connect("editing-started", self._on_spin_editing_started, 1)
+ rend3.connect("edited", self._on_spin_edited, 1)
+ col = self.tree_view.insert_column_with_attributes(4, _("Path Peel"),
+ rend3, text=1)
+
+ rend4 = self.tree_view.get_column(5).get_cell_renderers()[0]
+ rend4.props.editable = True
+ rend4.connect("edited", self._on_prepend_edited)
+
+ for rend in (rend3, rend4):
rend.connect("editing-started", self._on_editing_started)
rend.connect("editing-canceled", self._on_editing_cancelled)
@@ -1478,20 +1674,23 @@ class CatalogsPage(PageCommon):
def activate(self, *args, **kwargs):
PageCommon.activate(self, *args, **kwargs)
- self.tree_view.get_column(0).set_visible(self._db_type in (AMPACHE,))
+ self.tree_view.get_column(0).set_visible(self._db_type in (AMPACHE, AMPACHE_3_7))
self.refresh.clicked()
def deactivate(self, *args, **kwargs):
PageCommon.deactivate(self, *args, **kwargs)
self.interface.clear()
+ def _translate_scale(self, col, cell, model, iter):
+ cell.props.text = _(model.get_value(iter, 4))
+
def _get_active_catalogs(self):
return tuple(x[3] for x in self.list_store if x[0])
def _store_user_data(self):
dict_ = {}
for row in self.list_store:
- dict_[str(row[3])] = (row[0], row[1], row[2])
+ dict_[str(row[5])] = (row[0], row[1], row[2], row[3], row[4])
self._usesettings["catalog_data"] = dict_
def _restore_user_data(self):
@@ -1499,13 +1698,16 @@ class CatalogsPage(PageCommon):
dict_ = self._usesettings["catalog_data"]
except:
return
-
+
for row in self.list_store:
try:
- row[0], row[1], row[2] = dict_[str(row[3])]
+ row[0], row[1], row[2], row[3], row[4] = dict_[str(row[5])]
except KeyError:
pass
-
+ except ValueError:
+ row[0], row[1], row[2] = dict_[str(row[5])]
+ row[3], row[4] = 4, N_('Weeks')
+
def _on_toggle(self, renderer, path):
iter = self.list_store.get_iter(path)
if iter is not None:
@@ -1515,17 +1717,24 @@ class CatalogsPage(PageCommon):
self.interface.update(self.list_store)
def _on_refresh(self, widget):
- if self._db_type == AMPACHE:
+ if self._db_type in (AMPACHE, AMPACHE_3_7):
self.refresh.set_sensitive(False)
self.tree_view.set_model(None)
- query = """SELECT id, name, path, last_update, IFNULL(last_clean,0),
- last_add FROM catalog WHERE enabled=1 ORDER BY name"""
+ if self._db_type == AMPACHE:
+ query = """SELECT id, name, path, last_update, IFNULL(last_clean,0),
+ last_add FROM catalog WHERE enabled=1 ORDER BY name"""
+ else:
+ query = """SELECT catalog.id, name, path, last_update, IFNULL(last_clean,0),
+ last_add FROM catalog
+ LEFT JOIN catalog_local on catalog.id = catalog_id
+ AND catalog.catalog_type = "local"
+ WHERE enabled=1 ORDER BY name"""
self._acc.request((query,), self._handler, self._failhandler)
elif self._db_type == PROKYON_3:
self.list_store.clear()
self.tree_view.set_model(self.list_store)
- self.list_store.append((1, 0, "", 0, _('N/A'), _('N/A'), 0, 0, 0))
+ self.list_store.append((1, 0, "", 0, _('N/A'), 0, _('N/A'), _('N/A'), 0, 0, 0))
self._restore_user_data()
self.interface.update(self.list_store)
@@ -1535,11 +1744,11 @@ class CatalogsPage(PageCommon):
def _on_editing_cancelled(self, rend):
self._block_key_bindings = False
- def _on_peel_editing_started(self, rend, editable, path):
- val = self.list_store[path][1]
+ def _on_spin_editing_started(self, rend, editable, path, index):
+ val = self.list_store[path][index]
rend.props.adjustment.props.value = val
- def _on_peel_edited(self, rend, path, new_data):
+ def _on_spin_edited(self, rend, path, new_data, index):
self._block_key_bindings = False
row = self.list_store[path]
try:
@@ -1547,8 +1756,8 @@ class CatalogsPage(PageCommon):
except ValueError:
pass
else:
- if val >= 0 and val != row[1]:
- row[1] = min(val, int(rend.props.adjustment.props.upper))
+ if val >= 0 and val != row[index]:
+ row[index] = min(val, int(rend.props.adjustment.props.upper))
self._store_user_data()
self.interface.update(self.list_store)
@@ -1561,6 +1770,12 @@ class CatalogsPage(PageCommon):
self._store_user_data()
self.interface.update(self.list_store)
+ def _on_lp_unit_changed(self, combo, path_string, new_iter):
+ text = combo.props.model.get_value(new_iter, 0)
+ self.list_store[path_string][4] = text
+ self._store_user_data()
+ self.interface.update(self.list_store)
+
###########################################################################
def _failhandler(self, exception, notify):
@@ -1568,8 +1783,8 @@ class CatalogsPage(PageCommon):
if exception[0] == 2006:
raise
- glib.idle_add(threadslock(self.tree_view.set_model), self.list_store)
- glib.idle_add(threadslock(self.refresh.set_sensitive), True)
+ idle_add(threadslock(self.tree_view.set_model), self.list_store)
+ idle_add(threadslock(self.refresh.set_sensitive), True)
@threadslock
def _update_1(self, acc, cursor, rows, namespace):
@@ -1585,7 +1800,7 @@ class CatalogsPage(PageCommon):
if db_row is None:
break
- self.list_store.append((0, 0, "") + db_row)
+ self.list_store.append((0, 0, "", 4, N_('Weeks')) + db_row)
self._restore_user_data()
self.tree_view.set_model(self.list_store)
@@ -1680,13 +1895,13 @@ class MediaPane(gtk.VBox):
###########################################################################
def _safe_disconnect(self):
- glib.idle_add(threadslock(self.prefs_controls.disconnect))
+ idle_add(threadslock(self.prefs_controls.disconnect))
def _hand_over(self, db_name):
self._tree_page.activate(self._acc1, db_name, self.usesettings)
self._flat_page.activate(self._acc2, db_name, self.usesettings)
self._catalogs_page.activate(self._acc3, db_name, self.usesettings)
- glib.idle_add(threadslock(self.show))
+ idle_add(threadslock(self.show))
def _fail_1(self, exception, notify):
# Give up.
@@ -1774,6 +1989,21 @@ class MediaPane(gtk.VBox):
def _stage_8(self, acc, request, cursor, notify, rows):
request(("ALTER TABLE song ADD FULLTEXT idjc (title)",), self._stage_9,
self._fail_2)
-
def _stage_9(self, acc, request, cursor, notify, rows):
- self._hand_over(AMPACHE)
+ notify("Checking ampache type")
+ request(("DESCRIBE catalog",), self._stage_10, self._fail_2)
+
+ def _stage_10(self, acc, request, cursor, notify, rows):
+ if self.schema_test("path", cursor.fetchall()):
+ notify('Found Ampache pre 3.7 schema')
+ self._hand_over(AMPACHE)
+ else:
+ request(("DESCRIBE catalog_local",), self._stage_11, self._fail_2)
+
+ def _stage_11(self, acc, request, cursor, notify, rows):
+ if self.schema_test("path", cursor.fetchall()):
+ notify('Found Ampache 3.7 schema')
+ self._hand_over(AMPACHE_3_7)
+ else:
+ notify('Unrecognised database')
+ self._safe_disconnect()
diff --git a/python/sourceclientgui.py b/python/sourceclientgui.py
index 2747407..28a0aa6 100644
--- a/python/sourceclientgui.py
+++ b/python/sourceclientgui.py
@@ -34,6 +34,7 @@ import xml.etree.ElementTree
import ctypes
from collections import namedtuple
from threading import Thread
+from contextlib import closing
import dbus
import pango
@@ -44,6 +45,7 @@ from idjc import FGlobs, PGlobs
from .utils import string_multireplace
from .gtkstuff import DefaultEntry, threadslock, HistoryEntry
from .gtkstuff import WindowSizeTracker, FolderChooserButton
+from .gtkstuff import timeout_add, source_remove
from .dialogs import *
from .irc import IRCPane
from .format import FormatControl, FormatCodecMPEG
@@ -296,6 +298,8 @@ class StatsThread(Thread):
def run(self):
+ class NoStats(ValueError):
+ pass
class BadXML(ValueError):
pass
@@ -313,18 +317,33 @@ class StatsThread(Thread):
opener.addheaders = [('User-agent', 'Mozilla/5.0')]
try:
- f = opener.open(stats_url)
- xmlfeed = f.read()
- except:
- print "failed to get server stats for", self.url
- return
- f.close()
- try:
- dom = mdom.parseString(xmlfeed)
- except:
- print "failed to parse server stats for", self.url
+ try:
+ with closing(opener.open(stats_url)) as h:
+ data = h.read()
+ except Exception:
+ raise NoStats
+
+ try:
+ dom = mdom.parseString(data)
+ except Exception:
+ if self.is_shoutcast:
+ # SC2 servers will return an HTML page, not XML.
+ try:
+ # No need to log in. :)
+ with closing(urllib2.urlopen("http://%s/statistics" %
+ hostport)) as h:
+ data = h.read()
+ dom = mdom.parseString(data)
+ except Exception:
+ raise NoStats
+
+ else:
+ raise NoStats
+
+ except NoStats:
+ print "failed to obtain server stats for", self.url
return
-
+
try:
if self.is_shoutcast:
if dom.documentElement.tagName == u'SHOUTCASTSERVER':
@@ -437,6 +456,13 @@ class ConnectionPane(gtk.VBox):
return 0
return 0 if s_type >= 2 else s_type + 1
+ def get_source_uri(self):
+ try:
+ config = ListLine(*self.liststore[0])
+ except IndexError:
+ return "No Master Server Configured"
+ return "{0.host}:{0.port}{0.mount}".format(config)
+
def set_button(self, tab):
st = self.get_master_server_type()
if st:
@@ -1227,6 +1253,15 @@ class StreamTab(Tab):
self.send(self.connection_string)
self.receive()
+ @classmethod
+ def get_latin1_text(cls, widget):
+ text = cls.get_utf8_text(widget)
+ return text.decode("utf-8").encode("latin1", "replace")
+
+ @staticmethod
+ def get_utf8_text(widget):
+ return widget.get_text().strip()
+
def cb_server_connect(self, widget):
if widget.get_active():
self.start_stop_encoder(ENCODER_START)
@@ -1240,7 +1275,17 @@ class StreamTab(Tab):
else:
user_agent = ""
- self.troubleshooting.user_agent_entry.get_text().strip()
+ # Determine the correct character encoding for fixed metadata.
+ if d["server_type"] == 1:
+ if self.shoutcast_latin1.get_active():
+ proc = self.get_latin1_text
+ else:
+ proc = self.get_utf8_text
+ else:
+ if self.format_control.get_settings()["family"] == "mpeg":
+ proc = self.get_latin1_text
+ else:
+ proc = self.get_utf8_text
self.connection_string = "\n".join((
"stream_source=" + str(self.numeric_id),
@@ -1252,13 +1297,13 @@ class StreamTab(Tab):
"login=" + d["login"],
"password=" + d["password"],
"useragent=" + user_agent,
- "dj_name=" + self.dj_name_entry.get_text().strip(),
- "listen_url=" + self.listen_url_entry.get_text().strip(),
- "description=" + self.description_entry.get_text().strip(),
- "genre=" + self.genre_entry.get_text().strip(),
- "irc=" + self.irc_entry.get_text().strip(),
- "aim=" + self.aim_entry.get_text().strip(),
- "icq=" + self.icq_entry.get_text().strip(),
+ "dj_name=" + proc(self.dj_name_entry),
+ "listen_url=" + proc(self.listen_url_entry),
+ "description=" + proc(self.description_entry),
+ "genre=" + proc(self.genre_entry),
+ "irc=" + proc(self.irc_entry),
+ "aim=" + proc(self.aim_entry),
+ "icq=" + proc(self.icq_entry),
"make_public=" + str(bool(self.make_public.get_active())),
"command=server_connect\n"))
self.send(self.connection_string)
@@ -1267,6 +1312,13 @@ class StreamTab(Tab):
self.server_connect.set_active(False)
self.connection_string = None
else:
+ ircmetadata = {"djname": self.dj_name_entry.get_text().strip(),
+ "description": self.description_entry.get_text().strip(),
+ "url": self.listen_url_entry.get_text().strip(),
+ "source": self.connection_pane.get_source_uri()
+ }
+ self.ircpane.connections_controller.new_metadata(ircmetadata)
+
self.connection_pane.streaming_set(True)
else:
self.send("command=server_disconnect\n")
@@ -1291,6 +1343,11 @@ class StreamTab(Tab):
"""Reference counting starter and stopper for the encoder."""
if command == ENCODER_START:
+ if not self.format_control.running:
+ # Custom metadata encoding may have been changed.
+ self.metadata_update.clicked()
+
+ # Must run this to bump reference counter regardless of if running.
self.format_control.start_encoder_rc()
elif command == ENCODER_STOP:
self.format_control.stop_encoder_rc()
@@ -1645,8 +1702,9 @@ class StreamTab(Tab):
stream_details_pane.show()
vbox = gtk.VBox()
+ vbox.set_border_width(10)
+ vbox.set_spacing(10)
alhbox = gtk.HBox()
- alhbox.set_border_width(10)
alhbox.set_spacing(3)
label = gtk.Label(_('Master server admin password'))
alhbox.pack_start(label, False)
@@ -1661,9 +1719,8 @@ class StreamTab(Tab):
self.admin_password_entry.show()
vbox.pack_start(alhbox, False)
alhbox.show()
-
+
frame = CategoryFrame(" %s " % _('Contact Details'))
- frame.set_shadow_type(gtk.SHADOW_NONE)
frame.set_border_width(0)
self.irc_entry = gtk.Entry()
set_tip(self.irc_entry,
@@ -1687,6 +1744,13 @@ class StreamTab(Tab):
vbox.pack_start(frame, False)
frame.show_all()
+ self.shoutcast_latin1 = gtk.CheckButton(
+ _('Use ISO-8859-1 encoding for fixed metadata'))
+ set_tip(self.shoutcast_latin1,
+ _('Enable this if sending to a Shoutcast V1 server.'))
+ vbox.pack_start(self.shoutcast_latin1, False)
+ self.shoutcast_latin1.show()
+
label = gtk.Label(_('Extra Shoutcast'))
self.details_nb.append_page(vbox, label)
label.show()
@@ -1734,6 +1798,7 @@ class StreamTab(Tab):
"irc_data" : (self.ircpane, "marshall"),
"format_data" : (self.format_control, "marshall"),
"details_nb" : (self.details_nb, "current_page"),
+ "shoutcast_latin1" : (self.shoutcast_latin1, "active"),
}
self.objects.update(self.troubleshooting.objects)
@@ -1758,14 +1823,16 @@ class RecordTab(Tab):
filename = datetime.datetime.today().strftime(self.parentobject.scg.parent.prefs_window.recorder_filename.get_text().strip())
table = (("$$", "$"), ("$r", "%02d" % (self.parentobject.numeric_id + 1)))
filename = string_multireplace(filename, table)
+ folder = sd.file_chooser_button.get_current_folder()
self.parentobject.send("record_source=%d\n"
"record_filename=%s\n"
"record_folder=%s\ncommand=recorder_start\n" % (
- num_id, filename,
- sd.file_chooser_button.get_current_folder()))
+ num_id, filename, folder))
sd.set_sensitive(False)
self.parentobject.time_indicator.set_sensitive(True)
+ self.path = folder
self.recording = True
+ self.parentobject.recordstate(True, self.path)
if self.parentobject.receive() == "failed":
self.stop_button.clicked()
else:
@@ -1783,6 +1850,7 @@ class RecordTab(Tab):
self.parentobject.time_indicator.set_sensitive(False)
if self.pause_button.get_active():
self.pause_button.set_active(False)
+ self.parentobject.recordstate(False, self.path)
else:
widget.set_active(True)
elif userdata == "stop":
@@ -1809,6 +1877,7 @@ class RecordTab(Tab):
CategoryFrame.__init__(self)
self.parentobject = parent
self.stop_pressed = False
+ self.path = None
self.recording = False
hbox = gtk.HBox()
hbox.set_border_width(3)
@@ -1947,6 +2016,9 @@ class RecordTab(Tab):
Tab.show_indicator(self, colour)
self.scg.parent.recording_panel.indicator[self.numeric_id
].set_indicator(colour)
+
+ def recordstate(self, state, path):
+ self.scg._handle_recordstate(self.numeric_id, state, path)
def __init__(self, scg, numeric_id, indicator_lookup):
Tab.__init__(self, scg, numeric_id, indicator_lookup)
@@ -2133,6 +2205,7 @@ class SourceClientGui(dbus.service.Object):
def new_plugin_started(self):
print "streamstate_cache purge"
self._streamstate_cache = {}
+ self._recordstate_cache = {}
def monitor(self):
self.led_alternate = not self.led_alternate
@@ -2151,8 +2224,12 @@ class SourceClientGui(dbus.service.Object):
rectab.show_indicator(("clear", "red", "amber", "clear")[
int(recorder_state)])
rectab.time_indicator.set_value(int(recorded_seconds))
- if recorder_state != "0":
+ rec_state = recorder_state != "0"
+ if rec_state:
recording = True
+
+ self._handle_recordstate(rectab.numeric_id, rec_state,
+ rectab.record_buttons.path)
update_listeners = False
l_count = 0
for streamtab in self.streamtabframe.tabs:
@@ -2255,10 +2332,21 @@ class SourceClientGui(dbus.service.Object):
self.streamstate_changed(numeric_id, connected,
streamtab.server_connect_label.get_text())
+ def _handle_recordstate(self, numeric_id, state, pathname):
+ cache = self._recordstate_cache
+
+ if cache is not None and (numeric_id not in cache or cache[numeric_id] != state):
+ cache[numeric_id] = state
+ self.recordstate_changed(numeric_id, state, pathname or "")
+
@dbus.service.signal(dbus_interface=PGlobs.dbus_bus_basename, signature="uus")
def streamstate_changed(self, numeric_id, state, where):
pass
-
+
+ @dbus.service.signal(dbus_interface=PGlobs.dbus_bus_basename, signature="uus")
+ def recordstate_changed(self, numeric_id, state, where):
+ pass
+
def stop_streaming_all(self):
for streamtab in self.streamtabframe.tabs:
streamtab.server_connect.set_active(False)
@@ -2272,7 +2360,7 @@ class SourceClientGui(dbus.service.Object):
self.stop_recording_all()
self.stop_streaming_all()
self.stop_irc_all()
- gobject.source_remove(self.monitor_source_id)
+ source_remove(self.monitor_source_id)
self.monitor()
def app_exit(self):
if self.parent.session_loaded:
@@ -2341,17 +2429,11 @@ class SourceClientGui(dbus.service.Object):
if self.receive() == "succeeded":
print "updated song metadata successfully"
- common = {"artist": artist, "title": title, "album": album,
+ ircmetadata = {"artist": artist, "title": title, "album": album,
"songname": songname}
- # Update the custom metadata on all stream tabs.
+ # Update the song metadata on all stream tabs.
for tab in self.streamtabframe.tabs:
tab.metadata_update.clicked()
- ircmetadata = {"djname": tab.dj_name_entry.get_text(),
- "description": tab.description_entry.get_text(),
- "url": tab.listen_url_entry.get_text()
- }
- ircmetadata.update(common)
-
tab.ircpane.connections_controller.new_metadata(ircmetadata)
def source_client_open(self):
@@ -2759,7 +2841,7 @@ class SourceClientGui(dbus.service.Object):
self.last_message_time = 0
self.connection_string = None
self.is_shoutcast = False
- self._streamstate_cache = None
+ self._streamstate_cache = self._recordstate_cache = None
self.artist = self.title = self.album = self.songname = ""
self.dialog_group = dialog_group()
@@ -2773,7 +2855,7 @@ class SourceClientGui(dbus.service.Object):
_('<span weight="bold" size="12000">A scheduled stream'
' disconnection has occurred.</span>'))
- self.monitor_source_id = gobject.timeout_add(250, threadslock(self.monitor))
+ self.monitor_source_id = timeout_add(250, threadslock(self.monitor))
self.window.realize() # Prevent a rendering bug.
dbus.service.Object.__init__(self,
--
idjc packaging
More information about the pkg-multimedia-commits
mailing list