[Pkg-kde-commits] rev 2359 - trunk/packages/akode/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Wed Nov 23 17:18:44 UTC 2005
Author: chrsmrtn
Date: 2005-11-23 17:18:43 +0000 (Wed, 23 Nov 2005)
New Revision: 2359
Modified:
trunk/packages/akode/debian/patches/98_buildprep.diff
Log:
Update akode buildprep for rc1.
(Since rc1 must be accompanied by kdemultimedia 3.5-rc2+, this
won't be uploaded anywhere until the next round on alioth)
Modified: trunk/packages/akode/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/akode/debian/patches/98_buildprep.diff 2005-11-23 02:17:14 UTC (rev 2358)
+++ trunk/packages/akode/debian/patches/98_buildprep.diff 2005-11-23 17:18:43 UTC (rev 2359)
@@ -2911,7 +2911,7 @@
# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
--- akode/akodeplay/Makefile.in
+++ akode/akodeplay/Makefile.in
-@@ -157,6 +157,9 @@
+@@ -158,6 +158,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -2921,7 +2921,7 @@
MAKEINFO = @MAKEINFO@
NOOPT_CFLAGS = @NOOPT_CFLAGS@
NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-@@ -267,7 +270,7 @@
+@@ -269,7 +272,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -2930,7 +2930,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -276,9 +279,9 @@
+@@ -278,9 +281,9 @@
#>- exit 1;; \
#>- esac; \
#>- done; \
@@ -2942,7 +2942,7 @@
#>+ 12
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -288,9 +291,9 @@
+@@ -290,9 +293,9 @@
exit 1;; \
esac; \
done; \
@@ -2954,7 +2954,7 @@
cd $(top_srcdir) && perl admin/am_edit akode/akodeplay/Makefile.in
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -305,9 +308,9 @@
+@@ -307,9 +310,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2966,7 +2966,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -572,9 +575,9 @@
+@@ -574,9 +577,9 @@
exit 1;; \
esac; \
done; \
@@ -2980,7 +2980,7 @@
--- akode/lib/Makefile.in
+++ akode/lib/Makefile.in
-@@ -180,6 +180,9 @@
+@@ -182,6 +182,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -2990,7 +2990,7 @@
MAKEINFO = @MAKEINFO@
NOOPT_CFLAGS = @NOOPT_CFLAGS@
NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-@@ -310,7 +313,7 @@
+@@ -313,7 +316,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -2999,7 +2999,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -319,9 +322,9 @@
+@@ -322,9 +325,9 @@
#>- exit 1;; \
#>- esac; \
#>- done; \
@@ -3011,7 +3011,7 @@
#>+ 12
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -331,9 +334,9 @@
+@@ -334,9 +337,9 @@
exit 1;; \
esac; \
done; \
@@ -3023,7 +3023,7 @@
cd $(top_srcdir) && perl admin/am_edit akode/lib/Makefile.in
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -348,9 +351,9 @@
+@@ -351,9 +354,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -3035,7 +3035,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
akode_export.h: stamp-h2
-@@ -362,7 +365,7 @@
+@@ -365,7 +368,7 @@
stamp-h2: $(srcdir)/akode_export.h.in $(top_builddir)/config.status
@rm -f stamp-h2
cd $(top_builddir) && $(SHELL) ./config.status akode/lib/akode_export.h
@@ -3044,7 +3044,7 @@
cd $(top_srcdir) && $(AUTOHEADER)
rm -f stamp-h2
touch $@
-@@ -686,9 +689,9 @@
+@@ -689,9 +692,9 @@
exit 1;; \
esac; \
done; \
@@ -3068,7 +3068,7 @@
MAKEINFO = @MAKEINFO@
NOOPT_CFLAGS = @NOOPT_CFLAGS@
NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-@@ -252,7 +255,7 @@
+@@ -253,7 +256,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -3077,7 +3077,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -261,9 +264,9 @@
+@@ -262,9 +265,9 @@
#>- exit 1;; \
#>- esac; \
#>- done; \
@@ -3089,7 +3089,7 @@
#>+ 12
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -273,9 +276,9 @@
+@@ -274,9 +277,9 @@
exit 1;; \
esac; \
done; \
@@ -3101,7 +3101,7 @@
cd $(top_srcdir) && perl admin/am_edit akode/Makefile.in
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -290,9 +293,9 @@
+@@ -291,9 +294,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -3113,7 +3113,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
akode-config: $(top_builddir)/config.status $(srcdir)/akode-config.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-@@ -619,9 +622,9 @@
+@@ -605,7 +608,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=Makefile.in configure.in.bot akode-config.in configure.in.in Makefile.am PACKAGING
++KDE_DIST=Makefile.in configure.in.bot akode-config.in configure.in.in PACKAGING Makefile.am
+
+ #>+ 2
+ docs-am:
+@@ -620,9 +623,9 @@
exit 1;; \
esac; \
done; \
@@ -3127,7 +3136,7 @@
--- akode/plugins/alsa_sink/Makefile.in
+++ akode/plugins/alsa_sink/Makefile.in
-@@ -164,6 +164,9 @@
+@@ -165,6 +165,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -3137,7 +3146,7 @@
MAKEINFO = @MAKEINFO@
NOOPT_CFLAGS = @NOOPT_CFLAGS@
NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-@@ -276,7 +279,7 @@
+@@ -278,7 +281,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -3146,7 +3155,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -285,9 +288,9 @@
+@@ -287,9 +290,9 @@
#>- exit 1;; \
#>- esac; \
#>- done; \
@@ -3158,7 +3167,7 @@
#>+ 12
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -297,9 +300,9 @@
+@@ -299,9 +302,9 @@
exit 1;; \
esac; \
done; \
@@ -3170,7 +3179,7 @@
cd $(top_srcdir) && perl admin/am_edit akode/plugins/alsa_sink/Makefile.in
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -314,9 +317,9 @@
+@@ -316,9 +319,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -3182,7 +3191,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -598,9 +601,9 @@
+@@ -600,9 +603,9 @@
exit 1;; \
esac; \
done; \
@@ -3196,7 +3205,7 @@
--- akode/plugins/ffmpeg_decoder/Makefile.in
+++ akode/plugins/ffmpeg_decoder/Makefile.in
-@@ -168,6 +168,9 @@
+@@ -166,6 +166,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -3206,7 +3215,7 @@
MAKEINFO = @MAKEINFO@
NOOPT_CFLAGS = @NOOPT_CFLAGS@
NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-@@ -282,7 +285,7 @@
+@@ -279,7 +282,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -3215,7 +3224,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -291,9 +294,9 @@
+@@ -288,9 +291,9 @@
#>- exit 1;; \
#>- esac; \
#>- done; \
@@ -3227,7 +3236,7 @@
#>+ 12
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -303,9 +306,9 @@
+@@ -300,9 +303,9 @@
exit 1;; \
esac; \
done; \
@@ -3239,7 +3248,7 @@
cd $(top_srcdir) && perl admin/am_edit akode/plugins/ffmpeg_decoder/Makefile.in
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -320,9 +323,9 @@
+@@ -317,9 +320,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -3251,7 +3260,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -623,9 +626,9 @@
+@@ -601,9 +604,9 @@
exit 1;; \
esac; \
done; \
@@ -3265,7 +3274,7 @@
--- akode/plugins/jack_sink/Makefile.in
+++ akode/plugins/jack_sink/Makefile.in
-@@ -164,6 +164,9 @@
+@@ -165,6 +165,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -3275,7 +3284,7 @@
MAKEINFO = @MAKEINFO@
NOOPT_CFLAGS = @NOOPT_CFLAGS@
NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-@@ -276,7 +279,7 @@
+@@ -278,7 +281,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -3284,7 +3293,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -285,9 +288,9 @@
+@@ -287,9 +290,9 @@
#>- exit 1;; \
#>- esac; \
#>- done; \
@@ -3296,7 +3305,7 @@
#>+ 12
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -297,9 +300,9 @@
+@@ -299,9 +302,9 @@
exit 1;; \
esac; \
done; \
@@ -3308,7 +3317,7 @@
cd $(top_srcdir) && perl admin/am_edit akode/plugins/jack_sink/Makefile.in
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -314,9 +317,9 @@
+@@ -316,9 +319,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -3320,7 +3329,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -598,9 +601,9 @@
+@@ -600,9 +603,9 @@
exit 1;; \
esac; \
done; \
@@ -3334,7 +3343,7 @@
--- akode/plugins/Makefile.in
+++ akode/plugins/Makefile.in
-@@ -141,6 +141,9 @@
+@@ -142,6 +142,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -3344,7 +3353,7 @@
MAKEINFO = @MAKEINFO@
NOOPT_CFLAGS = @NOOPT_CFLAGS@
NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-@@ -260,7 +263,7 @@
+@@ -263,7 +266,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -3353,7 +3362,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -269,9 +272,9 @@
+@@ -272,9 +275,9 @@
#>- exit 1;; \
#>- esac; \
#>- done; \
@@ -3365,7 +3374,7 @@
#>+ 12
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -281,9 +284,9 @@
+@@ -284,9 +287,9 @@
exit 1;; \
esac; \
done; \
@@ -3377,7 +3386,7 @@
cd $(top_srcdir) && perl admin/am_edit akode/plugins/Makefile.in
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -298,9 +301,9 @@
+@@ -301,9 +304,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -3389,7 +3398,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -602,9 +605,9 @@
+@@ -605,9 +608,9 @@
exit 1;; \
esac; \
done; \
@@ -3403,7 +3412,7 @@
--- akode/plugins/mpc_decoder/Makefile.in
+++ akode/plugins/mpc_decoder/Makefile.in
-@@ -181,6 +181,9 @@
+@@ -179,6 +179,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -3413,7 +3422,7 @@
MAKEINFO = @MAKEINFO@
NOOPT_CFLAGS = @NOOPT_CFLAGS@
NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-@@ -296,7 +299,7 @@
+@@ -293,7 +296,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -3422,7 +3431,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -305,9 +308,9 @@
+@@ -302,9 +305,9 @@
#>- exit 1;; \
#>- esac; \
#>- done; \
@@ -3434,7 +3443,7 @@
#>+ 12
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -317,9 +320,9 @@
+@@ -314,9 +317,9 @@
exit 1;; \
esac; \
done; \
@@ -3446,7 +3455,7 @@
cd $(top_srcdir) && perl admin/am_edit akode/plugins/mpc_decoder/Makefile.in
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -334,9 +337,9 @@
+@@ -331,9 +334,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -3458,7 +3467,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -741,9 +744,9 @@
+@@ -719,9 +722,9 @@
exit 1;; \
esac; \
done; \
@@ -3472,7 +3481,7 @@
--- akode/plugins/mpc_decoder/mppdec/Makefile.in
+++ akode/plugins/mpc_decoder/mppdec/Makefile.in
-@@ -156,6 +156,9 @@
+@@ -157,6 +157,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -3482,7 +3491,7 @@
MAKEINFO = @MAKEINFO@
NOOPT_CFLAGS = @NOOPT_CFLAGS@
NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-@@ -267,7 +270,7 @@
+@@ -269,7 +272,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -3491,7 +3500,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -276,9 +279,9 @@
+@@ -278,9 +281,9 @@
#>- exit 1;; \
#>- esac; \
#>- done; \
@@ -3503,7 +3512,7 @@
#>+ 12
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -288,9 +291,9 @@
+@@ -290,9 +293,9 @@
exit 1;; \
esac; \
done; \
@@ -3515,7 +3524,7 @@
cd $(top_srcdir) && perl admin/am_edit akode/plugins/mpc_decoder/mppdec/Makefile.in
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -305,9 +308,9 @@
+@@ -307,9 +310,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -3527,7 +3536,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -558,9 +561,9 @@
+@@ -560,9 +563,9 @@
exit 1;; \
esac; \
done; \
@@ -3541,7 +3550,7 @@
--- akode/plugins/mpeg_decoder/Makefile.in
+++ akode/plugins/mpeg_decoder/Makefile.in
-@@ -168,6 +168,9 @@
+@@ -166,6 +166,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -3551,7 +3560,7 @@
MAKEINFO = @MAKEINFO@
NOOPT_CFLAGS = @NOOPT_CFLAGS@
NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-@@ -282,7 +285,7 @@
+@@ -279,7 +282,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -3560,7 +3569,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -291,9 +294,9 @@
+@@ -288,9 +291,9 @@
#>- exit 1;; \
#>- esac; \
#>- done; \
@@ -3572,7 +3581,7 @@
#>+ 12
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -303,9 +306,9 @@
+@@ -300,9 +303,9 @@
exit 1;; \
esac; \
done; \
@@ -3584,7 +3593,7 @@
cd $(top_srcdir) && perl admin/am_edit akode/plugins/mpeg_decoder/Makefile.in
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -320,9 +323,9 @@
+@@ -317,9 +320,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -3596,7 +3605,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -623,9 +626,9 @@
+@@ -601,9 +604,9 @@
exit 1;; \
esac; \
done; \
@@ -3610,7 +3619,7 @@
--- akode/plugins/oss_sink/Makefile.in
+++ akode/plugins/oss_sink/Makefile.in
-@@ -164,6 +164,9 @@
+@@ -165,6 +165,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -3620,7 +3629,7 @@
MAKEINFO = @MAKEINFO@
NOOPT_CFLAGS = @NOOPT_CFLAGS@
NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-@@ -276,7 +279,7 @@
+@@ -278,7 +281,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -3629,7 +3638,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -285,9 +288,9 @@
+@@ -287,9 +290,9 @@
#>- exit 1;; \
#>- esac; \
#>- done; \
@@ -3641,7 +3650,7 @@
#>+ 12
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -297,9 +300,9 @@
+@@ -299,9 +302,9 @@
exit 1;; \
esac; \
done; \
@@ -3653,7 +3662,7 @@
cd $(top_srcdir) && perl admin/am_edit akode/plugins/oss_sink/Makefile.in
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -314,9 +317,9 @@
+@@ -316,9 +319,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -3665,7 +3674,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -598,9 +601,9 @@
+@@ -600,9 +603,9 @@
exit 1;; \
esac; \
done; \
@@ -3679,7 +3688,7 @@
--- akode/plugins/polyp_sink/Makefile.in
+++ akode/plugins/polyp_sink/Makefile.in
-@@ -164,6 +164,9 @@
+@@ -165,6 +165,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -3689,7 +3698,7 @@
MAKEINFO = @MAKEINFO@
NOOPT_CFLAGS = @NOOPT_CFLAGS@
NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-@@ -276,7 +279,7 @@
+@@ -278,7 +281,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -3698,7 +3707,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -285,9 +288,9 @@
+@@ -287,9 +290,9 @@
#>- exit 1;; \
#>- esac; \
#>- done; \
@@ -3710,7 +3719,7 @@
#>+ 12
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -297,9 +300,9 @@
+@@ -299,9 +302,9 @@
exit 1;; \
esac; \
done; \
@@ -3722,7 +3731,7 @@
cd $(top_srcdir) && perl admin/am_edit akode/plugins/polyp_sink/Makefile.in
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -314,9 +317,9 @@
+@@ -316,9 +319,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -3734,7 +3743,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -598,9 +601,9 @@
+@@ -600,9 +603,9 @@
exit 1;; \
esac; \
done; \
@@ -3748,7 +3757,7 @@
--- akode/plugins/src_resampler/Makefile.in
+++ akode/plugins/src_resampler/Makefile.in
-@@ -165,6 +165,9 @@
+@@ -166,6 +166,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -3758,7 +3767,7 @@
MAKEINFO = @MAKEINFO@
NOOPT_CFLAGS = @NOOPT_CFLAGS@
NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-@@ -277,7 +280,7 @@
+@@ -279,7 +282,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -3767,7 +3776,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -286,9 +289,9 @@
+@@ -288,9 +291,9 @@
#>- exit 1;; \
#>- esac; \
#>- done; \
@@ -3779,7 +3788,7 @@
#>+ 12
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -298,9 +301,9 @@
+@@ -300,9 +303,9 @@
exit 1;; \
esac; \
done; \
@@ -3791,7 +3800,7 @@
cd $(top_srcdir) && perl admin/am_edit akode/plugins/src_resampler/Makefile.in
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -315,9 +318,9 @@
+@@ -317,9 +320,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -3803,7 +3812,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -599,9 +602,9 @@
+@@ -601,9 +604,9 @@
exit 1;; \
esac; \
done; \
@@ -3815,9 +3824,78 @@
cd $(top_srcdir) && perl admin/am_edit akode/plugins/src_resampler/Makefile.in
+--- akode/plugins/sun_sink/Makefile.in
++++ akode/plugins/sun_sink/Makefile.in
+@@ -163,6 +163,9 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MADLIBS = @MADLIBS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
+@@ -276,7 +279,7 @@
+
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -285,9 +288,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu akode/plugins/sun_sink/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign akode/plugins/sun_sink/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu akode/plugins/sun_sink/Makefile
++#>- $(AUTOMAKE) --foreign akode/plugins/sun_sink/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -297,9 +300,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu akode/plugins/sun_sink/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign akode/plugins/sun_sink/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu akode/plugins/sun_sink/Makefile
++ $(AUTOMAKE) --foreign akode/plugins/sun_sink/Makefile
+ cd $(top_srcdir) && perl admin/am_edit akode/plugins/sun_sink/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -314,9 +317,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+@@ -598,9 +601,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu akode/plugins/sun_sink/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign akode/plugins/sun_sink/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu akode/plugins/sun_sink/Makefile
++ $(AUTOMAKE) --foreign akode/plugins/sun_sink/Makefile
+ cd $(top_srcdir) && perl admin/am_edit akode/plugins/sun_sink/Makefile.in
+
+
--- akode/plugins/xiph_decoder/Makefile.in
+++ akode/plugins/xiph_decoder/Makefile.in
-@@ -175,6 +175,9 @@
+@@ -173,6 +173,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -3827,7 +3905,7 @@
MAKEINFO = @MAKEINFO@
NOOPT_CFLAGS = @NOOPT_CFLAGS@
NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-@@ -292,7 +295,7 @@
+@@ -286,7 +289,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -3836,7 +3914,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -301,9 +304,9 @@
+@@ -295,9 +298,9 @@
#>- exit 1;; \
#>- esac; \
#>- done; \
@@ -3848,7 +3926,7 @@
#>+ 12
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -313,9 +316,9 @@
+@@ -307,9 +310,9 @@
exit 1;; \
esac; \
done; \
@@ -3860,7 +3938,7 @@
cd $(top_srcdir) && perl admin/am_edit akode/plugins/xiph_decoder/Makefile.in
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -330,9 +333,9 @@
+@@ -324,9 +327,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -3872,16 +3950,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -617,7 +620,7 @@
+@@ -592,7 +595,7 @@
#>+ 2
--KDE_DIST=akodeVorbisStreamPlayObject.mcopclass akodeSpeexStreamPlayObject.mcopclass akodeXiphPlayObject.mcopclass Makefile.in xiph_decoder.h vorbis_decoder.h flac_decoder.h Makefile.am speex_decoder.h
-+KDE_DIST=akodeVorbisStreamPlayObject.mcopclass akodeSpeexStreamPlayObject.mcopclass akodeXiphPlayObject.mcopclass Makefile.in vorbis_decoder.h xiph_decoder.h flac_decoder.h Makefile.am speex_decoder.h
+-KDE_DIST=Makefile.in xiph_decoder.h vorbis_decoder.h flac_decoder.h Makefile.am speex_decoder.h
++KDE_DIST=Makefile.in vorbis_decoder.h xiph_decoder.h flac_decoder.h Makefile.am speex_decoder.h
#>+ 3
clean-closures:
-@@ -636,9 +639,9 @@
+@@ -611,9 +614,9 @@
exit 1;; \
esac; \
done; \
@@ -3918,8 +3996,8 @@
# include <unistd.h>
#endif"
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar USER_INCLUDES USER_LDFLAGS CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN all_includes all_libraries AUTODIRS LIBFLAC LIBOGGFLAC SPEEXLIBS MADLIBS LIBSAMPLERATE PKG_CONFIG JACK_CFLAGS JACK_LIBADD JACK_LDFLAGS POLYP_CFLAGS POLYP_LIBADD POLYP_LDFLAGS AVCODEC_CFLAGS AVCODEC_LIBADD AVCODEC_LDFLAGS AVFORMAT_CFLAGS AVFORMAT_LIBADD AVFORMAT_LDFLAGS AKODE_LIBDL LIBPTHREAD include_mpeg_decoder_TRUE include_mpeg_decoder_FALSE LIBOSSAUDIO LIBASOUND VORBIS_LIBS VORBISFILE_LIBS VORBISENC_LIBS include_xiph_decoder_TRUE include_xiph_decoder_FALSE include_src_resampler_TRUE include_src_resampler_FALSE include_alsa_sink_TRUE include_alsa_sink_FALSE include_oss_sink_TRUE include_oss_sink_FALSE include_jack_sink_TRUE include_jack_sink_FALSE include_polyp_sink_TRUE include_polyp_sink_FALSE include_ffmpeg_decoder_TRUE include_ffmpeg_decoder_FALSE TOPSUBDIRS akode_SUBDIR_included_TRUE akode_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT USER_INCLUDES USER_LDFLAGS CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN all_includes all_libraries AUTODIRS LIBFLAC LIBOGGFLAC SPEEXLIBS MADLIBS LIBSAMPLERATE PKG_CONFIG JACK_CFLAGS JACK_LIBADD JACK_LDFLAGS POLYP_CFLAGS POLYP_LIBADD POLYP_LDFLAGS AVCODEC_CFLAGS AVCODEC_LIBADD AVCODEC_LDFLAGS AVFORMAT_CFLAGS AVFORMAT_LIBADD AVFORMAT_LDFLAGS AKODE_LIBDL LIBPTHREAD include_mpeg_decoder_TRUE include_mpeg_decoder_FALSE LIBOSSAUDIO LIBASOUND VORBIS_LIBS VORBISFILE_LIBS VORBISENC_LIBS include_xiph_decoder_TRUE include_xiph_decoder_FALSE include_src_resampler_TRUE include_src_resampler_FALSE include_alsa_sink_TRUE include_alsa_sink_FALSE include_oss_sink_TRUE include_oss_sink_FALSE include_jack_sink_TRUE include_jack_sink_FALSE include_polyp_sink_TRUE include_polyp_sink_FALSE include_ffmpeg_decoder_TRUE include_ffmpeg_decoder_FALSE TOPSUBDIRS akode_SUBDIR_included_TRUE akode_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar USER_INCLUDES USER_LDFLAGS CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN all_includes all_libraries AUTODIRS LIBFLAC LIBOGGFLAC SPEEXLIBS MADLIBS LIBSAMPLERATE PKG_CONFIG JACK_CFLAGS JACK_LIBADD JACK_LDFLAGS POLYP_CFLAGS POLYP_LIBADD POLYP_LDFLAGS AVCODEC_CFLAGS AVCODEC_LIBADD AVCODEC_LDFLAGS AVFORMAT_CFLAGS AVFORMAT_LIBADD AVFORMAT_LDFLAGS AKODE_LIBDL LIBPTHREAD LIBSEM include_mpeg_decoder_TRUE include_mpeg_decoder_FALSE LIBOSSAUDIO LIBASOUND VORBIS_LIBS VORBISFILE_LIBS include_xiph_decoder_TRUE include_xiph_decoder_FALSE include_src_resampler_TRUE include_src_resampler_FALSE include_alsa_sink_TRUE include_alsa_sink_FALSE include_oss_sink_TRUE include_oss_sink_FALSE include_sun_sink_TRUE include_sun_sink_FALSE include_jack_sink_TRUE include_jack_sink_FALSE include_polyp_sink_TRUE include_polyp_sink_FALSE include_ffmpeg_decoder_TRUE include_ffmpeg_decoder_FALSE TOPSUBDIRS akode_SUBDIR_included_TRUE akode_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT USER_INCLUDES USER_LDFLAGS CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN all_includes all_libraries AUTODIRS LIBFLAC LIBOGGFLAC SPEEXLIBS MADLIBS LIBSAMPLERATE PKG_CONFIG JACK_CFLAGS JACK_LIBADD JACK_LDFLAGS POLYP_CFLAGS POLYP_LIBADD POLYP_LDFLAGS AVCODEC_CFLAGS AVCODEC_LIBADD AVCODEC_LDFLAGS AVFORMAT_CFLAGS AVFORMAT_LIBADD AVFORMAT_LDFLAGS AKODE_LIBDL LIBPTHREAD LIBSEM include_mpeg_decoder_TRUE include_mpeg_decoder_FALSE LIBOSSAUDIO LIBASOUND VORBIS_LIBS VORBISFILE_LIBS include_xiph_decoder_TRUE include_xiph_decoder_FALSE include_src_resampler_TRUE include_src_resampler_FALSE include_alsa_sink_TRUE include_alsa_sink_FALSE include_oss_sink_TRUE include_oss_sink_FALSE include_sun_sink_TRUE include_sun_sink_FALSE include_jack_sink_TRUE include_jack_sink_FALSE include_polyp_sink_TRUE include_polyp_sink_FALSE include_ffmpeg_decoder_TRUE include_ffmpeg_decoder_FALSE TOPSUBDIRS akode_SUBDIR_included_TRUE akode_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -3932,7 +4010,7 @@
--disable-fast-perl disable fast Makefile generation (needs perl)
--enable-debug=ARG enables debug symbols (yes|no|full) default=no
--disable-debug disables debug output and debug symbols default=no
-@@ -2087,6 +2089,31 @@
+@@ -2089,6 +2091,31 @@
@@ -3964,7 +4042,7 @@
if test "x$prefix" = "xNONE"; then
-@@ -6522,183 +6549,6 @@
+@@ -6524,183 +6551,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -4148,7 +4226,7 @@
fi
-@@ -6867,7 +6717,7 @@
+@@ -6869,7 +6719,7 @@
# 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
@@ -4157,7 +4235,7 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -6972,7 +6822,7 @@
+@@ -6974,7 +6824,7 @@
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
lt_cv_path_LD="$ac_dir/$ac_prog"
# Check to see if the program is GNU ld. I'd rather use --version,
@@ -4166,7 +4244,7 @@
# 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'*)
-@@ -7006,7 +6856,7 @@
+@@ -7008,7 +6858,7 @@
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -4175,7 +4253,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -7036,6 +6886,15 @@
+@@ -7038,6 +6888,15 @@
*) reload_flag=" $reload_flag" ;;
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -4191,7 +4269,7 @@
echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-@@ -7122,44 +6981,36 @@
+@@ -7124,44 +6983,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -4246,7 +4324,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -7175,7 +7026,7 @@
+@@ -7177,7 +7028,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -4255,7 +4333,7 @@
ia64*)
lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-@@ -7192,42 +7043,21 @@
+@@ -7194,42 +7045,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -4305,7 +4383,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
-@@ -7246,19 +7076,14 @@
+@@ -7248,19 +7078,14 @@
;;
openbsd*)
@@ -4327,7 +4405,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -7268,7 +7093,6 @@
+@@ -7270,7 +7095,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -4335,16 +4413,16 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -7345,7 +7169,7 @@
+@@ -7347,7 +7171,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 7348 "configure"' > conftest.$ac_ext
-+ echo '#line 7172 "configure"' > conftest.$ac_ext
+- echo '#line 7350 "configure"' > conftest.$ac_ext
++ echo '#line 7174 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7388,14 +7212,13 @@
+@@ -7390,14 +7214,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -4361,7 +4439,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7407,7 +7230,6 @@
+@@ -7409,7 +7232,6 @@
esac
;;
*64-bit*)
@@ -4369,7 +4447,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7894,6 +7716,243 @@
+@@ -7896,6 +7718,243 @@
done
@@ -4613,16 +4691,16 @@
ac_ext=f
ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -7986,7 +8045,7 @@
+@@ -7988,7 +8047,7 @@
# Provide some information about the compiler.
--echo "$as_me:7989:" \
-+echo "$as_me:8048:" \
+-echo "$as_me:7991:" \
++echo "$as_me:8050:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-@@ -8139,7 +8198,7 @@
+@@ -8141,7 +8200,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
i=0
@@ -4631,7 +4709,7 @@
case $build_os in
msdosdjgpp*)
-@@ -8168,20 +8227,53 @@
+@@ -8170,20 +8229,53 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -4691,7 +4769,7 @@
# Add a significant safety factor because C++ compilers can tack on massive
# amounts of additional arguments before passing them to the linker.
# It appears as though 1/2 is a usable value.
-@@ -8218,9 +8310,6 @@
+@@ -8220,9 +8312,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
@@ -4701,7 +4779,7 @@
# Transform an extracted symbol line into a proper C declaration
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-@@ -8242,6 +8331,13 @@
+@@ -8244,6 +8333,13 @@
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_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
@@ -4715,7 +4793,7 @@
irix* | nonstopux*)
symcode='[BCDEGRST]'
;;
-@@ -8249,7 +8345,7 @@
+@@ -8251,7 +8347,7 @@
symcode='[BCDEGQRST]'
;;
solaris* | sysv5*)
@@ -4724,7 +4802,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8267,14 +8363,17 @@
+@@ -8269,14 +8365,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -4744,7 +4822,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -8436,7 +8535,7 @@
+@@ -8438,7 +8537,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -4753,7 +4831,7 @@
sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
-@@ -8456,7 +8555,7 @@
+@@ -8458,7 +8557,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -4762,7 +4840,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8741,6 +8840,17 @@
+@@ -8743,6 +8842,17 @@
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
@@ -4780,7 +4858,7 @@
# Only perform the check for file, if the check method requires it
case $deplibs_check_method in
file_magic*)
-@@ -8766,7 +8876,7 @@
+@@ -8768,7 +8878,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -4789,7 +4867,7 @@
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
-@@ -8828,7 +8938,7 @@
+@@ -8830,7 +8940,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -4798,7 +4876,7 @@
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
-@@ -8927,6 +9037,20 @@
+@@ -8929,6 +9039,20 @@
compiler=$CC
@@ -4819,7 +4897,7 @@
#
# Check for any special shared library compilation flags.
#
-@@ -8963,11 +9087,16 @@
+@@ -8965,11 +9089,16 @@
LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
printf "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -4837,7 +4915,7 @@
else
lt_prog_compiler_static_works=yes
fi
-@@ -9013,18 +9142,20 @@
+@@ -9015,18 +9144,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -4845,13 +4923,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9019: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9148: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9021: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9150: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9023: \$? = $ac_status" >&5
-+ echo "$as_me:9152: \$? = $ac_status" >&5
+- echo "$as_me:9025: \$? = $ac_status" >&5
++ echo "$as_me:9154: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
@@ -4863,7 +4941,7 @@
lt_cv_prog_compiler_rtti_exceptions=yes
fi
fi
-@@ -9101,7 +9232,7 @@
+@@ -9103,7 +9234,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -4872,7 +4950,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9127,6 +9258,16 @@
+@@ -9129,6 +9260,16 @@
lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -4889,7 +4967,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -9138,7 +9279,7 @@
+@@ -9140,7 +9281,7 @@
lt_prog_compiler_wl='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -4898,7 +4976,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9162,12 +9303,19 @@
+@@ -9164,12 +9305,19 @@
;;
linux*)
@@ -4919,7 +4997,7 @@
ccc*)
lt_prog_compiler_wl='-Wl,'
# All Alpha code is PIC.
-@@ -9188,9 +9336,14 @@
+@@ -9190,9 +9338,14 @@
;;
solaris*)
@@ -4935,7 +5013,7 @@
;;
sunos4*)
-@@ -9212,6 +9365,11 @@
+@@ -9214,6 +9367,11 @@
fi
;;
@@ -4947,7 +5025,7 @@
uts4*)
lt_prog_compiler_pic='-pic'
lt_prog_compiler_static='-Bstatic'
-@@ -9246,18 +9404,20 @@
+@@ -9248,18 +9406,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -4955,13 +5033,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9252: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9410: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9254: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9412: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9256: \$? = $ac_status" >&5
-+ echo "$as_me:9414: \$? = $ac_status" >&5
+- echo "$as_me:9258: \$? = $ac_status" >&5
++ echo "$as_me:9416: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
@@ -4973,7 +5051,7 @@
lt_prog_compiler_pic_works=yes
fi
fi
-@@ -9278,7 +9438,7 @@
+@@ -9280,7 +9440,7 @@
fi
fi
@@ -4982,7 +5060,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
-@@ -9300,38 +9460,36 @@
+@@ -9302,38 +9462,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -5003,13 +5081,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9319: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9472: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9321: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9474: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9323: \$? = $ac_status" >&5
-+ echo "$as_me:9476: \$? = $ac_status" >&5
+- echo "$as_me:9325: \$? = $ac_status" >&5
++ echo "$as_me:9478: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -5033,7 +5111,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -9402,6 +9560,16 @@
+@@ -9404,6 +9562,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -5050,7 +5128,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -9422,6 +9590,27 @@
+@@ -9424,6 +9592,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -5078,7 +5156,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -9459,7 +9648,7 @@
+@@ -9461,7 +9650,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -5087,7 +5165,7 @@
else
ld_shlibs=no
fi
-@@ -9469,13 +9658,13 @@
+@@ -9471,13 +9660,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
@@ -5104,7 +5182,7 @@
# 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
-@@ -9484,19 +9673,51 @@
+@@ -9486,19 +9675,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -5160,7 +5238,7 @@
fi
;;
-@@ -9514,8 +9735,8 @@
+@@ -9516,8 +9737,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -5171,7 +5249,7 @@
else
ld_shlibs=no
fi
-@@ -9530,24 +9751,19 @@
+@@ -9532,24 +9753,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -5203,7 +5281,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9581,9 +9797,20 @@
+@@ -9583,9 +9799,20 @@
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'
fi
@@ -5226,7 +5304,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9600,7 +9827,7 @@
+@@ -9602,7 +9829,7 @@
link_all_deplibs=yes
if test "$GCC" = yes; then
@@ -5235,7 +5313,7 @@
# 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`
-@@ -9621,6 +9848,9 @@
+@@ -9623,6 +9850,9 @@
fi
esac
shared_flag='-shared'
@@ -5245,7 +5323,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -9629,21 +9859,22 @@
+@@ -9631,21 +9861,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -5273,7 +5351,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -9694,14 +9925,13 @@
+@@ -9696,14 +9927,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -5291,7 +5369,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -9765,8 +9995,8 @@
+@@ -9767,8 +9997,8 @@
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec=' '
archive_cmds_need_lc=yes
@@ -5302,7 +5380,7 @@
fi
fi
;;
-@@ -9779,7 +10009,7 @@
+@@ -9781,7 +10011,7 @@
ld_shlibs=no
;;
@@ -5311,7 +5389,7 @@
export_dynamic_flag_spec=-rdynamic
;;
-@@ -9789,13 +10019,13 @@
+@@ -9791,13 +10021,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -5328,7 +5406,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds='true'
# FIXME: Should let the user specify the lib program.
-@@ -9805,52 +10035,52 @@
+@@ -9807,52 +10037,52 @@
;;
darwin* | rhapsody*)
@@ -5421,7 +5499,7 @@
fi
;;
-@@ -9884,8 +10114,8 @@
+@@ -9886,8 +10116,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -5432,7 +5510,7 @@
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -9893,7 +10123,7 @@
+@@ -9895,7 +10125,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -5441,7 +5519,7 @@
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'
fi
-@@ -9909,16 +10139,16 @@
+@@ -9911,16 +10141,16 @@
hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -5462,7 +5540,7 @@
hppa*64*|ia64*)
archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
;;
-@@ -9928,7 +10158,7 @@
+@@ -9930,7 +10160,7 @@
esac
fi
if test "$with_gnu_ld" = no; then
@@ -5471,7 +5549,7 @@
hppa*64*)
hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld='+b $libdir'
-@@ -9961,7 +10191,7 @@
+@@ -9963,7 +10193,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -5480,7 +5558,7 @@
else
archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld='-rpath $libdir'
-@@ -9971,7 +10201,7 @@
+@@ -9973,7 +10203,7 @@
link_all_deplibs=yes
;;
@@ -5489,7 +5567,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -9994,7 +10224,8 @@
+@@ -9996,7 +10226,8 @@
hardcode_direct=yes
hardcode_shlibpath_var=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -5499,7 +5577,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10004,7 +10235,7 @@
+@@ -10006,7 +10237,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -5508,7 +5586,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10015,14 +10246,14 @@
+@@ -10017,14 +10248,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -5525,7 +5603,7 @@
else
allow_undefined_flag=' -expect_unresolved \*'
archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -10034,13 +10265,13 @@
+@@ -10036,13 +10267,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -5541,7 +5619,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10059,10 +10290,12 @@
+@@ -10061,10 +10292,12 @@
solaris*)
no_undefined_flag=' -z text'
if test "$GCC" = yes; then
@@ -5556,7 +5634,7 @@
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'
-@@ -10071,8 +10304,18 @@
+@@ -10073,8 +10306,18 @@
hardcode_shlibpath_var=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -5577,7 +5655,7 @@
esac
link_all_deplibs=yes
;;
-@@ -10081,7 +10324,7 @@
+@@ -10083,7 +10326,7 @@
if test "x$host_vendor" = xsequent; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
@@ -5586,7 +5664,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10141,9 +10384,9 @@
+@@ -10143,9 +10386,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -5598,7 +5676,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var=no
-@@ -10249,7 +10492,7 @@
+@@ -10251,7 +10494,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -5607,7 +5685,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10259,7 +10502,20 @@
+@@ -10261,7 +10504,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -5629,7 +5707,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10324,7 +10580,7 @@
+@@ -10326,7 +10582,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -5638,7 +5716,7 @@
;;
beos*)
-@@ -10333,7 +10589,7 @@
+@@ -10335,7 +10591,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -5647,7 +5725,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10349,7 +10605,7 @@
+@@ -10351,7 +10607,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -5656,7 +5734,7 @@
need_version=no
need_lib_prefix=no
-@@ -10361,7 +10617,8 @@
+@@ -10363,7 +10619,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -5666,7 +5744,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -10391,7 +10648,7 @@
+@@ -10393,7 +10650,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -5675,7 +5753,7 @@
;;
esac
;;
-@@ -10414,7 +10671,7 @@
+@@ -10416,7 +10673,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -5684,7 +5762,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -10437,7 +10694,7 @@
+@@ -10439,7 +10696,7 @@
dynamic_linker=no
;;
@@ -5693,7 +5771,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10449,8 +10706,17 @@
+@@ -10451,8 +10708,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -5713,7 +5791,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -10468,7 +10734,7 @@
+@@ -10470,7 +10736,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -5722,7 +5800,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -10495,9 +10761,9 @@
+@@ -10497,9 +10763,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -5734,7 +5812,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10512,7 +10778,7 @@
+@@ -10514,7 +10780,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -5743,7 +5821,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10523,7 +10789,7 @@
+@@ -10525,7 +10791,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -5752,7 +5830,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10585,22 +10851,19 @@
+@@ -10587,22 +10853,19 @@
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'
@@ -5781,7 +5859,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -10610,6 +10873,30 @@
+@@ -10612,6 +10875,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -5812,7 +5890,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10619,7 +10906,7 @@
+@@ -10621,7 +10908,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -5821,7 +5899,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -10648,7 +10935,11 @@
+@@ -10650,7 +10937,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -5834,7 +5912,7 @@
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
-@@ -10668,7 +10959,7 @@
+@@ -10670,7 +10961,7 @@
os2*)
libname_spec='$name'
@@ -5843,7 +5921,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -10770,8 +11061,8 @@
+@@ -10772,8 +11063,8 @@
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" || \
@@ -5854,16 +5932,16 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct" != no &&
-@@ -11430,7 +11721,7 @@
+@@ -11432,7 +11723,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11433 "configure"
-+#line 11724 "configure"
+-#line 11435 "configure"
++#line 11726 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11496,7 +11787,7 @@
+@@ -11498,7 +11789,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -5872,16 +5950,16 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -11528,7 +11819,7 @@
+@@ -11530,7 +11821,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11531 "configure"
-+#line 11822 "configure"
+-#line 11533 "configure"
++#line 11824 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11594,7 +11885,7 @@
+@@ -11596,7 +11887,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -5890,7 +5968,7 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -11644,7 +11935,7 @@
+@@ -11646,7 +11937,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -5899,7 +5977,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -11653,47 +11944,10 @@
+@@ -11655,47 +11946,10 @@
fi
;;
@@ -5948,7 +6026,7 @@
;;
esac
echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -11719,7 +11973,8 @@
+@@ -11721,7 +11975,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -5958,7 +6036,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -11833,11 +12088,11 @@
+@@ -11835,11 +12090,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -5972,7 +6050,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -11867,6 +12122,12 @@
+@@ -11869,6 +12124,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -5985,7 +6063,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -11897,7 +12158,7 @@
+@@ -11899,7 +12160,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -5994,7 +6072,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -11928,7 +12189,7 @@
+@@ -11930,7 +12191,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -6003,7 +6081,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -11943,7 +12204,7 @@
+@@ -11945,7 +12206,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o
@@ -6012,7 +6090,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -12170,7 +12431,10 @@
+@@ -12172,7 +12433,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -6024,7 +6102,7 @@
fi
-@@ -12235,7 +12499,9 @@
+@@ -12237,7 +12501,9 @@
case $tagname in
CXX)
@@ -6035,7 +6113,7 @@
ac_ext=cc
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -12272,7 +12538,7 @@
+@@ -12274,7 +12540,7 @@
compiler_lib_search_path_CXX=
# Source file extension for C++ test sources.
@@ -6044,7 +6122,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -12293,6 +12559,20 @@
+@@ -12295,6 +12561,20 @@
compiler=$CC
@@ -6065,7 +6143,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -12314,7 +12594,16 @@
+@@ -12316,7 +12596,16 @@
CC=${CXX-"c++"}
compiler=$CC
compiler_CXX=$CC
@@ -6083,7 +6161,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -12385,7 +12674,7 @@
+@@ -12387,7 +12676,7 @@
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
lt_cv_path_LD="$ac_dir/$ac_prog"
# Check to see if the program is GNU ld. I'd rather use --version,
@@ -6092,7 +6170,7 @@
# 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'*)
-@@ -12419,7 +12708,7 @@
+@@ -12421,7 +12710,7 @@
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -6101,7 +6179,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -12438,8 +12727,8 @@
+@@ -12440,8 +12729,8 @@
# 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
@@ -6112,7 +6190,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12465,7 +12754,7 @@
+@@ -12467,7 +12756,7 @@
# linker, instead of GNU ld. If possible, this setting should
# overridden to take advantage of the native linker features on
# the platform it is being used on.
@@ -6121,7 +6199,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12496,8 +12785,22 @@
+@@ -12498,8 +12787,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -6146,7 +6224,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12514,7 +12817,7 @@
+@@ -12516,7 +12819,7 @@
link_all_deplibs_CXX=yes
if test "$GXX" = yes; then
@@ -6155,7 +6233,7 @@
# 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`
-@@ -12535,6 +12838,9 @@
+@@ -12537,6 +12840,9 @@
fi
esac
shared_flag='-shared'
@@ -6165,7 +6243,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -12543,15 +12849,16 @@
+@@ -12545,15 +12851,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -6186,7 +6264,7 @@
if test "$aix_use_runtimelinking" = yes; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
-@@ -12610,13 +12917,12 @@
+@@ -12612,13 +12919,12 @@
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -6202,7 +6280,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -12680,8 +12986,8 @@
+@@ -12682,8 +12988,8 @@
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec_CXX=' '
archive_cmds_need_lc_CXX=yes
@@ -6213,7 +6291,7 @@
fi
fi
;;
-@@ -12694,16 +13000,17 @@
+@@ -12696,16 +13002,17 @@
esac
;;
@@ -6233,7 +6311,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -12712,70 +13019,81 @@
+@@ -12714,70 +13021,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -6367,7 +6445,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -12786,14 +13104,14 @@
+@@ -12788,14 +13106,14 @@
;;
esac
;;
@@ -6384,7 +6462,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -12810,12 +13128,12 @@
+@@ -12812,12 +13130,12 @@
# location of the library.
case $cc_basename in
@@ -6400,7 +6478,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -12824,11 +13142,11 @@
+@@ -12826,11 +13144,11 @@
# 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.
@@ -6414,7 +6492,7 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -12838,7 +13156,7 @@
+@@ -12840,7 +13158,7 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -6423,7 +6501,7 @@
hppa*64*)
hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-@@ -12854,7 +13172,7 @@
+@@ -12856,7 +13174,7 @@
;;
esac
fi
@@ -6432,7 +6510,7 @@
hppa*64*)
hardcode_direct_CXX=no
hardcode_shlibpath_var_CXX=no
-@@ -12875,17 +13193,17 @@
+@@ -12877,17 +13195,17 @@
esac
case $cc_basename in
@@ -6454,7 +6532,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -12901,12 +13219,12 @@
+@@ -12903,12 +13221,12 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -6469,7 +6547,7 @@
;;
esac
fi
-@@ -12919,9 +13237,9 @@
+@@ -12921,9 +13239,9 @@
;;
irix5* | irix6*)
case $cc_basename in
@@ -6481,7 +6559,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -12932,9 +13250,9 @@
+@@ -12934,9 +13252,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -6493,7 +6571,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -12945,14 +13263,14 @@
+@@ -12947,14 +13265,14 @@
;;
linux*)
case $cc_basename in
@@ -6511,7 +6589,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -12970,20 +13288,44 @@
+@@ -12972,20 +13290,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -6562,7 +6640,7 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13011,7 +13353,7 @@
+@@ -13013,7 +13355,7 @@
;;
mvs*)
case $cc_basename in
@@ -6571,7 +6649,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13021,7 +13363,7 @@
+@@ -13023,7 +13365,7 @@
;;
esac
;;
@@ -6580,7 +6658,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -13032,15 +13374,31 @@
+@@ -13034,15 +13376,31 @@
# Workaround some broken pre-1.5 toolchains
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
;;
@@ -6614,7 +6692,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13050,14 +13408,14 @@
+@@ -13052,14 +13410,14 @@
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -6632,7 +6710,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13075,7 +13433,7 @@
+@@ -13077,7 +13435,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -6641,7 +6719,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13094,13 +13452,13 @@
+@@ -13096,13 +13454,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -6657,7 +6735,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13109,17 +13467,17 @@
+@@ -13111,17 +13469,17 @@
# the KAI C++ compiler.
old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
;;
@@ -6679,7 +6757,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13138,7 +13496,7 @@
+@@ -13140,7 +13498,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -6688,7 +6766,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13162,7 +13520,7 @@
+@@ -13164,7 +13522,7 @@
sco*)
archive_cmds_need_lc_CXX=no
case $cc_basename in
@@ -6697,7 +6775,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13174,12 +13532,12 @@
+@@ -13176,12 +13534,12 @@
;;
sunos4*)
case $cc_basename in
@@ -6712,7 +6790,7 @@
# Lucid
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13192,36 +13550,33 @@
+@@ -13194,36 +13552,33 @@
;;
solaris*)
case $cc_basename in
@@ -6761,7 +6839,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -13229,9 +13584,9 @@
+@@ -13231,9 +13586,9 @@
# in the archive.
old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
;;
@@ -6773,7 +6851,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13241,9 +13596,9 @@
+@@ -13243,9 +13598,9 @@
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -6785,7 +6863,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13252,9 +13607,9 @@
+@@ -13254,9 +13609,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -6797,7 +6875,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13272,7 +13627,7 @@
+@@ -13274,7 +13629,7 @@
;;
tandem*)
case $cc_basename in
@@ -6806,7 +6884,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13329,7 +13684,7 @@
+@@ -13331,7 +13686,7 @@
# The `*' in the case matches for architectures that use `case' in
# $output_verbose_cmd can trigger glob expansion during the loop
# eval without this substitution.
@@ -6815,7 +6893,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -13369,7 +13724,7 @@
+@@ -13371,7 +13726,7 @@
fi
;;
@@ -6824,7 +6902,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13405,6 +13760,20 @@
+@@ -13407,6 +13762,20 @@
$rm -f confest.$objext
@@ -6845,7 +6923,7 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -13460,7 +13829,7 @@
+@@ -13462,7 +13831,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -6854,7 +6932,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -13485,18 +13854,28 @@
+@@ -13487,18 +13856,28 @@
;;
chorus*)
case $cc_basename in
@@ -6886,7 +6964,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13504,22 +13883,22 @@
+@@ -13506,22 +13885,22 @@
;;
esac
;;
@@ -6913,7 +6991,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -13534,7 +13913,7 @@
+@@ -13536,7 +13915,7 @@
;;
irix5* | irix6* | nonstopux*)
case $cc_basename in
@@ -6922,7 +7000,7 @@
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -13545,18 +13924,24 @@
+@@ -13547,18 +13926,24 @@
;;
linux*)
case $cc_basename in
@@ -6950,7 +7028,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13573,25 +13958,25 @@
+@@ -13575,25 +13960,25 @@
;;
mvs*)
case $cc_basename in
@@ -6981,7 +7059,7 @@
# Digital/Compaq C++
lt_prog_compiler_wl_CXX='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -13607,7 +13992,7 @@
+@@ -13609,7 +13994,7 @@
;;
sco*)
case $cc_basename in
@@ -6990,7 +7068,7 @@
lt_prog_compiler_pic_CXX='-fPIC'
;;
*)
-@@ -13616,13 +14001,13 @@
+@@ -13618,13 +14003,13 @@
;;
solaris*)
case $cc_basename in
@@ -7006,7 +7084,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-PIC'
;;
-@@ -13632,12 +14017,12 @@
+@@ -13634,12 +14019,12 @@
;;
sunos4*)
case $cc_basename in
@@ -7021,7 +7099,7 @@
# Lucid
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13647,7 +14032,7 @@
+@@ -13649,7 +14034,7 @@
;;
tandem*)
case $cc_basename in
@@ -7030,7 +7108,7 @@
# NonStop-UX NCC 3.20
lt_prog_compiler_pic_CXX='-KPIC'
;;
-@@ -13688,18 +14073,20 @@
+@@ -13690,18 +14075,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -7038,13 +7116,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13694: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14079: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13696: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14081: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:13698: \$? = $ac_status" >&5
-+ echo "$as_me:14083: \$? = $ac_status" >&5
+- echo "$as_me:13700: \$? = $ac_status" >&5
++ echo "$as_me:14085: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
@@ -7056,7 +7134,7 @@
lt_prog_compiler_pic_works_CXX=yes
fi
fi
-@@ -13720,7 +14107,7 @@
+@@ -13722,7 +14109,7 @@
fi
fi
@@ -7065,7 +7143,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_CXX=
-@@ -13742,38 +14129,36 @@
+@@ -13744,38 +14131,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -7086,13 +7164,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13761: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14141: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13763: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14143: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:13765: \$? = $ac_status" >&5
-+ echo "$as_me:14145: \$? = $ac_status" >&5
+- echo "$as_me:13767: \$? = $ac_status" >&5
++ echo "$as_me:14147: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -7116,7 +7194,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -13823,7 +14208,10 @@
+@@ -13825,7 +14210,10 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -7128,7 +7206,7 @@
;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -13906,7 +14294,7 @@
+@@ -13908,7 +14296,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -7137,7 +7215,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -13916,7 +14304,20 @@
+@@ -13918,7 +14306,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -7159,7 +7237,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -13981,7 +14382,7 @@
+@@ -13983,7 +14384,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -7168,7 +7246,7 @@
;;
beos*)
-@@ -13990,7 +14391,7 @@
+@@ -13992,7 +14393,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -7177,7 +7255,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14006,7 +14407,7 @@
+@@ -14008,7 +14409,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -7186,7 +7264,7 @@
need_version=no
need_lib_prefix=no
-@@ -14018,7 +14419,8 @@
+@@ -14020,7 +14421,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -7196,7 +7274,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -14048,7 +14450,7 @@
+@@ -14050,7 +14452,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -7205,7 +7283,7 @@
;;
esac
;;
-@@ -14071,7 +14473,7 @@
+@@ -14073,7 +14475,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -7214,7 +7292,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -14094,7 +14496,7 @@
+@@ -14096,7 +14498,7 @@
dynamic_linker=no
;;
@@ -7223,7 +7301,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14106,8 +14508,17 @@
+@@ -14108,8 +14510,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -7243,7 +7321,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -14125,7 +14536,7 @@
+@@ -14127,7 +14538,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -7252,7 +7330,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -14152,9 +14563,9 @@
+@@ -14154,9 +14565,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -7264,7 +7342,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14169,7 +14580,7 @@
+@@ -14171,7 +14582,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -7273,7 +7351,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14180,7 +14591,7 @@
+@@ -14182,7 +14593,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -7282,7 +7360,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14242,22 +14653,19 @@
+@@ -14244,22 +14655,19 @@
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'
@@ -7311,7 +7389,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -14267,6 +14675,30 @@
+@@ -14269,6 +14677,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -7342,7 +7420,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14276,7 +14708,7 @@
+@@ -14278,7 +14710,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -7351,7 +7429,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14305,7 +14737,11 @@
+@@ -14307,7 +14739,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -7364,7 +7442,7 @@
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
-@@ -14325,7 +14761,7 @@
+@@ -14327,7 +14763,7 @@
os2*)
libname_spec='$name'
@@ -7373,7 +7451,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14427,8 +14863,8 @@
+@@ -14429,8 +14865,8 @@
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
hardcode_action_CXX=
if test -n "$hardcode_libdir_flag_spec_CXX" || \
@@ -7384,16 +7462,16 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_CXX" != no &&
-@@ -15087,7 +15523,7 @@
+@@ -15089,7 +15525,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 15090 "configure"
-+#line 15526 "configure"
+-#line 15092 "configure"
++#line 15528 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15153,7 +15589,7 @@
+@@ -15155,7 +15591,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -7402,16 +7480,16 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -15185,7 +15621,7 @@
+@@ -15187,7 +15623,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 15188 "configure"
-+#line 15624 "configure"
+-#line 15190 "configure"
++#line 15626 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15251,7 +15687,7 @@
+@@ -15253,7 +15689,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -7420,7 +7498,7 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -15302,7 +15738,8 @@
+@@ -15304,7 +15740,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -7430,7 +7508,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -15402,6 +15839,12 @@
+@@ -15404,6 +15841,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -7443,7 +7521,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -15432,7 +15875,7 @@
+@@ -15434,7 +15877,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -7452,7 +7530,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -15463,7 +15906,7 @@
+@@ -15465,7 +15908,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -7461,7 +7539,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -15478,7 +15921,7 @@
+@@ -15480,7 +15923,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
@@ -7470,7 +7548,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -15680,7 +16123,10 @@
+@@ -15682,7 +16125,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -7482,7 +7560,7 @@
fi
-@@ -15756,12 +16202,35 @@
+@@ -15758,12 +16204,35 @@
compiler=$CC
@@ -7519,7 +7597,7 @@
echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-@@ -15774,7 +16243,7 @@
+@@ -15776,7 +16245,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -7528,7 +7606,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -15782,8 +16251,10 @@
+@@ -15784,8 +16253,10 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -7541,7 +7619,7 @@
;;
esac
echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -15860,7 +16331,7 @@
+@@ -15862,7 +16333,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -7550,7 +7628,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -15886,6 +16357,16 @@
+@@ -15888,6 +16359,16 @@
lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -7567,7 +7645,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -15897,7 +16378,7 @@
+@@ -15899,7 +16380,7 @@
lt_prog_compiler_wl_F77='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -7576,7 +7654,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -15921,12 +16402,19 @@
+@@ -15923,12 +16404,19 @@
;;
linux*)
@@ -7597,7 +7675,7 @@
ccc*)
lt_prog_compiler_wl_F77='-Wl,'
# All Alpha code is PIC.
-@@ -15947,9 +16435,14 @@
+@@ -15949,9 +16437,14 @@
;;
solaris*)
@@ -7613,7 +7691,7 @@
;;
sunos4*)
-@@ -15971,6 +16464,11 @@
+@@ -15973,6 +16466,11 @@
fi
;;
@@ -7625,7 +7703,7 @@
uts4*)
lt_prog_compiler_pic_F77='-pic'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16005,18 +16503,20 @@
+@@ -16007,18 +16505,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -7633,13 +7711,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16011: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16509: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16013: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16511: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:16015: \$? = $ac_status" >&5
-+ echo "$as_me:16513: \$? = $ac_status" >&5
+- echo "$as_me:16017: \$? = $ac_status" >&5
++ echo "$as_me:16515: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
@@ -7651,7 +7729,7 @@
lt_prog_compiler_pic_works_F77=yes
fi
fi
-@@ -16037,7 +16537,7 @@
+@@ -16039,7 +16539,7 @@
fi
fi
@@ -7660,7 +7738,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_F77=
-@@ -16059,38 +16559,36 @@
+@@ -16061,38 +16561,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -7681,13 +7759,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16078: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16571: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16080: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16573: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:16082: \$? = $ac_status" >&5
-+ echo "$as_me:16575: \$? = $ac_status" >&5
+- echo "$as_me:16084: \$? = $ac_status" >&5
++ echo "$as_me:16577: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -7711,7 +7789,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -16161,6 +16659,16 @@
+@@ -16163,6 +16661,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -7728,7 +7806,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -16181,6 +16689,27 @@
+@@ -16183,6 +16691,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -7756,7 +7834,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -16218,7 +16747,7 @@
+@@ -16220,7 +16749,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -7765,7 +7843,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16228,13 +16757,13 @@
+@@ -16230,13 +16759,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_F77='-L$libdir'
@@ -7782,7 +7860,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -16243,19 +16772,51 @@
+@@ -16245,19 +16774,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -7839,7 +7917,7 @@
fi
;;
-@@ -16273,8 +16834,8 @@
+@@ -16275,8 +16836,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -7850,7 +7928,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16289,24 +16850,19 @@
+@@ -16291,24 +16852,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -7882,7 +7960,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16340,9 +16896,20 @@
+@@ -16342,9 +16898,20 @@
else
export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -7905,7 +7983,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16359,7 +16926,7 @@
+@@ -16361,7 +16928,7 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes; then
@@ -7914,7 +7992,7 @@
# 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`
-@@ -16380,6 +16947,9 @@
+@@ -16382,6 +16949,9 @@
fi
esac
shared_flag='-shared'
@@ -7924,7 +8002,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -16388,21 +16958,22 @@
+@@ -16390,21 +16960,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -7952,7 +8030,7 @@
program main
end
-@@ -16443,14 +17014,13 @@
+@@ -16445,14 +17016,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -7970,7 +8048,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16504,8 +17074,8 @@
+@@ -16506,8 +17076,8 @@
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec_F77=' '
archive_cmds_need_lc_F77=yes
@@ -7981,7 +8059,7 @@
fi
fi
;;
-@@ -16518,7 +17088,7 @@
+@@ -16520,7 +17090,7 @@
ld_shlibs_F77=no
;;
@@ -7990,7 +8068,7 @@
export_dynamic_flag_spec_F77=-rdynamic
;;
-@@ -16528,68 +17098,68 @@
+@@ -16530,68 +17100,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -8103,7 +8181,7 @@
fi
;;
-@@ -16623,8 +17193,8 @@
+@@ -16625,8 +17195,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -8114,7 +8192,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -16632,7 +17202,7 @@
+@@ -16634,7 +17204,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -8123,7 +8201,7 @@
else
archive_cmds_F77='$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'
fi
-@@ -16648,16 +17218,16 @@
+@@ -16650,16 +17220,16 @@
hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -8144,7 +8222,7 @@
hppa*64*|ia64*)
archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
;;
-@@ -16667,7 +17237,7 @@
+@@ -16669,7 +17239,7 @@
esac
fi
if test "$with_gnu_ld" = no; then
@@ -8153,7 +8231,7 @@
hppa*64*)
hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld_F77='+b $libdir'
-@@ -16700,7 +17270,7 @@
+@@ -16702,7 +17272,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -8162,7 +8240,7 @@
else
archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
-@@ -16710,7 +17280,7 @@
+@@ -16712,7 +17282,7 @@
link_all_deplibs_F77=yes
;;
@@ -8171,7 +8249,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -16733,7 +17303,8 @@
+@@ -16735,7 +17305,8 @@
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -8181,7 +8259,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -16743,7 +17314,7 @@
+@@ -16745,7 +17316,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -8190,7 +8268,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -16754,14 +17325,14 @@
+@@ -16756,14 +17327,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -8207,7 +8285,7 @@
else
allow_undefined_flag_F77=' -expect_unresolved \*'
archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -16773,13 +17344,13 @@
+@@ -16775,13 +17346,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -8223,7 +8301,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -16798,10 +17369,12 @@
+@@ -16800,10 +17371,12 @@
solaris*)
no_undefined_flag_F77=' -z text'
if test "$GCC" = yes; then
@@ -8238,7 +8316,7 @@
archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds_F77='$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'
-@@ -16810,8 +17383,18 @@
+@@ -16812,8 +17385,18 @@
hardcode_shlibpath_var_F77=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -8259,7 +8337,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -16820,7 +17403,7 @@
+@@ -16822,7 +17405,7 @@
if test "x$host_vendor" = xsequent; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
@@ -8268,7 +8346,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -16880,9 +17463,9 @@
+@@ -16882,9 +17465,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_F77='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -8280,7 +8358,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_F77=no
-@@ -16988,7 +17571,7 @@
+@@ -16990,7 +17573,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -8289,7 +8367,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -16998,7 +17581,20 @@
+@@ -17000,7 +17583,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -8311,7 +8389,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17063,7 +17659,7 @@
+@@ -17065,7 +17661,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -8320,7 +8398,7 @@
;;
beos*)
-@@ -17072,7 +17668,7 @@
+@@ -17074,7 +17670,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -8329,7 +8407,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17088,7 +17684,7 @@
+@@ -17090,7 +17686,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -8338,7 +8416,7 @@
need_version=no
need_lib_prefix=no
-@@ -17100,7 +17696,8 @@
+@@ -17102,7 +17698,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -8348,7 +8426,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -17130,7 +17727,7 @@
+@@ -17132,7 +17729,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -8357,7 +8435,7 @@
;;
esac
;;
-@@ -17153,7 +17750,7 @@
+@@ -17155,7 +17752,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -8366,7 +8444,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -17176,7 +17773,7 @@
+@@ -17178,7 +17775,7 @@
dynamic_linker=no
;;
@@ -8375,7 +8453,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17188,8 +17785,17 @@
+@@ -17190,8 +17787,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -8395,7 +8473,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -17207,7 +17813,7 @@
+@@ -17209,7 +17815,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -8404,7 +8482,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -17234,9 +17840,9 @@
+@@ -17236,9 +17842,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -8416,7 +8494,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17251,7 +17857,7 @@
+@@ -17253,7 +17859,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -8425,7 +8503,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17262,7 +17868,7 @@
+@@ -17264,7 +17870,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -8434,7 +8512,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17324,22 +17930,19 @@
+@@ -17326,22 +17932,19 @@
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'
@@ -8463,7 +8541,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -17349,6 +17952,30 @@
+@@ -17351,6 +17954,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -8494,7 +8572,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17358,7 +17985,7 @@
+@@ -17360,7 +17987,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -8503,7 +8581,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17387,7 +18014,11 @@
+@@ -17389,7 +18016,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -8516,7 +8594,7 @@
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
-@@ -17407,7 +18038,7 @@
+@@ -17409,7 +18040,7 @@
os2*)
libname_spec='$name'
@@ -8525,7 +8603,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17509,8 +18140,8 @@
+@@ -17511,8 +18142,8 @@
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
hardcode_action_F77=
if test -n "$hardcode_libdir_flag_spec_F77" || \
@@ -8536,7 +8614,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_F77" != no &&
-@@ -17586,7 +18217,8 @@
+@@ -17588,7 +18219,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -8546,7 +8624,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -17686,6 +18318,12 @@
+@@ -17688,6 +18320,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -8559,7 +8637,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -17716,7 +18354,7 @@
+@@ -17718,7 +18356,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -8568,7 +8646,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -17747,7 +18385,7 @@
+@@ -17749,7 +18387,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -8577,7 +8655,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -17762,7 +18400,7 @@
+@@ -17764,7 +18402,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
@@ -8586,7 +8664,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -17964,7 +18602,10 @@
+@@ -17966,7 +18604,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -8598,7 +8676,7 @@
fi
-@@ -17997,7 +18638,7 @@
+@@ -17999,7 +18640,7 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -8607,7 +8685,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -18008,15 +18649,41 @@
+@@ -18010,15 +18651,41 @@
compiler=$CC
@@ -8649,7 +8727,7 @@
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
## the running order or otherwise move them around unless you know exactly
-@@ -18043,18 +18710,20 @@
+@@ -18045,18 +18712,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -8657,13 +8735,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18049: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18716: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18051: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18718: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18053: \$? = $ac_status" >&5
-+ echo "$as_me:18720: \$? = $ac_status" >&5
+- echo "$as_me:18055: \$? = $ac_status" >&5
++ echo "$as_me:18722: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
@@ -8675,7 +8753,7 @@
lt_cv_prog_compiler_rtti_exceptions=yes
fi
fi
-@@ -18131,7 +18800,7 @@
+@@ -18133,7 +18802,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -8684,7 +8762,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18157,6 +18826,16 @@
+@@ -18159,6 +18828,16 @@
lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -8701,7 +8779,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -18168,7 +18847,7 @@
+@@ -18170,7 +18849,7 @@
lt_prog_compiler_wl_GCJ='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -8710,7 +8788,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18192,12 +18871,19 @@
+@@ -18194,12 +18873,19 @@
;;
linux*)
@@ -8731,7 +8809,7 @@
ccc*)
lt_prog_compiler_wl_GCJ='-Wl,'
# All Alpha code is PIC.
-@@ -18218,9 +18904,14 @@
+@@ -18220,9 +18906,14 @@
;;
solaris*)
@@ -8747,7 +8825,7 @@
;;
sunos4*)
-@@ -18242,6 +18933,11 @@
+@@ -18244,6 +18935,11 @@
fi
;;
@@ -8759,7 +8837,7 @@
uts4*)
lt_prog_compiler_pic_GCJ='-pic'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18276,18 +18972,20 @@
+@@ -18278,18 +18974,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -8767,13 +8845,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18282: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18978: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18284: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18980: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18286: \$? = $ac_status" >&5
-+ echo "$as_me:18982: \$? = $ac_status" >&5
+- echo "$as_me:18288: \$? = $ac_status" >&5
++ echo "$as_me:18984: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
@@ -8785,7 +8863,7 @@
lt_prog_compiler_pic_works_GCJ=yes
fi
fi
-@@ -18308,7 +19006,7 @@
+@@ -18310,7 +19008,7 @@
fi
fi
@@ -8794,7 +8872,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_GCJ=
-@@ -18330,38 +19028,36 @@
+@@ -18332,38 +19030,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -8815,13 +8893,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18349: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19040: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18351: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19042: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:18353: \$? = $ac_status" >&5
-+ echo "$as_me:19044: \$? = $ac_status" >&5
+- echo "$as_me:18355: \$? = $ac_status" >&5
++ echo "$as_me:19046: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8845,7 +8923,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -18432,6 +19128,16 @@
+@@ -18434,6 +19130,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -8862,7 +8940,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -18452,6 +19158,27 @@
+@@ -18454,6 +19160,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -8890,7 +8968,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -18489,7 +19216,7 @@
+@@ -18491,7 +19218,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -8899,7 +8977,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18499,13 +19226,13 @@
+@@ -18501,13 +19228,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_GCJ='-L$libdir'
@@ -8916,7 +8994,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -18514,19 +19241,51 @@
+@@ -18516,19 +19243,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -8973,7 +9051,7 @@
fi
;;
-@@ -18544,8 +19303,8 @@
+@@ -18546,8 +19305,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -8984,7 +9062,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18560,24 +19319,19 @@
+@@ -18562,24 +19321,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -9016,7 +9094,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18611,9 +19365,20 @@
+@@ -18613,9 +19367,20 @@
else
export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -9039,7 +9117,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -18630,7 +19395,7 @@
+@@ -18632,7 +19397,7 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes; then
@@ -9048,7 +9126,7 @@
# 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`
-@@ -18651,6 +19416,9 @@
+@@ -18653,6 +19418,9 @@
fi
esac
shared_flag='-shared'
@@ -9058,7 +9136,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -18659,21 +19427,22 @@
+@@ -18661,21 +19429,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -9086,7 +9164,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -18724,14 +19493,13 @@
+@@ -18726,14 +19495,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -9104,7 +9182,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -18795,8 +19563,8 @@
+@@ -18797,8 +19565,8 @@
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec_GCJ=' '
archive_cmds_need_lc_GCJ=yes
@@ -9115,7 +9193,7 @@
fi
fi
;;
-@@ -18809,7 +19577,7 @@
+@@ -18811,7 +19579,7 @@
ld_shlibs_GCJ=no
;;
@@ -9124,7 +9202,7 @@
export_dynamic_flag_spec_GCJ=-rdynamic
;;
-@@ -18819,68 +19587,68 @@
+@@ -18821,68 +19589,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -9237,7 +9315,7 @@
fi
;;
-@@ -18914,8 +19682,8 @@
+@@ -18916,8 +19684,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -9248,7 +9326,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -18923,7 +19691,7 @@
+@@ -18925,7 +19693,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -9257,7 +9335,7 @@
else
archive_cmds_GCJ='$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'
fi
-@@ -18939,16 +19707,16 @@
+@@ -18941,16 +19709,16 @@
hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -9278,7 +9356,7 @@
hppa*64*|ia64*)
archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
;;
-@@ -18958,7 +19726,7 @@
+@@ -18960,7 +19728,7 @@
esac
fi
if test "$with_gnu_ld" = no; then
@@ -9287,7 +9365,7 @@
hppa*64*)
hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
-@@ -18991,7 +19759,7 @@
+@@ -18993,7 +19761,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -9296,7 +9374,7 @@
else
archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
-@@ -19001,7 +19769,7 @@
+@@ -19003,7 +19771,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -9305,7 +9383,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -19024,7 +19792,8 @@
+@@ -19026,7 +19794,8 @@
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -9315,7 +9393,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19034,7 +19803,7 @@
+@@ -19036,7 +19805,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -9324,7 +9402,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19045,14 +19814,14 @@
+@@ -19047,14 +19816,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -9341,7 +9419,7 @@
else
allow_undefined_flag_GCJ=' -expect_unresolved \*'
archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -19064,13 +19833,13 @@
+@@ -19066,13 +19835,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -9357,7 +9435,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19089,10 +19858,12 @@
+@@ -19091,10 +19860,12 @@
solaris*)
no_undefined_flag_GCJ=' -z text'
if test "$GCC" = yes; then
@@ -9372,7 +9450,7 @@
archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds_GCJ='$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'
-@@ -19101,8 +19872,18 @@
+@@ -19103,8 +19874,18 @@
hardcode_shlibpath_var_GCJ=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -9393,7 +9471,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -19111,7 +19892,7 @@
+@@ -19113,7 +19894,7 @@
if test "x$host_vendor" = xsequent; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
@@ -9402,7 +9480,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19171,9 +19952,9 @@
+@@ -19173,9 +19954,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_GCJ='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -9414,7 +9492,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_GCJ=no
-@@ -19279,7 +20060,7 @@
+@@ -19281,7 +20062,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -9423,7 +9501,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -19289,7 +20070,20 @@
+@@ -19291,7 +20072,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -9445,7 +9523,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19354,7 +20148,7 @@
+@@ -19356,7 +20150,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -9454,7 +9532,7 @@
;;
beos*)
-@@ -19363,7 +20157,7 @@
+@@ -19365,7 +20159,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -9463,7 +9541,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19379,7 +20173,7 @@
+@@ -19381,7 +20175,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -9472,7 +9550,7 @@
need_version=no
need_lib_prefix=no
-@@ -19391,7 +20185,8 @@
+@@ -19393,7 +20187,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -9482,7 +9560,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -19421,7 +20216,7 @@
+@@ -19423,7 +20218,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -9491,7 +9569,7 @@
;;
esac
;;
-@@ -19444,7 +20239,7 @@
+@@ -19446,7 +20241,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -9500,7 +9578,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -19467,7 +20262,7 @@
+@@ -19469,7 +20264,7 @@
dynamic_linker=no
;;
@@ -9509,7 +9587,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19479,8 +20274,17 @@
+@@ -19481,8 +20276,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -9529,7 +9607,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -19498,7 +20302,7 @@
+@@ -19500,7 +20304,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -9538,7 +9616,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -19525,9 +20329,9 @@
+@@ -19527,9 +20331,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -9550,7 +9628,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -19542,7 +20346,7 @@
+@@ -19544,7 +20348,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -9559,7 +9637,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19553,7 +20357,7 @@
+@@ -19555,7 +20359,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -9568,7 +9646,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19615,22 +20419,19 @@
+@@ -19617,22 +20421,19 @@
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'
@@ -9597,7 +9675,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -19640,6 +20441,30 @@
+@@ -19642,6 +20443,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -9628,7 +9706,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -19649,7 +20474,7 @@
+@@ -19651,7 +20476,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -9637,7 +9715,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -19678,7 +20503,11 @@
+@@ -19680,7 +20505,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -9650,7 +9728,7 @@
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
-@@ -19698,7 +20527,7 @@
+@@ -19700,7 +20529,7 @@
os2*)
libname_spec='$name'
@@ -9659,7 +9737,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -19800,8 +20629,8 @@
+@@ -19802,8 +20631,8 @@
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
hardcode_action_GCJ=
if test -n "$hardcode_libdir_flag_spec_GCJ" || \
@@ -9670,16 +9748,16 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_GCJ" != no &&
-@@ -20460,7 +21289,7 @@
+@@ -20462,7 +21291,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 20463 "configure"
-+#line 21292 "configure"
+-#line 20465 "configure"
++#line 21294 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -20526,7 +21355,7 @@
+@@ -20528,7 +21357,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -9688,16 +9766,16 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -20558,7 +21387,7 @@
+@@ -20560,7 +21389,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 20561 "configure"
-+#line 21390 "configure"
+-#line 20563 "configure"
++#line 21392 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -20624,7 +21453,7 @@
+@@ -20626,7 +21455,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -9706,7 +9784,7 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -20675,7 +21504,8 @@
+@@ -20677,7 +21506,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -9716,7 +9794,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -20775,6 +21605,12 @@
+@@ -20777,6 +21607,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -9729,7 +9807,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -20805,7 +21641,7 @@
+@@ -20807,7 +21643,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -9738,7 +9816,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -20836,7 +21672,7 @@
+@@ -20838,7 +21674,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -9747,7 +9825,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -20851,7 +21687,7 @@
+@@ -20853,7 +21689,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
@@ -9756,7 +9834,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21053,7 +21889,10 @@
+@@ -21055,7 +21891,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -9768,7 +9846,7 @@
fi
-@@ -21096,11 +21935,35 @@
+@@ -21098,11 +21937,35 @@
compiler=$CC
@@ -9804,7 +9882,7 @@
lt_cv_prog_compiler_c_o_RC=yes
# The else clause should only fire when bootstrapping the
-@@ -21116,7 +21979,8 @@
+@@ -21118,7 +21981,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -9814,7 +9892,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -21216,6 +22080,12 @@
+@@ -21218,6 +22082,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -9827,7 +9905,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21246,7 +22116,7 @@
+@@ -21248,7 +22118,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -9836,7 +9914,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21277,7 +22147,7 @@
+@@ -21279,7 +22149,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -9845,7 +9923,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21292,7 +22162,7 @@
+@@ -21294,7 +22164,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
@@ -9854,7 +9932,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21494,7 +22364,10 @@
+@@ -21496,7 +22366,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -9866,7 +9944,7 @@
fi
-@@ -21541,7 +22414,7 @@
+@@ -21543,7 +22416,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -9875,7 +9953,7 @@
# Prevent multiple expansion
-@@ -21604,6 +22477,31 @@
+@@ -21606,6 +22479,31 @@
@@ -9907,7 +9985,7 @@
ac_config_headers="$ac_config_headers akode/lib/akode_export.h"
-@@ -25627,6 +26525,13 @@
+@@ -26100,6 +26998,13 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -9921,7 +9999,7 @@
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -25655,6 +26560,13 @@
+@@ -26128,6 +27033,13 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -9935,7 +10013,7 @@
if test -z "${include_mpeg_decoder_TRUE}" && test -z "${include_mpeg_decoder_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"include_mpeg_decoder\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -26300,6 +27212,9 @@
+@@ -26781,6 +27693,9 @@
s, at AMTAR@,$AMTAR,;t t
s, at am__tar@,$am__tar,;t t
s, at am__untar@,$am__untar,;t t
@@ -9967,7 +10045,7 @@
AC_DEFUN([AC_CHECK_LIBFLAC],
--- Makefile.in
+++ Makefile.in
-@@ -156,6 +156,9 @@
+@@ -157,6 +157,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -9977,7 +10055,7 @@
MAKEINFO = @MAKEINFO@
NOOPT_CFLAGS = @NOOPT_CFLAGS@
NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-@@ -266,7 +269,7 @@
+@@ -268,7 +271,7 @@
.SUFFIXES:
am--refresh:
@:
@@ -9986,7 +10064,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -308,12 +311,12 @@
+@@ -310,12 +313,12 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -10001,7 +10079,7 @@
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
config.h: stamp-h1
-@@ -325,7 +328,7 @@
+@@ -327,7 +330,7 @@
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
@@ -10010,12 +10088,12 @@
cd $(top_srcdir) && $(AUTOHEADER)
rm -f stamp-h1
touch $@
-@@ -751,7 +754,7 @@
+@@ -753,7 +756,7 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=stamp-h.in configure.in subdirs Makefile.cvs Makefile.in aclocal.m4 configure.files config.h.in configure.in.in configure Makefile.am acinclude.m4 Makefile.am.in
-+KDE_DIST=stamp-h.in configure.in Makefile.cvs subdirs Makefile.in aclocal.m4 configure.files configure.in.in config.h.in acinclude.m4 configure Makefile.am Makefile.am.in
+-KDE_DIST=stamp-h.in subdirs Makefile.in configure.files config.h.in configure.in akode.lsm Makefile.cvs aclocal.m4 configure.in.in acinclude.m4 Makefile.am configure Makefile.am.in
++KDE_DIST=stamp-h.in subdirs Makefile.in configure.files config.h.in configure.in akode.lsm Makefile.cvs aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in
#>+ 2
docs-am:
More information about the pkg-kde-commits
mailing list