[pkg-kde-commits] rev 2767 - trunk/packages/akode/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Sat Jan 7 18:30:57 UTC 2006
Author: chrsmrtn
Date: 2006-01-07 18:30:54 +0000 (Sat, 07 Jan 2006)
New Revision: 2767
Modified:
trunk/packages/akode/debian/patches/98_buildprep.diff
Log:
...and with the new patch, update the buildprep.
Modified: trunk/packages/akode/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/akode/debian/patches/98_buildprep.diff 2006-01-07 18:30:35 UTC (rev 2766)
+++ trunk/packages/akode/debian/patches/98_buildprep.diff 2006-01-07 18:30:54 UTC (rev 2767)
@@ -2871,9 +2871,66 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+--- aclocal.m4
++++ aclocal.m4
+@@ -501,6 +501,35 @@
+ rmdir .tst 2>/dev/null
+ AC_SUBST([am__leading_dot])])
+
++# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
++# From Jim Meyering
++
++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 4
++
++AC_DEFUN([AM_MAINTAINER_MODE],
++[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
++ dnl maintainer-mode is disabled by default
++ AC_ARG_ENABLE(maintainer-mode,
++[ --enable-maintainer-mode enable make rules and dependencies not useful
++ (and sometimes confusing) to the casual installer],
++ USE_MAINTAINER_MODE=$enableval,
++ USE_MAINTAINER_MODE=no)
++ AC_MSG_RESULT([$USE_MAINTAINER_MODE])
++ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
++ MAINT=$MAINTAINER_MODE_TRUE
++ AC_SUBST(MAINT)dnl
++]
++)
++
++AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
++
+ # Check to see how 'make' treats includes. -*- Autoconf -*-
+
+ # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
--- akode/akodeplay/Makefile.in
+++ akode/akodeplay/Makefile.in
-@@ -278,9 +278,9 @@
+@@ -158,6 +158,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@
+@@ -269,7 +272,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*) \
+@@ -278,9 +281,9 @@
#>- exit 1;; \
#>- esac; \
#>- done; \
@@ -2885,7 +2942,7 @@
#>+ 12
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -290,9 +290,9 @@
+@@ -290,9 +293,9 @@
exit 1;; \
esac; \
done; \
@@ -2897,7 +2954,19 @@
cd $(top_srcdir) && perl admin/am_edit akode/akodeplay/Makefile.in
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -574,9 +574,9 @@
+@@ -307,9 +310,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-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+@@ -574,9 +577,9 @@
exit 1;; \
esac; \
done; \
@@ -2911,7 +2980,26 @@
--- akode/lib/Makefile.in
+++ akode/lib/Makefile.in
-@@ -322,9 +322,9 @@
+@@ -182,6 +182,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@
+@@ -313,7 +316,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*) \
+@@ -322,9 +325,9 @@
#>- exit 1;; \
#>- esac; \
#>- done; \
@@ -2923,7 +3011,7 @@
#>+ 12
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -334,9 +334,9 @@
+@@ -334,9 +337,9 @@
exit 1;; \
esac; \
done; \
@@ -2935,7 +3023,28 @@
cd $(top_srcdir) && perl admin/am_edit akode/lib/Makefile.in
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -689,9 +689,9 @@
+@@ -351,9 +354,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
+
+ akode_export.h: stamp-h2
+@@ -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
+-$(srcdir)/akode_export.h.in: $(am__configure_deps)
++$(srcdir)/akode_export.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_srcdir) && $(AUTOHEADER)
+ rm -f stamp-h2
+ touch $@
+@@ -689,9 +692,9 @@
exit 1;; \
esac; \
done; \
@@ -2949,7 +3058,26 @@
--- akode/Makefile.in
+++ akode/Makefile.in
-@@ -262,9 +262,9 @@
+@@ -146,6 +146,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@
+@@ -253,7 +256,7 @@
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(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*) \
+@@ -262,9 +265,9 @@
#>- exit 1;; \
#>- esac; \
#>- done; \
@@ -2961,7 +3089,7 @@
#>+ 12
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -274,9 +274,9 @@
+@@ -274,9 +277,9 @@
exit 1;; \
esac; \
done; \
@@ -2973,7 +3101,19 @@
cd $(top_srcdir) && perl admin/am_edit akode/Makefile.in
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -605,7 +605,7 @@
+@@ -291,9 +294,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
+ akode-config: $(top_builddir)/config.status $(srcdir)/akode-config.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+@@ -605,7 +608,7 @@
.NOEXPORT:
#>+ 2
@@ -2982,7 +3122,7 @@
#>+ 2
docs-am:
-@@ -620,9 +620,9 @@
+@@ -620,9 +623,9 @@
exit 1;; \
esac; \
done; \
@@ -2996,7 +3136,26 @@
--- akode/plugins/alsa_sink/Makefile.in
+++ akode/plugins/alsa_sink/Makefile.in
-@@ -287,9 +287,9 @@
+@@ -165,6 +165,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@
+@@ -278,7 +281,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*) \
+@@ -287,9 +290,9 @@
#>- exit 1;; \
#>- esac; \
#>- done; \
@@ -3008,7 +3167,7 @@
#>+ 12
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -299,9 +299,9 @@
+@@ -299,9 +302,9 @@
exit 1;; \
esac; \
done; \
@@ -3020,7 +3179,19 @@
cd $(top_srcdir) && perl admin/am_edit akode/plugins/alsa_sink/Makefile.in
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -600,9 +600,9 @@
+@@ -316,9 +319,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)
+@@ -600,9 +603,9 @@
exit 1;; \
esac; \
done; \
@@ -3034,7 +3205,26 @@
--- akode/plugins/ffmpeg_decoder/Makefile.in
+++ akode/plugins/ffmpeg_decoder/Makefile.in
-@@ -288,9 +288,9 @@
+@@ -166,6 +166,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@
+@@ -279,7 +282,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*) \
+@@ -288,9 +291,9 @@
#>- exit 1;; \
#>- esac; \
#>- done; \
@@ -3046,7 +3236,7 @@
#>+ 12
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -300,9 +300,9 @@
+@@ -300,9 +303,9 @@
exit 1;; \
esac; \
done; \
@@ -3058,7 +3248,19 @@
cd $(top_srcdir) && perl admin/am_edit akode/plugins/ffmpeg_decoder/Makefile.in
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -601,9 +601,9 @@
+@@ -317,9 +320,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)
+@@ -601,9 +604,9 @@
exit 1;; \
esac; \
done; \
@@ -3072,7 +3274,26 @@
--- akode/plugins/jack_sink/Makefile.in
+++ akode/plugins/jack_sink/Makefile.in
-@@ -287,9 +287,9 @@
+@@ -165,6 +165,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@
+@@ -278,7 +281,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*) \
+@@ -287,9 +290,9 @@
#>- exit 1;; \
#>- esac; \
#>- done; \
@@ -3084,7 +3305,7 @@
#>+ 12
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -299,9 +299,9 @@
+@@ -299,9 +302,9 @@
exit 1;; \
esac; \
done; \
@@ -3096,7 +3317,19 @@
cd $(top_srcdir) && perl admin/am_edit akode/plugins/jack_sink/Makefile.in
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -600,9 +600,9 @@
+@@ -316,9 +319,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)
+@@ -600,9 +603,9 @@
exit 1;; \
esac; \
done; \
@@ -3110,7 +3343,26 @@
--- akode/plugins/Makefile.in
+++ akode/plugins/Makefile.in
-@@ -272,9 +272,9 @@
+@@ -142,6 +142,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@
+@@ -263,7 +266,7 @@
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(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*) \
+@@ -272,9 +275,9 @@
#>- exit 1;; \
#>- esac; \
#>- done; \
@@ -3122,7 +3374,7 @@
#>+ 12
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -284,9 +284,9 @@
+@@ -284,9 +287,9 @@
exit 1;; \
esac; \
done; \
@@ -3134,7 +3386,19 @@
cd $(top_srcdir) && perl admin/am_edit akode/plugins/Makefile.in
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -605,9 +605,9 @@
+@@ -301,9 +304,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
+
+ mostlyclean-libtool:
+@@ -605,9 +608,9 @@
exit 1;; \
esac; \
done; \
@@ -3148,7 +3412,26 @@
--- akode/plugins/mpc_decoder/Makefile.in
+++ akode/plugins/mpc_decoder/Makefile.in
-@@ -302,9 +302,9 @@
+@@ -179,6 +179,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@
+@@ -293,7 +296,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*) \
+@@ -302,9 +305,9 @@
#>- exit 1;; \
#>- esac; \
#>- done; \
@@ -3160,7 +3443,7 @@
#>+ 12
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -314,9 +314,9 @@
+@@ -314,9 +317,9 @@
exit 1;; \
esac; \
done; \
@@ -3172,7 +3455,19 @@
cd $(top_srcdir) && perl admin/am_edit akode/plugins/mpc_decoder/Makefile.in
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -719,9 +719,9 @@
+@@ -331,9 +334,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)
+@@ -719,9 +722,9 @@
exit 1;; \
esac; \
done; \
@@ -3186,7 +3481,26 @@
--- akode/plugins/mpc_decoder/mppdec/Makefile.in
+++ akode/plugins/mpc_decoder/mppdec/Makefile.in
-@@ -278,9 +278,9 @@
+@@ -157,6 +157,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@
+@@ -269,7 +272,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*) \
+@@ -278,9 +281,9 @@
#>- exit 1;; \
#>- esac; \
#>- done; \
@@ -3198,7 +3512,7 @@
#>+ 12
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -290,9 +290,9 @@
+@@ -290,9 +293,9 @@
exit 1;; \
esac; \
done; \
@@ -3210,7 +3524,19 @@
cd $(top_srcdir) && perl admin/am_edit akode/plugins/mpc_decoder/mppdec/Makefile.in
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -560,9 +560,9 @@
+@@ -307,9 +310,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
+
+ clean-noinstLTLIBRARIES:
+@@ -560,9 +563,9 @@
exit 1;; \
esac; \
done; \
@@ -3224,7 +3550,26 @@
--- akode/plugins/mpeg_decoder/Makefile.in
+++ akode/plugins/mpeg_decoder/Makefile.in
-@@ -288,9 +288,9 @@
+@@ -166,6 +166,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@
+@@ -279,7 +282,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*) \
+@@ -288,9 +291,9 @@
#>- exit 1;; \
#>- esac; \
#>- done; \
@@ -3236,7 +3581,7 @@
#>+ 12
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -300,9 +300,9 @@
+@@ -300,9 +303,9 @@
exit 1;; \
esac; \
done; \
@@ -3248,7 +3593,19 @@
cd $(top_srcdir) && perl admin/am_edit akode/plugins/mpeg_decoder/Makefile.in
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -601,9 +601,9 @@
+@@ -317,9 +320,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)
+@@ -601,9 +604,9 @@
exit 1;; \
esac; \
done; \
@@ -3262,7 +3619,26 @@
--- akode/plugins/oss_sink/Makefile.in
+++ akode/plugins/oss_sink/Makefile.in
-@@ -287,9 +287,9 @@
+@@ -165,6 +165,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@
+@@ -278,7 +281,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*) \
+@@ -287,9 +290,9 @@
#>- exit 1;; \
#>- esac; \
#>- done; \
@@ -3274,7 +3650,7 @@
#>+ 12
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -299,9 +299,9 @@
+@@ -299,9 +302,9 @@
exit 1;; \
esac; \
done; \
@@ -3286,7 +3662,19 @@
cd $(top_srcdir) && perl admin/am_edit akode/plugins/oss_sink/Makefile.in
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -600,9 +600,9 @@
+@@ -316,9 +319,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)
+@@ -600,9 +603,9 @@
exit 1;; \
esac; \
done; \
@@ -3300,7 +3688,26 @@
--- akode/plugins/polyp_sink/Makefile.in
+++ akode/plugins/polyp_sink/Makefile.in
-@@ -287,9 +287,9 @@
+@@ -165,6 +165,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@
+@@ -278,7 +281,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*) \
+@@ -287,9 +290,9 @@
#>- exit 1;; \
#>- esac; \
#>- done; \
@@ -3312,7 +3719,7 @@
#>+ 12
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -299,9 +299,9 @@
+@@ -299,9 +302,9 @@
exit 1;; \
esac; \
done; \
@@ -3324,7 +3731,19 @@
cd $(top_srcdir) && perl admin/am_edit akode/plugins/polyp_sink/Makefile.in
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -600,9 +600,9 @@
+@@ -316,9 +319,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)
+@@ -600,9 +603,9 @@
exit 1;; \
esac; \
done; \
@@ -3338,7 +3757,26 @@
--- akode/plugins/src_resampler/Makefile.in
+++ akode/plugins/src_resampler/Makefile.in
-@@ -288,9 +288,9 @@
+@@ -166,6 +166,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@
+@@ -279,7 +282,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*) \
+@@ -288,9 +291,9 @@
#>- exit 1;; \
#>- esac; \
#>- done; \
@@ -3350,7 +3788,7 @@
#>+ 12
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -300,9 +300,9 @@
+@@ -300,9 +303,9 @@
exit 1;; \
esac; \
done; \
@@ -3362,7 +3800,19 @@
cd $(top_srcdir) && perl admin/am_edit akode/plugins/src_resampler/Makefile.in
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -601,9 +601,9 @@
+@@ -317,9 +320,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)
+@@ -601,9 +604,9 @@
exit 1;; \
esac; \
done; \
@@ -3376,7 +3826,26 @@
--- akode/plugins/sun_sink/Makefile.in
+++ akode/plugins/sun_sink/Makefile.in
-@@ -285,9 +285,9 @@
+@@ -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; \
@@ -3388,7 +3857,7 @@
#>+ 12
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -297,9 +297,9 @@
+@@ -297,9 +300,9 @@
exit 1;; \
esac; \
done; \
@@ -3400,7 +3869,19 @@
cd $(top_srcdir) && perl admin/am_edit akode/plugins/sun_sink/Makefile.in
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -598,9 +598,9 @@
+@@ -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; \
@@ -3414,7 +3895,26 @@
--- akode/plugins/xiph_decoder/Makefile.in
+++ akode/plugins/xiph_decoder/Makefile.in
-@@ -295,9 +295,9 @@
+@@ -173,6 +173,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@
+@@ -286,7 +289,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*) \
+@@ -295,9 +298,9 @@
#>- exit 1;; \
#>- esac; \
#>- done; \
@@ -3426,7 +3926,7 @@
#>+ 12
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -307,9 +307,9 @@
+@@ -307,9 +310,9 @@
exit 1;; \
esac; \
done; \
@@ -3438,16 +3938,28 @@
cd $(top_srcdir) && perl admin/am_edit akode/plugins/xiph_decoder/Makefile.in
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -592,7 +592,7 @@
+@@ -324,9 +327,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)
+@@ -592,7 +595,7 @@
+
#>+ 2
-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:
-@@ -611,9 +611,9 @@
+@@ -611,9 +614,9 @@
exit 1;; \
esac; \
done; \
@@ -3480,7 +3992,57 @@
(test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
then
break
-@@ -6524,183 +6524,6 @@
+@@ -464,7 +464,7 @@
+ # 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 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.
+@@ -1025,6 +1025,8 @@
+ Optional Features:
+ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
+ --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
++ --enable-maintainer-mode enable make rules and dependencies not useful
++ (and sometimes confusing) to the casual installer
+ --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
+@@ -2089,6 +2091,31 @@
+
+
+
++echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
++echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
++ # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
++if test "${enable_maintainer_mode+set}" = set; then
++ enableval="$enable_maintainer_mode"
++ USE_MAINTAINER_MODE=$enableval
++else
++ USE_MAINTAINER_MODE=no
++fi;
++ echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
++echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
++
++
++if test $USE_MAINTAINER_MODE = yes; then
++ MAINTAINER_MODE_TRUE=
++ MAINTAINER_MODE_FALSE='#'
++else
++ MAINTAINER_MODE_TRUE='#'
++ MAINTAINER_MODE_FALSE=
++fi
++
++ MAINT=$MAINTAINER_MODE_TRUE
++
++
++
+
+
+ if test "x$prefix" = "xNONE"; then
+@@ -6524,183 +6551,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -3664,7 +4226,7 @@
fi
-@@ -6869,7 +6692,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
@@ -3673,7 +4235,7 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -6974,7 +6797,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,
@@ -3682,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'*)
-@@ -7008,7 +6831,7 @@
+@@ -7008,7 +6858,7 @@
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -3691,7 +4253,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -7038,6 +6861,15 @@
+@@ -7038,6 +6888,15 @@
*) reload_flag=" $reload_flag" ;;
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -3707,7 +4269,7 @@
echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-@@ -7124,44 +6956,36 @@
+@@ -7124,44 +6983,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -3762,7 +4324,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -7177,7 +7001,7 @@
+@@ -7177,7 +7028,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -3771,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
-@@ -7194,42 +7018,21 @@
+@@ -7194,42 +7045,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -3821,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
-@@ -7248,19 +7051,14 @@
+@@ -7248,19 +7078,14 @@
;;
openbsd*)
@@ -3843,7 +4405,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -7270,7 +7068,6 @@
+@@ -7270,7 +7095,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -3851,16 +4413,16 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -7347,7 +7144,7 @@
+@@ -7347,7 +7171,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 7350 "configure"' > conftest.$ac_ext
-+ echo '#line 7147 "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=$?
-@@ -7390,14 +7187,13 @@
+@@ -7390,14 +7214,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -3877,7 +4439,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7409,7 +7205,6 @@
+@@ -7409,7 +7232,6 @@
esac
;;
*64-bit*)
@@ -3885,10 +4447,22 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7896,6 +7691,243 @@
+@@ -7896,47 +7718,284 @@
done
+-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'
+-ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+-if test -n "$ac_tool_prefix"; then
+- for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
+- do
+- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_F77+set}" = set; then
+
+
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
@@ -3903,14 +4477,40 @@
+echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
+if test -z "$CXXCPP"; then
+ if test "${ac_cv_prog_CXXCPP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- if test -n "$F77"; then
+- ac_cv_prog_F77="$F77" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+ # Double quotes because CXXCPP needs to be expanded
+ for CXXCPP in "$CXX -E" "/lib/cpp"
+ do
+ ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
-+do
+ do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-
+-fi
+-fi
+-F77=$ac_cv_prog_F77
+-if test -n "$F77"; then
+- echo "$as_me:$LINENO: result: $F77" >&5
+-echo "${ECHO_T}$F77" >&6
+-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
@@ -4126,19 +4726,60 @@
+
+fi
+
- 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'
-@@ -7988,7 +8020,7 @@
++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'
++ac_compiler_gnu=$ac_cv_f77_compiler_gnu
++if test -n "$ac_tool_prefix"; then
++ for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
++ do
++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
++set dummy $ac_tool_prefix$ac_prog; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_F77+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$F77"; then
++ ac_cv_prog_F77="$F77" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++
++fi
++fi
++F77=$ac_cv_prog_F77
++if test -n "$F77"; then
++ echo "$as_me:$LINENO: result: $F77" >&5
++echo "${ECHO_T}$F77" >&6
++else
++ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
+ test -n "$F77" && break
+ done
+@@ -7988,7 +8047,7 @@
+
# Provide some information about the compiler.
-echo "$as_me:7991:" \
-+echo "$as_me:8023:" \
++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
-@@ -8141,7 +8173,7 @@
+@@ -8141,7 +8200,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
i=0
@@ -4147,7 +4788,7 @@
case $build_os in
msdosdjgpp*)
-@@ -8170,20 +8202,53 @@
+@@ -8170,20 +8229,53 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -4207,7 +4848,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.
-@@ -8220,9 +8285,6 @@
+@@ -8220,9 +8312,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
@@ -4217,7 +4858,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'"
-@@ -8244,6 +8306,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'"
;;
@@ -4231,7 +4872,7 @@
irix* | nonstopux*)
symcode='[BCDEGRST]'
;;
-@@ -8251,7 +8320,7 @@
+@@ -8251,7 +8347,7 @@
symcode='[BCDEGQRST]'
;;
solaris* | sysv5*)
@@ -4240,7 +4881,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8269,14 +8338,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'*)
@@ -4260,7 +4901,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -8438,7 +8510,7 @@
+@@ -8438,7 +8537,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -4269,7 +4910,7 @@
sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
-@@ -8458,7 +8530,7 @@
+@@ -8458,7 +8557,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -4278,7 +4919,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8743,6 +8815,17 @@
+@@ -8743,6 +8842,17 @@
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
@@ -4296,7 +4937,7 @@
# Only perform the check for file, if the check method requires it
case $deplibs_check_method in
file_magic*)
-@@ -8768,7 +8851,7 @@
+@@ -8768,7 +8878,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -4305,7 +4946,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
-@@ -8830,7 +8913,7 @@
+@@ -8830,7 +8940,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -4314,7 +4955,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
-@@ -8929,6 +9012,20 @@
+@@ -8929,6 +9039,20 @@
compiler=$CC
@@ -4335,7 +4976,7 @@
#
# Check for any special shared library compilation flags.
#
-@@ -8965,11 +9062,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
@@ -4353,7 +4994,7 @@
else
lt_prog_compiler_static_works=yes
fi
-@@ -9015,18 +9117,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 \
@@ -4362,12 +5003,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9021: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9123: $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:9025: \$? = $ac_status" >&5
-+ echo "$as_me:9127: \$? = $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
@@ -4379,7 +5020,7 @@
lt_cv_prog_compiler_rtti_exceptions=yes
fi
fi
-@@ -9103,7 +9207,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.
@@ -4388,7 +5029,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9129,6 +9233,16 @@
+@@ -9129,6 +9260,16 @@
lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -4405,7 +5046,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -9140,7 +9254,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.
@@ -4414,7 +5055,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9164,12 +9278,19 @@
+@@ -9164,12 +9305,19 @@
;;
linux*)
@@ -4435,7 +5076,7 @@
ccc*)
lt_prog_compiler_wl='-Wl,'
# All Alpha code is PIC.
-@@ -9190,9 +9311,14 @@
+@@ -9190,9 +9338,14 @@
;;
solaris*)
@@ -4451,7 +5092,7 @@
;;
sunos4*)
-@@ -9214,6 +9340,11 @@
+@@ -9214,6 +9367,11 @@
fi
;;
@@ -4463,7 +5104,7 @@
uts4*)
lt_prog_compiler_pic='-pic'
lt_prog_compiler_static='-Bstatic'
-@@ -9248,18 +9379,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 \
@@ -4472,12 +5113,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9254: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9385: $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:9258: \$? = $ac_status" >&5
-+ echo "$as_me:9389: \$? = $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
@@ -4489,7 +5130,7 @@
lt_prog_compiler_pic_works=yes
fi
fi
-@@ -9280,7 +9413,7 @@
+@@ -9280,7 +9440,7 @@
fi
fi
@@ -4498,7 +5139,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
-@@ -9302,38 +9435,36 @@
+@@ -9302,38 +9462,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -4520,12 +5161,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9321: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9447: $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:9325: \$? = $ac_status" >&5
-+ echo "$as_me:9451: \$? = $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
@@ -4549,7 +5190,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -9404,6 +9535,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=
@@ -4566,7 +5207,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -9424,6 +9565,27 @@
+@@ -9424,6 +9592,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -4594,7 +5235,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -9461,7 +9623,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
@@ -4603,7 +5244,7 @@
else
ld_shlibs=no
fi
-@@ -9471,13 +9633,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'
@@ -4620,7 +5261,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
-@@ -9486,19 +9648,51 @@
+@@ -9486,19 +9675,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -4676,7 +5317,7 @@
fi
;;
-@@ -9516,8 +9710,8 @@
+@@ -9516,8 +9737,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -4687,7 +5328,7 @@
else
ld_shlibs=no
fi
-@@ -9532,24 +9726,19 @@
+@@ -9532,24 +9753,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -4719,7 +5360,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9583,9 +9772,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
@@ -4742,7 +5383,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9602,7 +9802,7 @@
+@@ -9602,7 +9829,7 @@
link_all_deplibs=yes
if test "$GCC" = yes; then
@@ -4751,7 +5392,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`
-@@ -9623,6 +9823,9 @@
+@@ -9623,6 +9850,9 @@
fi
esac
shared_flag='-shared'
@@ -4761,7 +5402,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -9631,21 +9834,22 @@
+@@ -9631,21 +9861,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -4789,7 +5430,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -9696,14 +9900,13 @@
+@@ -9696,14 +9927,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -4807,7 +5448,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -9767,8 +9970,8 @@
+@@ -9767,8 +9997,8 @@
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec=' '
archive_cmds_need_lc=yes
@@ -4818,7 +5459,7 @@
fi
fi
;;
-@@ -9781,7 +9984,7 @@
+@@ -9781,7 +10011,7 @@
ld_shlibs=no
;;
@@ -4827,7 +5468,7 @@
export_dynamic_flag_spec=-rdynamic
;;
-@@ -9791,13 +9994,13 @@
+@@ -9791,13 +10021,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -4844,7 +5485,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.
-@@ -9807,52 +10010,52 @@
+@@ -9807,52 +10037,52 @@
;;
darwin* | rhapsody*)
@@ -4937,7 +5578,7 @@
fi
;;
-@@ -9886,8 +10089,8 @@
+@@ -9886,8 +10116,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -4948,7 +5589,7 @@
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -9895,7 +10098,7 @@
+@@ -9895,7 +10125,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -4957,7 +5598,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
-@@ -9911,16 +10114,16 @@
+@@ -9911,16 +10141,16 @@
hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -4978,7 +5619,7 @@
hppa*64*|ia64*)
archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
;;
-@@ -9930,7 +10133,7 @@
+@@ -9930,7 +10160,7 @@
esac
fi
if test "$with_gnu_ld" = no; then
@@ -4987,7 +5628,7 @@
hppa*64*)
hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld='+b $libdir'
-@@ -9963,7 +10166,7 @@
+@@ -9963,7 +10193,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -4996,7 +5637,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'
-@@ -9973,7 +10176,7 @@
+@@ -9973,7 +10203,7 @@
link_all_deplibs=yes
;;
@@ -5005,7 +5646,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -9996,7 +10199,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
@@ -5015,7 +5656,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10006,7 +10210,7 @@
+@@ -10006,7 +10237,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -5024,7 +5665,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10017,14 +10221,14 @@
+@@ -10017,14 +10248,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -5041,7 +5682,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'
-@@ -10036,13 +10240,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}\*'
@@ -5057,7 +5698,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10061,10 +10265,12 @@
+@@ -10061,10 +10292,12 @@
solaris*)
no_undefined_flag=' -z text'
if test "$GCC" = yes; then
@@ -5072,7 +5713,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'
-@@ -10073,8 +10279,18 @@
+@@ -10073,8 +10306,18 @@
hardcode_shlibpath_var=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -5093,7 +5734,7 @@
esac
link_all_deplibs=yes
;;
-@@ -10083,7 +10299,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.
@@ -5102,7 +5743,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10143,9 +10359,9 @@
+@@ -10143,9 +10386,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -5114,7 +5755,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var=no
-@@ -10251,7 +10467,7 @@
+@@ -10251,7 +10494,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -5123,7 +5764,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10261,7 +10477,20 @@
+@@ -10261,7 +10504,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -5145,7 +5786,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10326,7 +10555,7 @@
+@@ -10326,7 +10582,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -5154,7 +5795,7 @@
;;
beos*)
-@@ -10335,7 +10564,7 @@
+@@ -10335,7 +10591,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -5163,7 +5804,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10351,7 +10580,7 @@
+@@ -10351,7 +10607,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -5172,7 +5813,7 @@
need_version=no
need_lib_prefix=no
-@@ -10363,7 +10592,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~
@@ -5182,7 +5823,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -10393,7 +10623,7 @@
+@@ -10393,7 +10650,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -5191,7 +5832,7 @@
;;
esac
;;
-@@ -10416,7 +10646,7 @@
+@@ -10416,7 +10673,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -5200,7 +5841,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"`
-@@ -10439,7 +10669,7 @@
+@@ -10439,7 +10696,7 @@
dynamic_linker=no
;;
@@ -5209,7 +5850,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10451,8 +10681,17 @@
+@@ -10451,8 +10708,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -5229,7 +5870,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -10470,7 +10709,7 @@
+@@ -10470,7 +10736,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -5238,7 +5879,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -10497,9 +10736,9 @@
+@@ -10497,9 +10763,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -5250,7 +5891,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10514,7 +10753,7 @@
+@@ -10514,7 +10780,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -5259,7 +5900,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10525,7 +10764,7 @@
+@@ -10525,7 +10791,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -5268,7 +5909,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10587,22 +10826,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'
@@ -5297,7 +5938,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,
-@@ -10612,6 +10848,30 @@
+@@ -10612,6 +10875,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -5328,7 +5969,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10621,7 +10881,7 @@
+@@ -10621,7 +10908,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -5337,7 +5978,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -10650,7 +10910,11 @@
+@@ -10650,7 +10937,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -5350,7 +5991,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
-@@ -10670,7 +10934,7 @@
+@@ -10670,7 +10961,7 @@
os2*)
libname_spec='$name'
@@ -5359,7 +6000,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -10772,8 +11036,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" || \
@@ -5370,16 +6011,16 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct" != no &&
-@@ -11432,7 +11696,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 11435 "configure"
-+#line 11699 "configure"
++#line 11726 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11498,7 +11762,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
@@ -5388,16 +6029,16 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -11530,7 +11794,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 11533 "configure"
-+#line 11797 "configure"
++#line 11824 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11596,7 +11860,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
@@ -5406,7 +6047,7 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -11646,7 +11910,7 @@
+@@ -11646,7 +11937,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -5415,7 +6056,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -11655,47 +11919,10 @@
+@@ -11655,47 +11946,10 @@
fi
;;
@@ -5464,7 +6105,7 @@
;;
esac
echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -11721,7 +11948,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.
@@ -5474,7 +6115,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 \
-@@ -11835,11 +12063,11 @@
+@@ -11835,11 +12090,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -5488,7 +6129,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -11869,6 +12097,12 @@
+@@ -11869,6 +12124,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -5501,7 +6142,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -11899,7 +12133,7 @@
+@@ -11899,7 +12160,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -5510,7 +6151,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -11930,7 +12164,7 @@
+@@ -11930,7 +12191,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -5519,7 +6160,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -11945,7 +12179,7 @@
+@@ -11945,7 +12206,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o
@@ -5528,7 +6169,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -12172,7 +12406,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.
@@ -5540,7 +6181,7 @@
fi
-@@ -12237,7 +12474,9 @@
+@@ -12237,7 +12501,9 @@
case $tagname in
CXX)
@@ -5551,7 +6192,7 @@
ac_ext=cc
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -12274,7 +12513,7 @@
+@@ -12274,7 +12540,7 @@
compiler_lib_search_path_CXX=
# Source file extension for C++ test sources.
@@ -5560,7 +6201,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -12295,6 +12534,20 @@
+@@ -12295,6 +12561,20 @@
compiler=$CC
@@ -5581,7 +6222,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -12316,7 +12569,16 @@
+@@ -12316,7 +12596,16 @@
CC=${CXX-"c++"}
compiler=$CC
compiler_CXX=$CC
@@ -5599,7 +6240,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -12387,7 +12649,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,
@@ -5608,7 +6249,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'*)
-@@ -12421,7 +12683,7 @@
+@@ -12421,7 +12710,7 @@
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -5617,7 +6258,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -12440,8 +12702,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
@@ -5628,7 +6269,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12467,7 +12729,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.
@@ -5637,7 +6278,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12498,8 +12760,22 @@
+@@ -12498,8 +12787,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -5662,7 +6303,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12516,7 +12792,7 @@
+@@ -12516,7 +12819,7 @@
link_all_deplibs_CXX=yes
if test "$GXX" = yes; then
@@ -5671,7 +6312,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`
-@@ -12537,6 +12813,9 @@
+@@ -12537,6 +12840,9 @@
fi
esac
shared_flag='-shared'
@@ -5681,7 +6322,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -12545,15 +12824,16 @@
+@@ -12545,15 +12851,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -5702,7 +6343,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.
-@@ -12612,13 +12892,12 @@
+@@ -12612,13 +12919,12 @@
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -5718,7 +6359,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -12682,8 +12961,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
@@ -5729,7 +6370,7 @@
fi
fi
;;
-@@ -12696,16 +12975,17 @@
+@@ -12696,16 +13002,17 @@
esac
;;
@@ -5749,7 +6390,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
-@@ -12714,70 +12994,81 @@
+@@ -12714,70 +13021,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -5883,7 +6524,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -12788,14 +13079,14 @@
+@@ -12788,14 +13106,14 @@
;;
esac
;;
@@ -5900,7 +6541,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -12812,12 +13103,12 @@
+@@ -12812,12 +13130,12 @@
# location of the library.
case $cc_basename in
@@ -5916,7 +6557,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -12826,11 +13117,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.
@@ -5930,7 +6571,7 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -12840,7 +13131,7 @@
+@@ -12840,7 +13158,7 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -5939,7 +6580,7 @@
hppa*64*)
hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-@@ -12856,7 +13147,7 @@
+@@ -12856,7 +13174,7 @@
;;
esac
fi
@@ -5948,7 +6589,7 @@
hppa*64*)
hardcode_direct_CXX=no
hardcode_shlibpath_var_CXX=no
-@@ -12877,17 +13168,17 @@
+@@ -12877,17 +13195,17 @@
esac
case $cc_basename in
@@ -5970,7 +6611,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -12903,12 +13194,12 @@
+@@ -12903,12 +13221,12 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -5985,7 +6626,7 @@
;;
esac
fi
-@@ -12921,9 +13212,9 @@
+@@ -12921,9 +13239,9 @@
;;
irix5* | irix6*)
case $cc_basename in
@@ -5997,7 +6638,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -12934,9 +13225,9 @@
+@@ -12934,9 +13252,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -6009,7 +6650,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -12947,14 +13238,14 @@
+@@ -12947,14 +13265,14 @@
;;
linux*)
case $cc_basename in
@@ -6027,7 +6668,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -12972,20 +13263,44 @@
+@@ -12972,20 +13290,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -6078,7 +6719,7 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13013,7 +13328,7 @@
+@@ -13013,7 +13355,7 @@
;;
mvs*)
case $cc_basename in
@@ -6087,7 +6728,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13023,7 +13338,7 @@
+@@ -13023,7 +13365,7 @@
;;
esac
;;
@@ -6096,7 +6737,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=
-@@ -13034,15 +13349,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::"'
;;
@@ -6130,7 +6771,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13052,14 +13383,14 @@
+@@ -13052,14 +13410,14 @@
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -6148,7 +6789,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13077,7 +13408,7 @@
+@@ -13077,7 +13435,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -6157,7 +6798,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13096,13 +13427,13 @@
+@@ -13096,13 +13454,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -6173,7 +6814,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13111,17 +13442,17 @@
+@@ -13111,17 +13469,17 @@
# the KAI C++ compiler.
old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
;;
@@ -6195,7 +6836,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13140,7 +13471,7 @@
+@@ -13140,7 +13498,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -6204,7 +6845,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13164,7 +13495,7 @@
+@@ -13164,7 +13522,7 @@
sco*)
archive_cmds_need_lc_CXX=no
case $cc_basename in
@@ -6213,7 +6854,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13176,12 +13507,12 @@
+@@ -13176,12 +13534,12 @@
;;
sunos4*)
case $cc_basename in
@@ -6228,7 +6869,7 @@
# Lucid
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13194,36 +13525,33 @@
+@@ -13194,36 +13552,33 @@
;;
solaris*)
case $cc_basename in
@@ -6277,7 +6918,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -13231,9 +13559,9 @@
+@@ -13231,9 +13586,9 @@
# in the archive.
old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
;;
@@ -6289,7 +6930,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13243,9 +13571,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
@@ -6301,7 +6942,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13254,9 +13582,9 @@
+@@ -13254,9 +13609,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -6313,7 +6954,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13274,7 +13602,7 @@
+@@ -13274,7 +13629,7 @@
;;
tandem*)
case $cc_basename in
@@ -6322,7 +6963,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13331,7 +13659,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.
@@ -6331,7 +6972,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -13371,7 +13699,7 @@
+@@ -13371,7 +13726,7 @@
fi
;;
@@ -6340,7 +6981,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13407,6 +13735,20 @@
+@@ -13407,6 +13762,20 @@
$rm -f confest.$objext
@@ -6361,7 +7002,7 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -13462,7 +13804,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.
@@ -6370,7 +7011,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -13487,18 +13829,28 @@
+@@ -13487,18 +13856,28 @@
;;
chorus*)
case $cc_basename in
@@ -6402,7 +7043,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13506,22 +13858,22 @@
+@@ -13506,22 +13885,22 @@
;;
esac
;;
@@ -6429,7 +7070,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -13536,7 +13888,7 @@
+@@ -13536,7 +13915,7 @@
;;
irix5* | irix6* | nonstopux*)
case $cc_basename in
@@ -6438,7 +7079,7 @@
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -13547,18 +13899,24 @@
+@@ -13547,18 +13926,24 @@
;;
linux*)
case $cc_basename in
@@ -6466,7 +7107,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13575,25 +13933,25 @@
+@@ -13575,25 +13960,25 @@
;;
mvs*)
case $cc_basename in
@@ -6497,7 +7138,7 @@
# Digital/Compaq C++
lt_prog_compiler_wl_CXX='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -13609,7 +13967,7 @@
+@@ -13609,7 +13994,7 @@
;;
sco*)
case $cc_basename in
@@ -6506,7 +7147,7 @@
lt_prog_compiler_pic_CXX='-fPIC'
;;
*)
-@@ -13618,13 +13976,13 @@
+@@ -13618,13 +14003,13 @@
;;
solaris*)
case $cc_basename in
@@ -6522,7 +7163,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-PIC'
;;
-@@ -13634,12 +13992,12 @@
+@@ -13634,12 +14019,12 @@
;;
sunos4*)
case $cc_basename in
@@ -6537,7 +7178,7 @@
# Lucid
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13649,7 +14007,7 @@
+@@ -13649,7 +14034,7 @@
;;
tandem*)
case $cc_basename in
@@ -6546,7 +7187,7 @@
# NonStop-UX NCC 3.20
lt_prog_compiler_pic_CXX='-KPIC'
;;
-@@ -13690,18 +14048,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 \
@@ -6555,12 +7196,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13696: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14054: $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:13700: \$? = $ac_status" >&5
-+ echo "$as_me:14058: \$? = $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
@@ -6572,7 +7213,7 @@
lt_prog_compiler_pic_works_CXX=yes
fi
fi
-@@ -13722,7 +14082,7 @@
+@@ -13722,7 +14109,7 @@
fi
fi
@@ -6581,7 +7222,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_CXX=
-@@ -13744,38 +14104,36 @@
+@@ -13744,38 +14131,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -6603,12 +7244,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13763: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14116: $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:13767: \$? = $ac_status" >&5
-+ echo "$as_me:14120: \$? = $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
@@ -6632,7 +7273,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -13825,7 +14183,10 @@
+@@ -13825,7 +14210,10 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -6644,7 +7285,7 @@
;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -13908,7 +14269,7 @@
+@@ -13908,7 +14296,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -6653,7 +7294,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -13918,7 +14279,20 @@
+@@ -13918,7 +14306,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -6675,7 +7316,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -13983,7 +14357,7 @@
+@@ -13983,7 +14384,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -6684,7 +7325,7 @@
;;
beos*)
-@@ -13992,7 +14366,7 @@
+@@ -13992,7 +14393,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -6693,7 +7334,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14008,7 +14382,7 @@
+@@ -14008,7 +14409,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -6702,7 +7343,7 @@
need_version=no
need_lib_prefix=no
-@@ -14020,7 +14394,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~
@@ -6712,7 +7353,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -14050,7 +14425,7 @@
+@@ -14050,7 +14452,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -6721,7 +7362,7 @@
;;
esac
;;
-@@ -14073,7 +14448,7 @@
+@@ -14073,7 +14475,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -6730,7 +7371,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"`
-@@ -14096,7 +14471,7 @@
+@@ -14096,7 +14498,7 @@
dynamic_linker=no
;;
@@ -6739,7 +7380,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14108,8 +14483,17 @@
+@@ -14108,8 +14510,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -6759,7 +7400,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -14127,7 +14511,7 @@
+@@ -14127,7 +14538,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -6768,7 +7409,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -14154,9 +14538,9 @@
+@@ -14154,9 +14565,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -6780,7 +7421,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14171,7 +14555,7 @@
+@@ -14171,7 +14582,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -6789,7 +7430,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14182,7 +14566,7 @@
+@@ -14182,7 +14593,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -6798,7 +7439,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14244,22 +14628,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'
@@ -6827,7 +7468,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,
-@@ -14269,6 +14650,30 @@
+@@ -14269,6 +14677,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -6858,7 +7499,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14278,7 +14683,7 @@
+@@ -14278,7 +14710,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -6867,7 +7508,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14307,7 +14712,11 @@
+@@ -14307,7 +14739,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -6880,7 +7521,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
-@@ -14327,7 +14736,7 @@
+@@ -14327,7 +14763,7 @@
os2*)
libname_spec='$name'
@@ -6889,7 +7530,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14429,8 +14838,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" || \
@@ -6900,16 +7541,16 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_CXX" != no &&
-@@ -15089,7 +15498,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 15092 "configure"
-+#line 15501 "configure"
++#line 15528 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15155,7 +15564,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
@@ -6918,16 +7559,16 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -15187,7 +15596,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 15190 "configure"
-+#line 15599 "configure"
++#line 15626 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15253,7 +15662,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
@@ -6936,7 +7577,7 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -15304,7 +15713,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.
@@ -6946,7 +7587,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 \
-@@ -15404,6 +15814,12 @@
+@@ -15404,6 +15841,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -6959,7 +7600,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -15434,7 +15850,7 @@
+@@ -15434,7 +15877,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -6968,7 +7609,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -15465,7 +15881,7 @@
+@@ -15465,7 +15908,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -6977,7 +7618,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -15480,7 +15896,7 @@
+@@ -15480,7 +15923,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
@@ -6986,7 +7627,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -15682,7 +16098,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.
@@ -6998,7 +7639,7 @@
fi
-@@ -15758,12 +16177,35 @@
+@@ -15758,12 +16204,35 @@
compiler=$CC
@@ -7035,7 +7676,7 @@
echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-@@ -15776,7 +16218,7 @@
+@@ -15776,7 +16245,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -7044,7 +7685,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -15784,8 +16226,10 @@
+@@ -15784,8 +16253,10 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -7057,7 +7698,7 @@
;;
esac
echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -15862,7 +16306,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.
@@ -7066,7 +7707,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -15888,6 +16332,16 @@
+@@ -15888,6 +16359,16 @@
lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -7083,7 +7724,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -15899,7 +16353,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.
@@ -7092,7 +7733,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -15923,12 +16377,19 @@
+@@ -15923,12 +16404,19 @@
;;
linux*)
@@ -7113,7 +7754,7 @@
ccc*)
lt_prog_compiler_wl_F77='-Wl,'
# All Alpha code is PIC.
-@@ -15949,9 +16410,14 @@
+@@ -15949,9 +16437,14 @@
;;
solaris*)
@@ -7129,7 +7770,7 @@
;;
sunos4*)
-@@ -15973,6 +16439,11 @@
+@@ -15973,6 +16466,11 @@
fi
;;
@@ -7141,7 +7782,7 @@
uts4*)
lt_prog_compiler_pic_F77='-pic'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16007,18 +16478,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 \
@@ -7150,12 +7791,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16013: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16484: $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:16017: \$? = $ac_status" >&5
-+ echo "$as_me:16488: \$? = $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
@@ -7167,7 +7808,7 @@
lt_prog_compiler_pic_works_F77=yes
fi
fi
-@@ -16039,7 +16512,7 @@
+@@ -16039,7 +16539,7 @@
fi
fi
@@ -7176,7 +7817,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_F77=
-@@ -16061,38 +16534,36 @@
+@@ -16061,38 +16561,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -7198,12 +7839,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16080: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16546: $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:16084: \$? = $ac_status" >&5
-+ echo "$as_me:16550: \$? = $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
@@ -7227,7 +7868,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -16163,6 +16634,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=
@@ -7244,7 +7885,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -16183,6 +16664,27 @@
+@@ -16183,6 +16691,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -7272,7 +7913,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -16220,7 +16722,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
@@ -7281,7 +7922,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16230,13 +16732,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'
@@ -7298,7 +7939,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
-@@ -16245,19 +16747,51 @@
+@@ -16245,19 +16774,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -7355,7 +7996,7 @@
fi
;;
-@@ -16275,8 +16809,8 @@
+@@ -16275,8 +16836,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -7366,7 +8007,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16291,24 +16825,19 @@
+@@ -16291,24 +16852,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -7398,7 +8039,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16342,9 +16871,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
@@ -7421,7 +8062,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16361,7 +16901,7 @@
+@@ -16361,7 +16928,7 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes; then
@@ -7430,7 +8071,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`
-@@ -16382,6 +16922,9 @@
+@@ -16382,6 +16949,9 @@
fi
esac
shared_flag='-shared'
@@ -7440,7 +8081,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -16390,21 +16933,22 @@
+@@ -16390,21 +16960,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -7468,7 +8109,7 @@
program main
end
-@@ -16445,14 +16989,13 @@
+@@ -16445,14 +17016,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -7486,7 +8127,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16506,8 +17049,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
@@ -7497,7 +8138,7 @@
fi
fi
;;
-@@ -16520,7 +17063,7 @@
+@@ -16520,7 +17090,7 @@
ld_shlibs_F77=no
;;
@@ -7506,7 +8147,7 @@
export_dynamic_flag_spec_F77=-rdynamic
;;
-@@ -16530,68 +17073,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=' '
@@ -7619,7 +8260,7 @@
fi
;;
-@@ -16625,8 +17168,8 @@
+@@ -16625,8 +17195,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -7630,7 +8271,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -16634,7 +17177,7 @@
+@@ -16634,7 +17204,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -7639,7 +8280,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
-@@ -16650,16 +17193,16 @@
+@@ -16650,16 +17220,16 @@
hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -7660,7 +8301,7 @@
hppa*64*|ia64*)
archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
;;
-@@ -16669,7 +17212,7 @@
+@@ -16669,7 +17239,7 @@
esac
fi
if test "$with_gnu_ld" = no; then
@@ -7669,7 +8310,7 @@
hppa*64*)
hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld_F77='+b $libdir'
-@@ -16702,7 +17245,7 @@
+@@ -16702,7 +17272,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -7678,7 +8319,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'
-@@ -16712,7 +17255,7 @@
+@@ -16712,7 +17282,7 @@
link_all_deplibs_F77=yes
;;
@@ -7687,7 +8328,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
-@@ -16735,7 +17278,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
@@ -7697,7 +8338,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -16745,7 +17289,7 @@
+@@ -16745,7 +17316,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -7706,7 +8347,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -16756,14 +17300,14 @@
+@@ -16756,14 +17327,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -7723,7 +8364,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'
-@@ -16775,13 +17319,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}\*'
@@ -7739,7 +8380,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -16800,10 +17344,12 @@
+@@ -16800,10 +17371,12 @@
solaris*)
no_undefined_flag_F77=' -z text'
if test "$GCC" = yes; then
@@ -7754,7 +8395,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'
-@@ -16812,8 +17358,18 @@
+@@ -16812,8 +17385,18 @@
hardcode_shlibpath_var_F77=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -7775,7 +8416,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -16822,7 +17378,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.
@@ -7784,7 +8425,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -16882,9 +17438,9 @@
+@@ -16882,9 +17465,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_F77='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -7796,7 +8437,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_F77=no
-@@ -16990,7 +17546,7 @@
+@@ -16990,7 +17573,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -7805,7 +8446,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17000,7 +17556,20 @@
+@@ -17000,7 +17583,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -7827,7 +8468,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17065,7 +17634,7 @@
+@@ -17065,7 +17661,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -7836,7 +8477,7 @@
;;
beos*)
-@@ -17074,7 +17643,7 @@
+@@ -17074,7 +17670,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -7845,7 +8486,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17090,7 +17659,7 @@
+@@ -17090,7 +17686,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -7854,7 +8495,7 @@
need_version=no
need_lib_prefix=no
-@@ -17102,7 +17671,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~
@@ -7864,7 +8505,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -17132,7 +17702,7 @@
+@@ -17132,7 +17729,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -7873,7 +8514,7 @@
;;
esac
;;
-@@ -17155,7 +17725,7 @@
+@@ -17155,7 +17752,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -7882,7 +8523,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"`
-@@ -17178,7 +17748,7 @@
+@@ -17178,7 +17775,7 @@
dynamic_linker=no
;;
@@ -7891,7 +8532,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17190,8 +17760,17 @@
+@@ -17190,8 +17787,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -7911,7 +8552,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -17209,7 +17788,7 @@
+@@ -17209,7 +17815,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -7920,7 +8561,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -17236,9 +17815,9 @@
+@@ -17236,9 +17842,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -7932,7 +8573,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17253,7 +17832,7 @@
+@@ -17253,7 +17859,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -7941,7 +8582,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17264,7 +17843,7 @@
+@@ -17264,7 +17870,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -7950,7 +8591,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17326,22 +17905,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'
@@ -7979,7 +8620,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,
-@@ -17351,6 +17927,30 @@
+@@ -17351,6 +17954,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -8010,7 +8651,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17360,7 +17960,7 @@
+@@ -17360,7 +17987,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -8019,7 +8660,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17389,7 +17989,11 @@
+@@ -17389,7 +18016,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -8032,7 +8673,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
-@@ -17409,7 +18013,7 @@
+@@ -17409,7 +18040,7 @@
os2*)
libname_spec='$name'
@@ -8041,7 +8682,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17511,8 +18115,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" || \
@@ -8052,7 +8693,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_F77" != no &&
-@@ -17588,7 +18192,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.
@@ -8062,7 +8703,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 \
-@@ -17688,6 +18293,12 @@
+@@ -17688,6 +18320,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -8075,7 +8716,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -17718,7 +18329,7 @@
+@@ -17718,7 +18356,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -8084,7 +8725,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -17749,7 +18360,7 @@
+@@ -17749,7 +18387,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -8093,7 +8734,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -17764,7 +18375,7 @@
+@@ -17764,7 +18402,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
@@ -8102,7 +8743,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -17966,7 +18577,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.
@@ -8114,7 +8755,7 @@
fi
-@@ -17999,7 +18613,7 @@
+@@ -17999,7 +18640,7 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -8123,7 +8764,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -18010,15 +18624,41 @@
+@@ -18010,15 +18651,41 @@
compiler=$CC
@@ -8165,7 +8806,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
-@@ -18045,18 +18685,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 \
@@ -8174,12 +8815,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18051: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18691: $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:18055: \$? = $ac_status" >&5
-+ echo "$as_me:18695: \$? = $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
@@ -8191,7 +8832,7 @@
lt_cv_prog_compiler_rtti_exceptions=yes
fi
fi
-@@ -18133,7 +18775,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.
@@ -8200,7 +8841,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18159,6 +18801,16 @@
+@@ -18159,6 +18828,16 @@
lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -8217,7 +8858,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -18170,7 +18822,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.
@@ -8226,7 +8867,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18194,12 +18846,19 @@
+@@ -18194,12 +18873,19 @@
;;
linux*)
@@ -8247,7 +8888,7 @@
ccc*)
lt_prog_compiler_wl_GCJ='-Wl,'
# All Alpha code is PIC.
-@@ -18220,9 +18879,14 @@
+@@ -18220,9 +18906,14 @@
;;
solaris*)
@@ -8263,7 +8904,7 @@
;;
sunos4*)
-@@ -18244,6 +18908,11 @@
+@@ -18244,6 +18935,11 @@
fi
;;
@@ -8275,7 +8916,7 @@
uts4*)
lt_prog_compiler_pic_GCJ='-pic'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18278,18 +18947,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 \
@@ -8284,12 +8925,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18284: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18953: $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:18288: \$? = $ac_status" >&5
-+ echo "$as_me:18957: \$? = $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
@@ -8301,7 +8942,7 @@
lt_prog_compiler_pic_works_GCJ=yes
fi
fi
-@@ -18310,7 +18981,7 @@
+@@ -18310,7 +19008,7 @@
fi
fi
@@ -8310,7 +8951,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_GCJ=
-@@ -18332,38 +19003,36 @@
+@@ -18332,38 +19030,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -8332,12 +8973,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18351: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19015: $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:18355: \$? = $ac_status" >&5
-+ echo "$as_me:19019: \$? = $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
@@ -8361,7 +9002,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -18434,6 +19103,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=
@@ -8378,7 +9019,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -18454,6 +19133,27 @@
+@@ -18454,6 +19160,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -8406,7 +9047,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -18491,7 +19191,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
@@ -8415,7 +9056,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18501,13 +19201,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'
@@ -8432,7 +9073,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
-@@ -18516,19 +19216,51 @@
+@@ -18516,19 +19243,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -8441,9 +9082,10 @@
else
- ld_shlibs=no
+ ld_shlibs_GCJ=no
-+ fi
-+ ;;
-+
+ fi
+ ;;
+
+- netbsd*)
+ linux*)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ tmp_addflag=
@@ -8473,10 +9115,9 @@
+ link_all_deplibs_GCJ=no
+ else
+ ld_shlibs_GCJ=no
- fi
- ;;
-
-- netbsd*)
++ fi
++ ;;
++
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -8489,7 +9130,7 @@
fi
;;
-@@ -18546,8 +19278,8 @@
+@@ -18546,8 +19305,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -8500,7 +9141,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18562,24 +19294,19 @@
+@@ -18562,24 +19321,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -8532,7 +9173,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18613,9 +19340,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
@@ -8555,7 +9196,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -18632,7 +19370,7 @@
+@@ -18632,7 +19397,7 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes; then
@@ -8564,7 +9205,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`
-@@ -18653,6 +19391,9 @@
+@@ -18653,6 +19418,9 @@
fi
esac
shared_flag='-shared'
@@ -8574,7 +9215,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -18661,21 +19402,22 @@
+@@ -18661,21 +19429,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -8602,7 +9243,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -18726,14 +19468,13 @@
+@@ -18726,14 +19495,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -8620,7 +9261,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -18797,8 +19538,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
@@ -8631,7 +9272,7 @@
fi
fi
;;
-@@ -18811,7 +19552,7 @@
+@@ -18811,7 +19579,7 @@
ld_shlibs_GCJ=no
;;
@@ -8640,7 +9281,7 @@
export_dynamic_flag_spec_GCJ=-rdynamic
;;
-@@ -18821,68 +19562,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=' '
@@ -8753,7 +9394,7 @@
fi
;;
-@@ -18916,8 +19657,8 @@
+@@ -18916,8 +19684,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -8764,7 +9405,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -18925,7 +19666,7 @@
+@@ -18925,7 +19693,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -8773,7 +9414,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
-@@ -18941,16 +19682,16 @@
+@@ -18941,16 +19709,16 @@
hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -8794,7 +9435,7 @@
hppa*64*|ia64*)
archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
;;
-@@ -18960,7 +19701,7 @@
+@@ -18960,7 +19728,7 @@
esac
fi
if test "$with_gnu_ld" = no; then
@@ -8803,7 +9444,7 @@
hppa*64*)
hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
-@@ -18993,7 +19734,7 @@
+@@ -18993,7 +19761,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -8812,7 +9453,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'
-@@ -19003,7 +19744,7 @@
+@@ -19003,7 +19771,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -8821,7 +9462,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
-@@ -19026,7 +19767,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
@@ -8831,7 +9472,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19036,7 +19778,7 @@
+@@ -19036,7 +19805,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -8840,7 +9481,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19047,14 +19789,14 @@
+@@ -19047,14 +19816,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -8857,7 +9498,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'
-@@ -19066,13 +19808,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}\*'
@@ -8873,7 +9514,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19091,10 +19833,12 @@
+@@ -19091,10 +19860,12 @@
solaris*)
no_undefined_flag_GCJ=' -z text'
if test "$GCC" = yes; then
@@ -8888,7 +9529,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'
-@@ -19103,8 +19847,18 @@
+@@ -19103,8 +19874,18 @@
hardcode_shlibpath_var_GCJ=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -8909,7 +9550,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -19113,7 +19867,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.
@@ -8918,7 +9559,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19173,9 +19927,9 @@
+@@ -19173,9 +19954,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_GCJ='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -8930,7 +9571,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_GCJ=no
-@@ -19281,7 +20035,7 @@
+@@ -19281,7 +20062,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -8939,7 +9580,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -19291,7 +20045,20 @@
+@@ -19291,7 +20072,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -8961,7 +9602,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19356,7 +20123,7 @@
+@@ -19356,7 +20150,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -8970,7 +9611,7 @@
;;
beos*)
-@@ -19365,7 +20132,7 @@
+@@ -19365,7 +20159,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -8979,7 +9620,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19381,7 +20148,7 @@
+@@ -19381,7 +20175,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -8988,7 +9629,7 @@
need_version=no
need_lib_prefix=no
-@@ -19393,7 +20160,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~
@@ -8998,7 +9639,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -19423,7 +20191,7 @@
+@@ -19423,7 +20218,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -9007,7 +9648,7 @@
;;
esac
;;
-@@ -19446,7 +20214,7 @@
+@@ -19446,7 +20241,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -9016,7 +9657,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"`
-@@ -19469,7 +20237,7 @@
+@@ -19469,7 +20264,7 @@
dynamic_linker=no
;;
@@ -9025,7 +9666,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19481,8 +20249,17 @@
+@@ -19481,8 +20276,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -9045,7 +9686,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -19500,7 +20277,7 @@
+@@ -19500,7 +20304,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -9054,7 +9695,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -19527,9 +20304,9 @@
+@@ -19527,9 +20331,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -9066,7 +9707,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -19544,7 +20321,7 @@
+@@ -19544,7 +20348,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -9075,7 +9716,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19555,7 +20332,7 @@
+@@ -19555,7 +20359,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -9084,7 +9725,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19617,22 +20394,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'
@@ -9113,7 +9754,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,
-@@ -19642,6 +20416,30 @@
+@@ -19642,6 +20443,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -9144,7 +9785,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -19651,7 +20449,7 @@
+@@ -19651,7 +20476,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -9153,7 +9794,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -19680,7 +20478,11 @@
+@@ -19680,7 +20505,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -9166,7 +9807,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
-@@ -19700,7 +20502,7 @@
+@@ -19700,7 +20529,7 @@
os2*)
libname_spec='$name'
@@ -9175,7 +9816,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -19802,8 +20604,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" || \
@@ -9186,16 +9827,16 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_GCJ" != no &&
-@@ -20462,7 +21264,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 20465 "configure"
-+#line 21267 "configure"
++#line 21294 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -20528,7 +21330,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
@@ -9204,16 +9845,16 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -20560,7 +21362,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 20563 "configure"
-+#line 21365 "configure"
++#line 21392 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -20626,7 +21428,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
@@ -9222,7 +9863,7 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -20677,7 +21479,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.
@@ -9232,7 +9873,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 \
-@@ -20777,6 +21580,12 @@
+@@ -20777,6 +21607,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -9245,7 +9886,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -20807,7 +21616,7 @@
+@@ -20807,7 +21643,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -9254,7 +9895,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -20838,7 +21647,7 @@
+@@ -20838,7 +21674,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -9263,7 +9904,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -20853,7 +21662,7 @@
+@@ -20853,7 +21689,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
@@ -9272,7 +9913,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21055,7 +21864,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.
@@ -9284,7 +9925,7 @@
fi
-@@ -21098,11 +21910,35 @@
+@@ -21098,11 +21937,35 @@
compiler=$CC
@@ -9320,7 +9961,7 @@
lt_cv_prog_compiler_c_o_RC=yes
# The else clause should only fire when bootstrapping the
-@@ -21118,7 +21954,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.
@@ -9330,7 +9971,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 \
-@@ -21218,6 +22055,12 @@
+@@ -21218,6 +22082,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -9343,7 +9984,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21248,7 +22091,7 @@
+@@ -21248,7 +22118,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -9352,7 +9993,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21279,7 +22122,7 @@
+@@ -21279,7 +22149,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -9361,7 +10002,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21294,7 +22137,7 @@
+@@ -21294,7 +22164,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
@@ -9370,7 +10011,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21496,7 +22339,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.
@@ -9382,7 +10023,7 @@
fi
-@@ -21543,7 +22389,7 @@
+@@ -21543,7 +22416,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -9391,9 +10032,87 @@
# Prevent multiple expansion
+@@ -26100,6 +26973,13 @@
+ LTLIBOBJS=$ac_ltlibobjs
+
+
++if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
++ { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++ { (exit 1); exit 1; }; }
++fi
+ 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
+@@ -26781,6 +27661,9 @@
+ s, at AMTAR@,$AMTAR,;t t
+ s, at am__tar@,$am__tar,;t t
+ s, at am__untar@,$am__untar,;t t
++s, at MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
++s, at MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
++s, at MAINT@,$MAINT,;t t
+ s, at USER_INCLUDES@,$USER_INCLUDES,;t t
+ s, at USER_LDFLAGS@,$USER_LDFLAGS,;t t
+ s, at CONF_FILES@,$CONF_FILES,;t t
+--- configure.in
++++ configure.in
+@@ -44,6 +44,8 @@
+ dnl Automake doc recommends to do this only here. (Janos)
+ AM_INIT_AUTOMAKE(kdesupport,3.3)
+
++AM_MAINTAINER_MODE
++
+ dnl almost the same like KDE_SET_PEFIX but the path is /usr/local
+ dnl make /usr/local the default for the installation
+ AC_PREFIX_DEFAULT(/usr/local)
--- Makefile.in
+++ Makefile.in
-@@ -753,7 +753,7 @@
+@@ -157,6 +157,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@
+@@ -268,7 +271,7 @@
+ .SUFFIXES:
+ am--refresh:
+ @:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -310,12 +313,12 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ $(SHELL) ./config.status --recheck
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ #>- cd $(srcdir) && $(AUTOCONF)
+ #>+ 2
+ cd $(srcdir) && rm -f configure
+ cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+
+ config.h: stamp-h1
+@@ -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
+-$(srcdir)/config.h.in: $(am__configure_deps)
++$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_srcdir) && $(AUTOHEADER)
+ rm -f stamp-h1
+ touch $@
+@@ -753,7 +756,7 @@
.NOEXPORT:
#>+ 2
More information about the pkg-kde-commits
mailing list