rev 3959 - trunk/packages/kdemultimedia/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Sat Jun 17 18:45:10 UTC 2006
Author: chrsmrtn
Date: 2006-06-17 18:44:54 +0000 (Sat, 17 Jun 2006)
New Revision: 3959
Modified:
trunk/packages/kdemultimedia/debian/patches/98_buildprep.diff
Log:
kdemultimedia buildprep update.
Modified: trunk/packages/kdemultimedia/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdemultimedia/debian/patches/98_buildprep.diff 2006-06-17 18:29:56 UTC (rev 3958)
+++ trunk/packages/kdemultimedia/debian/patches/98_buildprep.diff 2006-06-17 18:44:54 UTC (rev 3959)
@@ -3835,6 +3835,44 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+--- aclocal.m4
++++ aclocal.m4
+@@ -522,6 +522,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_artsplugin/Makefile.in
+++ akode_artsplugin/Makefile.in
@@ -162,6 +162,7 @@
@@ -3934,6 +3972,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -887,7 +896,7 @@
+
+
+ #>+ 2
+-KDE_DIST=akodeXiphPlayObject_impl.h Makefile.in akodeMPCPlayObject_impl.h akodeSpeexStreamPlayObject_impl.h akodearts.idl akodeMPEGPlayObject.mcopclass akodeFFMPEGPlayObject.mcopclass akodeVorbisStreamPlayObject.mcopclass akodeSpeexStreamPlayObject.mcopclass akodeXiphPlayObject.mcopclass akodePlayObject.mcopclass arts_inputstream.h akodeMPEGPlayObject_impl.h akodeMPCPlayObject.mcopclass akodeFFMPEGPlayObject_impl.h configure.in.in Makefile.am akodeVorbisStreamPlayObject_impl.h
++KDE_DIST=akodeXiphPlayObject_impl.h akodeMPCPlayObject_impl.h Makefile.in akodearts.idl akodeSpeexStreamPlayObject_impl.h akodeMPEGPlayObject.mcopclass akodeFFMPEGPlayObject.mcopclass akodeVorbisStreamPlayObject.mcopclass akodeSpeexStreamPlayObject.mcopclass akodeXiphPlayObject.mcopclass akodePlayObject.mcopclass arts_inputstream.h akodeMPEGPlayObject_impl.h akodeMPCPlayObject.mcopclass configure.in.in akodeFFMPEGPlayObject_impl.h Makefile.am akodeVorbisStreamPlayObject_impl.h
+
+ #>+ 3
+ clean-closures:
--- arts/builder/Makefile.in
+++ arts/builder/Makefile.in
@@ -183,6 +183,7 @@
@@ -4033,6 +4080,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
+@@ -1079,7 +1088,7 @@
+ -rm -f qttableview.moc interfacedlg.moc mwidget.moc portposdlg.moc main.moc execdlg.moc retrievedlg.moc propertypanel.moc menumaker.moc
+
+ #>+ 2
+-KDE_DIST=artsbuilder.desktop structureport.h interfacedlg.h drawutils.h portposdlg.h dirmanager.h artsbuilderui.rc autorouter.h retrievedlg.h execdlg.h main.h Makefile.in FullDuplexTest.arts session.h scomponent.h createtool.h x-artsbuilder.desktop module.h propertypanel.h propertypanelbase.ui structure.h Makefile.am menumaker.h mwidget.h
++KDE_DIST=artsbuilder.desktop structureport.h interfacedlg.h portposdlg.h drawutils.h dirmanager.h artsbuilderui.rc autorouter.h retrievedlg.h execdlg.h main.h Makefile.in FullDuplexTest.arts session.h scomponent.h createtool.h x-artsbuilder.desktop module.h propertypanel.h propertypanelbase.ui structure.h Makefile.am menumaker.h mwidget.h
+
+ #>+ 4
+ clean-ui:
--- arts/builder/pics/Makefile.in
+++ arts/builder/pics/Makefile.in
@@ -126,6 +126,7 @@
@@ -4132,6 +4188,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -663,7 +672,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=Synth_MUL.xpm Synth_SHELVE_CUTOFF.xpm hisc-app-artscontrol.svgz cr16-action-artsbuilderexecute.png Synth_ATAN_SATURATE.xpm Synth_PLAY_WAV.xpm Synth_MOOG_VCF.xpm Synth_XFADE.xpm Synth_BUS_UPLINK.xpm Synth_ENVELOPE_ADSR.xpm Synth_FILEPLAY.xpm Synth_DIV.xpm hisc-app-artsbuilder.svgz hi16-app-artsbuilder.png Synth_WAVE_SQUARE.xpm cr22-action-artsbuilderexecute.png Synth_SEQUENCE_FREQ.png Synth_PLAY.xpm Synth_RC.xpm Synth_DEBUG.xpm Synth_SEQUENCE.xpm Synth_AMAN_PLAY.xpm Synth_PLAY_AKAIS.xpm Synth_MIDI_DEBUG.xpm Synth_EMPTY.xpm Makefile.in Synth_MIDI_ROUTER.xpm Synth_WAVE_TRI.xpm Synth_AUTOPANNER.xpm Synth_MULTI_ADD.xpm hi16-app-artscontrol.png Synth_WAVE_SAW.xpm Synth_BUS_DOWNLINK.xpm Synth_ADD.xpm Synth_PLAY_AKAI.xpm Makefile.am Synth_WAVE_SIN.xpm Synth_PSCALE.xpm
++KDE_DIST=Synth_MUL.xpm hisc-app-artscontrol.svgz Synth_SHELVE_CUTOFF.xpm Synth_ATAN_SATURATE.xpm cr16-action-artsbuilderexecute.png Synth_PLAY_WAV.xpm Synth_MOOG_VCF.xpm Synth_XFADE.xpm Synth_BUS_UPLINK.xpm Synth_ENVELOPE_ADSR.xpm Synth_FILEPLAY.xpm Synth_DIV.xpm hisc-app-artsbuilder.svgz hi16-app-artsbuilder.png Synth_WAVE_SQUARE.xpm cr22-action-artsbuilderexecute.png Synth_SEQUENCE_FREQ.png Synth_PLAY.xpm Synth_DEBUG.xpm Synth_RC.xpm Synth_SEQUENCE.xpm Synth_AMAN_PLAY.xpm Synth_PLAY_AKAIS.xpm Synth_MIDI_DEBUG.xpm Synth_EMPTY.xpm Makefile.in Synth_MIDI_ROUTER.xpm Synth_WAVE_TRI.xpm Synth_AUTOPANNER.xpm Synth_MULTI_ADD.xpm hi16-app-artscontrol.png Synth_WAVE_SAW.xpm Synth_BUS_DOWNLINK.xpm Synth_ADD.xpm Synth_PLAY_AKAI.xpm Makefile.am Synth_WAVE_SIN.xpm Synth_PSCALE.xpm
+
+ #>+ 2
+ docs-am:
--- arts/examples/Makefile.in
+++ arts/examples/Makefile.in
@@ -115,6 +115,7 @@
@@ -4231,6 +4296,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -728,7 +737,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=example_cflanger.arts example_moog.arts instrument_slide.arts example_pulse.arts example_fm.arts example_tremolo.arts instrument_simple_square.arts example_play_wave.arts instrument_tri.arts instrument_nokind.arts example_multi_add.arts example_equalizer.arts example_pitchshift.arts mixer_element_eq.arts example_record.arts example_bus.arts instrument_neworgan.arts example_tri.arts example_cdelay.arts instrument_simple_sin.arts example_stereobeep.arts example_autopanner.arts instrument_full_square.arts template_Mixer_Element.arts effect_flanger_alone.arts example_atan_saturate.arts example_pscale.arts instrument_organ2.arts instrument_deepdrum.arts example_brickwall.arts example_dtmf1.arts example_square.arts example_capture_wav.arts instrument_flexible_slide.arts instrument_slide1.arts instrument_moog_vcf_tune.arts instrument_fm_horn.arts template_Instrument.arts instrument_square.arts instrument_chirpdrum.arts instrument_arts_all.arts-map checknames.sh Makefile.in instrument_flexible_slide_GUI.arts example_data.arts instrument_simple_tri.arts example_delay.arts example_noise.arts example_softsaw.arts example_shelve_cutoff.arts mixer_element_simple.arts example_sequence.arts effect_delay.arts template_Instrument_GUI.arts mixer_element_eqfx.arts instrument_hihat.arts template_Empty_Structure.arts instrument_moog_vcf_tune_GUI.arts example_freeverb.arts example_sine.arts effect_delay_alone.arts example_xfade.arts example_adsr.arts Makefile.am example_rc.arts
++KDE_DIST=instrument_deepdrum.arts example_moog.arts example_brickwall.arts example_cflanger.arts instrument_slide.arts example_pulse.arts example_dtmf1.arts example_square.arts example_capture_wav.arts example_fm.arts example_tremolo.arts instrument_simple_square.arts instrument_slide1.arts instrument_flexible_slide.arts example_play_wave.arts instrument_tri.arts instrument_nokind.arts example_multi_add.arts instrument_moog_vcf_tune.arts example_equalizer.arts instrument_fm_horn.arts template_Instrument.arts example_pitchshift.arts example_record.arts mixer_element_eq.arts example_bus.arts instrument_neworgan.arts example_tri.arts instrument_square.arts example_cdelay.arts instrument_arts_all.arts-map instrument_chirpdrum.arts checknames.sh example_stereobeep.arts instrument_simple_sin.arts example_autopanner.arts Makefile.in instrument_flexible_slide_GUI.arts example_data.arts instrument_simple_tri.arts example_delay.arts example_noise.arts instrument_full_square.arts template_Mixer_Element.arts example_shelve_cutoff.arts example_softsaw.arts mixer_element_simple.arts effect_flanger_alone.arts example_atan_saturate.arts example_sequence.arts effect_delay.arts template_Instrument_GUI.arts mixer_element_eqfx.arts instrument_hihat.arts template_Empty_Structure.arts effect_delay_alone.arts instrument_moog_vcf_tune_GUI.arts example_freeverb.arts example_pscale.arts example_sine.arts example_xfade.arts example_adsr.arts instrument_organ2.arts Makefile.am example_rc.arts
+
+ #>+ 2
+ docs-am:
--- arts/gui/common/Makefile.in
+++ arts/gui/common/Makefile.in
@@ -156,6 +156,7 @@
@@ -4429,6 +4503,78 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -1099,18 +1108,18 @@
+ mocs: kcombobox_impl.moc
+
+ #>+ 3
+-klevelmeter_normalbars.moc: $(srcdir)/klevelmeter_normalbars.h
+- $(MOC) $(srcdir)/klevelmeter_normalbars.h -o klevelmeter_normalbars.moc
++klineedit_impl.moc: $(srcdir)/klineedit_impl.h
++ $(MOC) $(srcdir)/klineedit_impl.h -o klineedit_impl.moc
+
+ #>+ 2
+-mocs: klevelmeter_normalbars.moc
++mocs: klineedit_impl.moc
+
+ #>+ 3
+-klineedit_impl.moc: $(srcdir)/klineedit_impl.h
+- $(MOC) $(srcdir)/klineedit_impl.h -o klineedit_impl.moc
++klevelmeter_normalbars.moc: $(srcdir)/klevelmeter_normalbars.h
++ $(MOC) $(srcdir)/klevelmeter_normalbars.h -o klevelmeter_normalbars.moc
+
+ #>+ 2
+-mocs: klineedit_impl.moc
++mocs: klevelmeter_normalbars.moc
+
+ #>+ 3
+ kbutton_impl.moc: $(srcdir)/kbutton_impl.h
+@@ -1134,18 +1143,18 @@
+ mocs: kpoti.moc
+
+ #>+ 3
+-kfader_impl.moc: $(srcdir)/kfader_impl.h
+- $(MOC) $(srcdir)/kfader_impl.h -o kfader_impl.moc
++klevelmeter_linebars.moc: $(srcdir)/klevelmeter_linebars.h
++ $(MOC) $(srcdir)/klevelmeter_linebars.h -o klevelmeter_linebars.moc
+
+ #>+ 2
+-mocs: kfader_impl.moc
++mocs: klevelmeter_linebars.moc
+
+ #>+ 3
+-klevelmeter_linebars.moc: $(srcdir)/klevelmeter_linebars.h
+- $(MOC) $(srcdir)/klevelmeter_linebars.h -o klevelmeter_linebars.moc
++kfader_impl.moc: $(srcdir)/kfader_impl.h
++ $(MOC) $(srcdir)/kfader_impl.h -o kfader_impl.moc
+
+ #>+ 2
+-mocs: klevelmeter_linebars.moc
++mocs: kfader_impl.moc
+
+ #>+ 3
+ kpoti_impl.moc: $(srcdir)/kpoti_impl.h
+@@ -1177,10 +1186,10 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f klabel_impl.moc kvolumefader_impl.moc klayoutbox_impl.moc kpopupbox_private.moc kspinbox_impl.moc klevelmeter_private.moc klevelmeter_firebars.moc kfader.moc kwidget_impl.moc kgraph.moc kcombobox_impl.moc klevelmeter_normalbars.moc klineedit_impl.moc kbutton_impl.moc dbtest.moc kpoti.moc kfader_impl.moc klevelmeter_linebars.moc kpoti_impl.moc klevelmeter_small.moc ktickmarks_impl.moc klevelmeter_template.moc
++ -rm -f klabel_impl.moc kvolumefader_impl.moc klayoutbox_impl.moc kpopupbox_private.moc kspinbox_impl.moc klevelmeter_private.moc klevelmeter_firebars.moc kfader.moc kwidget_impl.moc kgraph.moc kcombobox_impl.moc klineedit_impl.moc klevelmeter_normalbars.moc kbutton_impl.moc dbtest.moc kpoti.moc klevelmeter_linebars.moc kfader_impl.moc kpoti_impl.moc klevelmeter_small.moc ktickmarks_impl.moc klevelmeter_template.moc
+
+ #>+ 2
+-KDE_DIST=dbtest.h kbutton_impl.h klevelmeter_linebars.h klevelmeter_firebars.h khbox_impl.h klevelmeter_normalbars.h kvbox_impl.h kpopupbox_impl.h kfader_impl.h klevelmeter_small.h klevelmeter_private.h kvolumefader_impl.h kgraph.h klevelmeter_template.h dbvolcalc.h klabel_impl.h kpopupbox_private.h kgraphline_impl.h ktickmarks_impl.h Makefile.in kfader.h klevelmeter_impl.h kpoti_impl.h kpoti.h kspinbox_impl.h kcombobox_impl.h Makefile.am klineedit_impl.h kgraph_impl.h
++KDE_DIST=klevelmeter_private.h dbtest.h kbutton_impl.h kvolumefader_impl.h klevelmeter_linebars.h klevelmeter_firebars.h kgraph.h khbox_impl.h klevelmeter_template.h dbvolcalc.h klabel_impl.h klevelmeter_normalbars.h kpopupbox_private.h kvbox_impl.h kgraphline_impl.h kpopupbox_impl.h ktickmarks_impl.h Makefile.in kfader_impl.h kfader.h klevelmeter_small.h klevelmeter_impl.h kpoti_impl.h kpoti.h kspinbox_impl.h kcombobox_impl.h Makefile.am klineedit_impl.h kgraph_impl.h
+
+ #>+ 3
+ clean-closures:
+@@ -1228,7 +1237,7 @@
+
+
+ #>+ 11
+-libartsgui_kde_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwidget_impl.cpp $(srcdir)/kbutton_impl.cpp $(srcdir)/kpoti_impl.cpp $(srcdir)/kpoti.cpp $(srcdir)/kwidgetrepo.cpp $(srcdir)/kartswidget.cpp $(srcdir)/klineedit_impl.cpp $(srcdir)/khbox_impl.cpp $(srcdir)/kvbox_impl.cpp $(srcdir)/kspinbox_impl.cpp $(srcdir)/kcombobox_impl.cpp $(srcdir)/kfader.cpp $(srcdir)/kfader_impl.cpp $(srcdir)/kgraph_impl.cpp $(srcdir)/kgraph.cpp $(srcdir)/kgraphline_impl.cpp $(srcdir)/kframe_impl.cpp $(srcdir)/klayoutbox_impl.cpp $(srcdir)/kpopupbox_impl.cpp $(srcdir)/klevelmeter_impl.cpp $(srcdir)/klevelmeter_small.cpp $(srcdir)/klevelmeter_linebars.cpp $(srcdir)/klevelmeter_normalbars.cpp $(srcdir)/klevelmeter_firebars.cpp $(srcdir)/ktickmarks_impl.cpp $(srcdir)/kvolumefader_impl.cpp $(srcdir)/klabel_impl.cpp klayoutbox_impl.moc kvolumefader_impl.moc klabel_impl.moc kpopupbox_private.moc klevelmeter_private.moc kspinbox_impl.moc klevelmeter_firebars.moc kfader.moc kwidget_impl.moc kgraph.moc kcombobox_impl.moc klineedit_impl.moc klevelmeter_normalbars.moc kbutton_impl.moc kpoti.moc kfader_impl.moc klevelmeter_linebars.moc kpoti_impl.moc klevelmeter_small.moc ktickmarks_impl.moc klevelmeter_template.moc
++libartsgui_kde_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwidget_impl.cpp $(srcdir)/kbutton_impl.cpp $(srcdir)/kpoti_impl.cpp $(srcdir)/kpoti.cpp $(srcdir)/kwidgetrepo.cpp $(srcdir)/kartswidget.cpp $(srcdir)/klineedit_impl.cpp $(srcdir)/khbox_impl.cpp $(srcdir)/kvbox_impl.cpp $(srcdir)/kspinbox_impl.cpp $(srcdir)/kcombobox_impl.cpp $(srcdir)/kfader.cpp $(srcdir)/kfader_impl.cpp $(srcdir)/kgraph_impl.cpp $(srcdir)/kgraph.cpp $(srcdir)/kgraphline_impl.cpp $(srcdir)/kframe_impl.cpp $(srcdir)/klayoutbox_impl.cpp $(srcdir)/kpopupbox_impl.cpp $(srcdir)/klevelmeter_impl.cpp $(srcdir)/klevelmeter_small.cpp $(srcdir)/klevelmeter_linebars.cpp $(srcdir)/klevelmeter_normalbars.cpp $(srcdir)/klevelmeter_firebars.cpp $(srcdir)/ktickmarks_impl.cpp $(srcdir)/kvolumefader_impl.cpp $(srcdir)/klabel_impl.cpp klayoutbox_impl.moc kvolumefader_impl.moc klabel_impl.moc kpopupbox_private.moc klevelmeter_private.moc kspinbox_impl.moc klevelmeter_firebars.moc kfader.moc kwidget_impl.moc kgraph.moc kcombobox_impl.moc klevelmeter_normalbars.moc klineedit_impl.moc kbutton_impl.moc kpoti.moc klevelmeter_linebars.moc kfader_impl.moc kpoti_impl.moc klevelmeter_small.moc ktickmarks_impl.moc klevelmeter_template.moc
+ @echo 'creating libartsgui_kde_la.all_cpp.cpp ...'; \
+ rm -f libartsgui_kde_la.all_cpp.files libartsgui_kde_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libartsgui_kde_la.all_cpp.final; \
--- arts/gui/kde/mcopclass/Makefile.in
+++ arts/gui/kde/mcopclass/Makefile.in
@@ -113,6 +113,7 @@
@@ -4528,6 +4674,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -643,7 +652,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=LevelMeter.mcopclass Button.mcopclass PopupBox.mcopclass HBox.mcopclass LineEdit.mcopclass Fader.mcopclass Widget.mcopclass VBox.mcopclass GraphLine.mcopclass Makefile.in Poti.mcopclass Graph.mcopclass Label.mcopclass LayoutBox.mcopclass Makefile.am SpinBox.mcopclass
++KDE_DIST=LevelMeter.mcopclass Button.mcopclass Widget.mcopclass PopupBox.mcopclass HBox.mcopclass VBox.mcopclass GraphLine.mcopclass Makefile.in Poti.mcopclass LineEdit.mcopclass Graph.mcopclass Label.mcopclass LayoutBox.mcopclass Makefile.am SpinBox.mcopclass Fader.mcopclass
+
+ #>+ 2
+ docs-am:
--- arts/gui/Makefile.in
+++ arts/gui/Makefile.in
@@ -118,6 +118,7 @@
@@ -4825,6 +4980,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -1129,7 +1138,7 @@
+
+
+ #>+ 2
+-KDE_DIST=alsamidiport_impl.h midimanager_impl.h miditimercommon.h midimsg.h audiotimer.h midisyncgroup_impl.h midimanagerport_impl.h midisend.h README.midi audiosync_impl.h Makefile.in midiclient_impl.h timestampmath.h Makefile.am
++KDE_DIST=midimanagerport_impl.h midisend.h alsamidiport_impl.h README.midi midimanager_impl.h miditimercommon.h midimsg.h audiosync_impl.h midiclient_impl.h Makefile.in timestampmath.h audiotimer.h midisyncgroup_impl.h Makefile.am
+
+ #>+ 3
+ clean-closures:
--- arts/midi/mcopclass/Makefile.in
+++ arts/midi/mcopclass/Makefile.in
@@ -113,6 +113,7 @@
@@ -5122,6 +5286,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
+@@ -734,7 +743,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=tuning.h readme.txt denormals.h comb.hpp revmodel.hpp Makefile.in allpass.hpp Makefile.am
++KDE_DIST=tuning.h readme.txt revmodel.hpp Makefile.in denormals.h allpass.hpp Makefile.am comb.hpp
+
+ #>+ 2
+ docs-am:
--- arts/modules/effects/Makefile.in
+++ arts/modules/effects/Makefile.in
@@ -192,6 +192,7 @@
@@ -5320,6 +5493,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -1001,7 +1010,7 @@
+
+
+ #>+ 2
+-KDE_DIST=README.subdirs README.modules Makefile.in README.environments Makefile.am
++KDE_DIST=README.modules README.subdirs Makefile.in README.environments Makefile.am
+
+ #>+ 3
+ clean-closures:
--- arts/modules/mixers/Makefile.in
+++ arts/modules/mixers/Makefile.in
@@ -167,6 +167,7 @@
@@ -5617,6 +5799,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -890,7 +899,7 @@
+
+
+ #>+ 2
+-KDE_DIST=StructureDesc.mcopclass StructureBuilder.mcopclass ArtsBuilderLoader.mcopclass sequenceutils.h compatibility.h LocalFactory.mcopclass moduleinfo.h Makefile.in Makefile.am
++KDE_DIST=LocalFactory.mcopclass moduleinfo.h Makefile.in StructureDesc.mcopclass StructureBuilder.mcopclass ArtsBuilderLoader.mcopclass sequenceutils.h compatibility.h Makefile.am
+
+ #>+ 3
+ clean-closures:
--- arts/tools/Makefile.in
+++ arts/tools/Makefile.in
@@ -200,6 +200,7 @@
@@ -5716,6 +5907,44 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -1168,18 +1177,18 @@
+ mocs: audiomanager.moc
+
+ #>+ 3
+-artscontrolapplet.moc: $(srcdir)/artscontrolapplet.h
+- $(MOC) $(srcdir)/artscontrolapplet.h -o artscontrolapplet.moc
++midimanagerview.moc: $(srcdir)/midimanagerview.h
++ $(MOC) $(srcdir)/midimanagerview.h -o midimanagerview.moc
+
+ #>+ 2
+-mocs: artscontrolapplet.moc
++mocs: midimanagerview.moc
+
+ #>+ 3
+-midimanagerview.moc: $(srcdir)/midimanagerview.h
+- $(MOC) $(srcdir)/midimanagerview.h -o midimanagerview.moc
++artscontrolapplet.moc: $(srcdir)/artscontrolapplet.h
++ $(MOC) $(srcdir)/artscontrolapplet.h -o artscontrolapplet.moc
+
+ #>+ 2
+-mocs: midimanagerview.moc
++mocs: artscontrolapplet.moc
+
+ #>+ 3
+ choosebusdlg.moc: $(srcdir)/choosebusdlg.h
+@@ -1248,10 +1257,10 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f mediatypesview.moc statusview.moc templateview.moc artsactions.moc audiomanager.moc artscontrolapplet.moc midimanagerview.moc choosebusdlg.moc main.moc midiinstdlg.moc midiportdlg.moc environmentview.moc levelmeters.moc fftscopeview.moc artscontrolapplet_private.moc
++ -rm -f mediatypesview.moc statusview.moc templateview.moc artsactions.moc audiomanager.moc midimanagerview.moc artscontrolapplet.moc choosebusdlg.moc main.moc midiinstdlg.moc midiportdlg.moc environmentview.moc levelmeters.moc fftscopeview.moc artscontrolapplet_private.moc
+
+ #>+ 2
+-KDE_DIST=artscontrolapplet_private.h midiportdlg.h artsactions.h artscontrol.desktop audiomanager.h levelmeters.h midiinstdlg.h main.h midimanagerdlg.ui artscontrolapplet.desktop midimanagerwidget.ui statusview.h artscontrolapplet.h environmentview.h templateview.h mediatypesview.h Makefile.in fftscopeview.h midimanagerview.h artsmidimanagerview.rc artscontrol.rc Makefile.am choosebusdlg.h
++KDE_DIST=artscontrolapplet_private.h midiportdlg.h artscontrolapplet.h environmentview.h templateview.h artsactions.h artscontrol.desktop audiomanager.h levelmeters.h midiinstdlg.h main.h midimanagerdlg.ui mediatypesview.h Makefile.in fftscopeview.h midimanagerview.h artsmidimanagerview.rc artscontrol.rc midimanagerwidget.ui artscontrolapplet.desktop statusview.h Makefile.am choosebusdlg.h
+
+ #>+ 5
+ clean-ui:
--- arts/tools/pics/Makefile.in
+++ arts/tools/pics/Makefile.in
@@ -103,6 +103,7 @@
@@ -5815,6 +6044,195 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -611,113 +620,113 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=cr64-action-artsaudiomanager.png crsc-action-artsmidimanager.svgz cr22-action-artsfftscope.png cr22-action-artsenvironment.png cr32-action-artsfftscope.png cr22-action-artsmediatypes.png cr48-action-artsmediatypes.png hi22-app-artscontrol.png cr64-action-artsmediatypes.png cr64-action-artsfftscope.png cr48-action-artsfftscope.png cr128-action-artsenvironment.png cr32-action-artsmidimanager.png hi32-app-artscontrol.png cr32-action-artsenvironment.png hi16-app-artscontrol.png crsc-action-artsmediatypes.svgz cr16-action-artsaudiomanager.png cr32-action-artsaudiomanager.png cr64-action-artsenvironment.png cr48-action-artsaudiomanager.png hisc-app-artscontrol.svgz cr16-action-artsmidimanager.png cr16-action-artsenvironment.png cr48-action-artsenvironment.png cr128-action-artsfftscope.png crsc-action-artsenvironment.svgz cr32-action-artsmediatypes.png cr64-action-artsmidimanager.png cr16-action-artsfftscope.png cr22-action-artsmidimanager.png crsc-action-artsaudiomanager.svgz hi48-app-artscontrol.png hi64-app-artscontrol.png cr128-action-artsaudiomanager.png Makefile.in cr48-action-artsmidimanager.png cr16-action-artsmediatypes.png crsc-action-artsfftscope.svgz cr128-action-artsmidimanager.png cr22-action-artsaudiomanager.png Makefile.am cr128-action-artsmediatypes.png hi128-app-artscontrol.png
++KDE_DIST=cr48-action-artsaudiomanager.png hisc-app-artscontrol.svgz cr16-action-artsmidimanager.png cr64-action-artsaudiomanager.png crsc-action-artsmidimanager.svgz cr16-action-artsenvironment.png cr22-action-artsfftscope.png cr22-action-artsenvironment.png cr32-action-artsfftscope.png cr48-action-artsenvironment.png cr22-action-artsmediatypes.png cr128-action-artsfftscope.png crsc-action-artsenvironment.svgz cr32-action-artsmediatypes.png cr64-action-artsmidimanager.png cr48-action-artsmediatypes.png hi22-app-artscontrol.png cr64-action-artsmediatypes.png cr64-action-artsfftscope.png cr48-action-artsfftscope.png cr16-action-artsfftscope.png cr22-action-artsmidimanager.png crsc-action-artsaudiomanager.svgz cr128-action-artsenvironment.png hi48-app-artscontrol.png hi64-app-artscontrol.png cr32-action-artsmidimanager.png cr128-action-artsaudiomanager.png Makefile.in cr48-action-artsmidimanager.png cr16-action-artsmediatypes.png cr32-action-artsenvironment.png hi32-app-artscontrol.png crsc-action-artsfftscope.svgz cr128-action-artsmidimanager.png hi16-app-artscontrol.png crsc-action-artsmediatypes.svgz cr32-action-artsaudiomanager.png cr16-action-artsaudiomanager.png cr22-action-artsaudiomanager.png cr64-action-artsenvironment.png Makefile.am cr128-action-artsmediatypes.png hi128-app-artscontrol.png
+
+ #>+ 2
+ docs-am:
+
+ #>+ 102
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+- $(INSTALL_DATA) $(srcdir)/hisc-app-artscontrol.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/artscontrol.svgz
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-artscontrol.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/artscontrol.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions
++ $(INSTALL_DATA) $(srcdir)/cr22-action-artsaudiomanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsaudiomanager.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions
+ $(INSTALL_DATA) $(srcdir)/crsc-action-artsaudiomanager.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsaudiomanager.svgz
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions
+- $(INSTALL_DATA) $(srcdir)/cr128-action-artsaudiomanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsaudiomanager.png
+- $(INSTALL_DATA) $(srcdir)/cr128-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsenvironment.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsmidimanager.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions
++ $(INSTALL_DATA) $(srcdir)/cr64-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsmidimanager.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions
+- $(INSTALL_DATA) $(srcdir)/cr32-action-artsaudiomanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsaudiomanager.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsmediatypes.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions
++ $(INSTALL_DATA) $(srcdir)/cr48-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsmidimanager.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-artsfftscope.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsfftscope.svgz
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
+ $(INSTALL_DATA) $(srcdir)/cr16-action-artsaudiomanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsaudiomanager.png
+- $(INSTALL_DATA) $(srcdir)/crsc-action-artsfftscope.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsfftscope.svgz
+- $(INSTALL_DATA) $(srcdir)/cr128-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsmidimanager.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions
+- $(INSTALL_DATA) $(srcdir)/cr22-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsenvironment.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions
++ $(INSTALL_DATA) $(srcdir)/cr128-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsfftscope.png
++ $(INSTALL_DATA) $(srcdir)/cr64-action-artsaudiomanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsaudiomanager.png
++ $(INSTALL_DATA) $(srcdir)/cr128-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsmediatypes.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-artsmediatypes.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsmediatypes.svgz
++ $(INSTALL_DATA) $(srcdir)/cr22-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsfftscope.png
++ $(INSTALL_DATA) $(srcdir)/cr128-action-artsaudiomanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsaudiomanager.png
++ $(INSTALL_DATA) $(srcdir)/cr64-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsfftscope.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsfftscope.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsmediatypes.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/hi32-app-artscontrol.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/artscontrol.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/hi128-app-artscontrol.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/artscontrol.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
++ $(INSTALL_DATA) $(srcdir)/hi64-app-artscontrol.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/artscontrol.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsmediatypes.png
+- $(INSTALL_DATA) $(srcdir)/crsc-action-artsmidimanager.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsmidimanager.svgz
++ $(INSTALL_DATA) $(srcdir)/cr128-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsenvironment.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-artscontrol.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/artscontrol.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
++ $(INSTALL_DATA) $(srcdir)/hisc-app-artscontrol.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/artscontrol.svgz
+ $(INSTALL_DATA) $(srcdir)/cr32-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsenvironment.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-artsaudiomanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsaudiomanager.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsenvironment.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsfftscope.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions
++ $(INSTALL_DATA) $(srcdir)/crsc-action-artsmidimanager.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsmidimanager.svgz
+ $(INSTALL_DATA) $(srcdir)/cr64-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsmediatypes.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-artscontrol.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/artscontrol.png
++ $(INSTALL_DATA) $(srcdir)/cr128-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsmidimanager.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsfftscope.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-artsaudiomanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsaudiomanager.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsmidimanager.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsmidimanager.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-artsenvironment.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsenvironment.svgz
++ $(INSTALL_DATA) $(srcdir)/cr22-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsenvironment.png
+ $(INSTALL_DATA) $(srcdir)/cr64-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsenvironment.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions
+ $(INSTALL_DATA) $(srcdir)/cr48-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsmediatypes.png
+ $(INSTALL_DATA) $(srcdir)/cr48-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsenvironment.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsmidimanager.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsmidimanager.png
+- $(INSTALL_DATA) $(srcdir)/cr64-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsfftscope.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsfftscope.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/hi22-app-artscontrol.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/artscontrol.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsmidimanager.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsfftscope.png
+- $(INSTALL_DATA) $(srcdir)/cr64-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsmidimanager.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsmidimanager.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+- $(INSTALL_DATA) $(srcdir)/hi64-app-artscontrol.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/artscontrol.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/hi48-app-artscontrol.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/artscontrol.png
+- $(INSTALL_DATA) $(srcdir)/cr128-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsmediatypes.png
+- $(INSTALL_DATA) $(srcdir)/crsc-action-artsenvironment.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsenvironment.svgz
+- $(INSTALL_DATA) $(srcdir)/crsc-action-artsmediatypes.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsmediatypes.svgz
+- $(INSTALL_DATA) $(srcdir)/cr22-action-artsaudiomanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsaudiomanager.png
+- $(INSTALL_DATA) $(srcdir)/cr128-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsfftscope.png
+- $(INSTALL_DATA) $(srcdir)/cr64-action-artsaudiomanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsaudiomanager.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-artsaudiomanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsaudiomanager.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsmediatypes.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/hi128-app-artscontrol.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/artscontrol.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsmediatypes.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsfftscope.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsfftscope.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/hi32-app-artscontrol.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/artscontrol.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/artscontrol.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/artscontrol.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsaudiomanager.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsaudiomanager.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsaudiomanager.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsenvironment.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsaudiomanager.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsaudiomanager.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsmidimanager.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsmidimanager.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsmediatypes.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsmidimanager.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsfftscope.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsmidimanager.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsenvironment.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsaudiomanager.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsfftscope.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsaudiomanager.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsmediatypes.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsmediatypes.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsfftscope.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsaudiomanager.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsfftscope.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsfftscope.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsmediatypes.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/artscontrol.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/artscontrol.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/artscontrol.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsmediatypes.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsmidimanager.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsenvironment.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/artscontrol.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/artscontrol.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsenvironment.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsaudiomanager.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsenvironment.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsfftscope.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsmidimanager.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsmediatypes.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/artscontrol.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsmidimanager.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsfftscope.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsaudiomanager.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsmidimanager.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsmidimanager.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsenvironment.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsenvironment.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsenvironment.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsmediatypes.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsenvironment.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsmidimanager.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsmidimanager.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsfftscope.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/artscontrol.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsmidimanager.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsfftscope.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsmidimanager.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsmidimanager.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/artscontrol.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/artscontrol.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsmediatypes.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsenvironment.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsmediatypes.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsaudiomanager.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsfftscope.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsaudiomanager.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsaudiomanager.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsmediatypes.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/artscontrol.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsmediatypes.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsfftscope.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsfftscope.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/artscontrol.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/artscontrol.png
+
+ #>+ 15
+ force-reedit:
--- audiofile_artsplugin/Makefile.in
+++ audiofile_artsplugin/Makefile.in
@@ -154,6 +154,7 @@
@@ -5914,6 +6332,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -862,7 +871,7 @@
+
+
+ #>+ 2
+-KDE_DIST=configure.in.bot audiofilearts.idl configure.in.in Makefile.in audiofilePlayObject.mcopclass Makefile.am
++KDE_DIST=configure.in.bot configure.in.in audiofilearts.idl Makefile.in audiofilePlayObject.mcopclass Makefile.am
+
+ #>+ 3
+ clean-closures:
--- config.h.in
+++ config.h.in
@@ -269,9 +269,6 @@
@@ -5961,7 +6388,7 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
-+# Generated by GNU Autoconf 2.59d.
++# Generated by GNU Autoconf 2.59e.
#
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -6502,7 +6929,7 @@
-' ECHO_T=' ' ;;
- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
-+if (dirname -- /) >/dev/null 2>&1; then
++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
+else
+ as_dirname=false
@@ -7696,7 +8123,7 @@
if $ac_init_version; then
cat <<\_ACEOF
+configure
-+generated by GNU Autoconf 2.59d
++generated by GNU Autoconf 2.59e
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -7715,7 +8142,7 @@
It was created by $as_me, which was
-generated by GNU Autoconf 2.59. Invocation command line was
-+generated by GNU Autoconf 2.59d. Invocation command line was
++generated by GNU Autoconf 2.59e. Invocation command line was
$ $0 $@
@@ -7741,7 +8168,15 @@
} >&5
-@@ -1300,7 +1964,7 @@
+@@ -1289,7 +1953,6 @@
+ ac_configure_args=
+ ac_configure_args0=
+ ac_configure_args1=
+-ac_sep=
+ ac_must_keep_next=false
+ for ac_pass in 1 2
+ do
+@@ -1300,7 +1963,7 @@
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
continue ;;
@@ -7750,7 +8185,18 @@
ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
-@@ -1335,8 +1999,8 @@
+@@ -1322,9 +1985,7 @@
+ -* ) ac_must_keep_next=true ;;
+ esac
+ fi
+- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+- # Get rid of the leading space.
+- ac_sep=" "
++ ac_configure_args="$ac_configure_args '$ac_arg'"
+ ;;
+ esac
+ done
+@@ -1335,8 +1996,8 @@
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
# would cause problems or look ugly.
@@ -7761,7 +8207,7 @@
trap 'exit_status=$?
# Save into config.log some information that might help in debugging.
{
-@@ -1349,20 +2013,34 @@
+@@ -1349,20 +2010,34 @@
_ASBOX
echo
# The following way of writing the cache mishandles newlines in values,
@@ -7806,13 +8252,16 @@
echo
cat <<\_ASBOX
-@@ -1373,22 +2051,22 @@
+@@ -1373,22 +2048,28 @@
echo
for ac_var in $ac_subst_vars
do
- eval ac_val=$`echo $ac_var`
- echo "$ac_var='"'"'$ac_val'"'"'"
+ eval ac_val=\$$ac_var
++ case $ac_val in
++ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
++ esac
+ echo "$ac_var='\''$ac_val'\''"
done | sort
echo
@@ -7832,11 +8281,14 @@
- eval ac_val=$`echo $ac_var`
- echo "$ac_var='"'"'$ac_val'"'"'"
+ eval ac_val=\$$ac_var
++ case $ac_val in
++ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
++ esac
+ echo "$ac_var='\''$ac_val'\''"
done | sort
echo
fi
-@@ -1400,26 +2078,24 @@
+@@ -1400,26 +2081,24 @@
## ----------- ##
_ASBOX
echo
@@ -7868,7 +8320,7 @@
# Predefined preprocessor variables.
-@@ -1450,14 +2126,17 @@
+@@ -1450,14 +2129,17 @@
# Let the site file select an alternate cache file if it wants to.
# Prefer explicitly selected file to automatically selected ones.
@@ -7893,7 +8345,7 @@
if test -r "$ac_site_file"; then
{ echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
echo "$as_me: loading site script $ac_site_file" >&6;}
-@@ -1473,8 +2152,8 @@
+@@ -1473,8 +2155,8 @@
{ echo "$as_me:$LINENO: loading cache $cache_file" >&5
echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
@@ -7904,7 +8356,7 @@
esac
fi
else
-@@ -1486,12 +2165,11 @@
+@@ -1486,12 +2168,11 @@
# Check that the precious variables saved in the cache have kept the same
# value.
ac_cache_corrupted=false
@@ -7920,7 +8372,7 @@
case $ac_old_set,$ac_new_set in
set,)
{ echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-@@ -1516,8 +2194,7 @@
+@@ -1516,8 +2197,7 @@
# Pass precious variables to config.status.
if test "$ac_new_set" = set; then
case $ac_new_val in
@@ -7930,7 +8382,7 @@
*) ac_arg=$ac_var=$ac_new_val ;;
esac
case " $ac_configure_args " in
-@@ -1534,12 +2211,6 @@
+@@ -1534,12 +2214,6 @@
{ (exit 1); exit 1; }; }
fi
@@ -7943,7 +8395,7 @@
-@@ -1556,110 +2227,165 @@
+@@ -1556,110 +2230,165 @@
@@ -8161,7 +8613,7 @@
# The aliases save the names the user supplied, while $host etc.
-@@ -1669,17 +2395,17 @@
+@@ -1669,17 +2398,17 @@
NONENONEs,x,x, &&
program_prefix=${target_alias}-
test "$program_prefix" != NONE &&
@@ -8182,7 +8634,7 @@
am__api_version="1.9"
-@@ -1701,8 +2427,8 @@
+@@ -1701,8 +2430,8 @@
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
@@ -8193,7 +8645,7 @@
if test -z "$INSTALL"; then
if test "${ac_cv_path_install+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1724,7 +2450,7 @@
+@@ -1724,7 +2453,7 @@
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8202,7 +8654,7 @@
if test $ac_prog = install &&
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
-@@ -1743,21 +2469,22 @@
+@@ -1743,21 +2472,22 @@
;;
esac
done
@@ -8230,7 +8682,7 @@
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
-@@ -1771,8 +2498,8 @@
+@@ -1771,8 +2501,8 @@
if test -z "$kde_save_INSTALL_given" ; then
# OK, user hasn't given any INSTALL, autoconf found one for us
# now we test, if it supports the -p flag
@@ -8241,7 +8693,7 @@
rm -f confinst.$$.* > /dev/null 2>&1
echo "Testtest" > confinst.$$.orig
ac_res=no
-@@ -1784,8 +2511,8 @@
+@@ -1784,8 +2514,8 @@
fi
fi
rm -f confinst.$$.*
@@ -8252,7 +8704,7 @@
fi
if test -z "$kde_save_INSTALL_PROGRAM_given" ; then
-@@ -1795,8 +2522,8 @@
+@@ -1795,8 +2525,8 @@
INSTALL_SCRIPT='${INSTALL}'
fi
@@ -8263,7 +8715,7 @@
# Just in case
sleep 1
echo timestamp > conftest.file
-@@ -1838,8 +2565,8 @@
+@@ -1838,8 +2568,8 @@
Check your system clock" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -8274,7 +8726,7 @@
# expand $ac_aux_dir to an absolute path
am_aux_dir=`cd $ac_aux_dir && pwd`
-@@ -1890,8 +2617,8 @@
+@@ -1890,8 +2620,8 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -8285,7 +8737,7 @@
if test "${ac_cv_prog_AWK+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -1904,41 +2631,44 @@
+@@ -1904,54 +2634,57 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8320,10 +8772,11 @@
-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
+-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
+-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
- set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
--if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
++set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/^a-zA-Z0-9_/_/g'`
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -8331,21 +8784,27 @@
+SHELL = /bin/sh
all:
- @echo 'ac_maketemp="$(MAKE)"'
-+ @echo 'ac_maketemp=X"$(MAKE)"'
++ @echo '@@@%%%=$(MAKE)=@@@%%%'
_ACEOF
# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
- eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
+-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-+if test "$ac_maketemp" != X ; then
- eval ac_cv_prog_make_${ac_make}_set=yes
- else
- eval ac_cv_prog_make_${ac_make}_set=no
-@@ -1946,12 +2676,12 @@
+- eval ac_cv_prog_make_${ac_make}_set=yes
+-else
+- eval ac_cv_prog_make_${ac_make}_set=no
+-fi
++case `${MAKE-make} -f conftest.make 2>/dev/null` in
++ *@@@%%%=?*=@@@%%%*)
++ eval ac_cv_prog_make_${ac_make}_set=yes;;
++ *)
++ eval ac_cv_prog_make_${ac_make}_set=no;;
++esac
rm -f conftest.make
fi
- if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
++if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
SET_MAKE=
@@ -8357,7 +8816,7 @@
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -2022,8 +2752,8 @@
+@@ -2022,8 +2755,8 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -8368,7 +8827,7 @@
if test "${ac_cv_prog_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2036,32 +2766,34 @@
+@@ -2036,32 +2769,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8410,7 +8869,7 @@
if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2074,27 +2806,41 @@
+@@ -2074,27 +2809,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8459,7 +8918,7 @@
else
STRIP="$ac_cv_prog_STRIP"
fi
-@@ -2114,6 +2860,31 @@
+@@ -2114,6 +2863,31 @@
@@ -8491,7 +8950,7 @@
unset CDPATH
-@@ -2132,14 +2903,14 @@
+@@ -2132,14 +2906,14 @@
if test "x$prefix" = "xNONE"; then
@@ -8509,7 +8968,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2182,8 +2953,8 @@
+@@ -2182,8 +2956,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -8520,7 +8979,7 @@
{ { echo "$as_me:$LINENO: error: The important program kde-config was not found!
Please check whether you installed KDE correctly.
-@@ -2194,8 +2965,8 @@
+@@ -2194,8 +2968,8 @@
{ (exit 1); exit 1; }; }
else
@@ -8531,7 +8990,7 @@
KDECONFIG=$kde_cv_path
fi
-@@ -2204,14 +2975,14 @@
+@@ -2204,14 +2978,14 @@
kde_save_PATH="$PATH"
PATH="$exec_prefix/bin:$prefix/bin:$PATH"
@@ -8549,7 +9008,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2254,8 +3025,8 @@
+@@ -2254,8 +3028,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -8560,7 +9019,7 @@
{ { echo "$as_me:$LINENO: error: The important program kde-config was not found!
Please check whether you installed KDE correctly.
-@@ -2266,8 +3037,8 @@
+@@ -2266,8 +3040,8 @@
{ (exit 1); exit 1; }; }
else
@@ -8571,7 +9030,7 @@
KDECONFIG=$kde_cv_path
fi
-@@ -2290,16 +3061,16 @@
+@@ -2290,16 +3064,16 @@
kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
kde_libs_suffix=`$KDECONFIG --libsuffix` || kde_libs_suffix=auto
@@ -8594,7 +9053,7 @@
fi
# And delete superfluous '/' to make compares easier
-@@ -2312,13 +3083,13 @@
+@@ -2312,13 +3086,13 @@
@@ -8612,7 +9071,7 @@
val=
-@@ -2335,11 +3106,11 @@
+@@ -2335,11 +3109,11 @@
@@ -8626,7 +9085,7 @@
am_make=${MAKE-make}
-@@ -2349,8 +3120,8 @@
+@@ -2349,8 +3123,8 @@
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -8637,7 +9096,7 @@
am__include="#"
am__quote=
_am_result=none
-@@ -2377,15 +3148,15 @@
+@@ -2377,15 +3151,15 @@
fi
@@ -8658,7 +9117,7 @@
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
-@@ -2405,10 +3176,9 @@
+@@ -2405,10 +3179,9 @@
@@ -8671,7 +9130,7 @@
case $enableval in
yes)
kde_use_debug_code="yes"
-@@ -2428,18 +3198,18 @@
+@@ -2428,18 +3201,18 @@
kde_use_debug_code="no"
kde_use_debug_define=no
@@ -8697,7 +9156,7 @@
if test $enableval = "no"; then
kde_use_strict_options="no"
else
-@@ -2448,12 +3218,12 @@
+@@ -2448,12 +3221,12 @@
else
kde_use_strict_options="no"
@@ -8714,7 +9173,7 @@
if test $enableval = "no"; then
kde_use_warnings="no"
else
-@@ -2462,20 +3232,21 @@
+@@ -2462,20 +3235,21 @@
else
kde_use_warnings="yes"
@@ -8741,7 +9200,7 @@
CFLAGS=" $CFLAGS"
-@@ -2487,8 +3258,8 @@
+@@ -2487,8 +3261,8 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -8752,7 +9211,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2501,32 +3272,34 @@
+@@ -2501,32 +3275,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8794,7 +9253,7 @@
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2539,36 +3312,51 @@
+@@ -2539,36 +3315,51 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8856,7 +9315,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2581,74 +3369,34 @@
+@@ -2581,74 +3372,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8940,7 +9399,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2662,7 +3410,7 @@
+@@ -2662,7 +3413,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8949,7 +9408,7 @@
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
-@@ -2673,6 +3421,7 @@
+@@ -2673,6 +3424,7 @@
fi
done
done
@@ -8957,7 +9416,7 @@
if test $ac_prog_rejected = yes; then
# We found a bogon in the path, so make sure we never use it.
-@@ -2690,22 +3439,23 @@
+@@ -2690,22 +3442,23 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -8988,7 +9447,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2718,36 +3468,38 @@
+@@ -2718,36 +3471,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -9035,7 +9494,7 @@
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2760,29 +3512,45 @@
+@@ -2760,29 +3515,45 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -9087,7 +9546,7 @@
fi
fi
-@@ -2795,25 +3563,38 @@
+@@ -2795,21 +3566,35 @@
{ (exit 1); exit 1; }; }
# Provide some information about the compiler.
@@ -9097,53 +9556,41 @@
ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
- (eval $ac_compiler --version </dev/null >&5) 2>&5
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version >&5\"") >&5
-+ (eval $ac_compiler --version >&5) 2>&5
++{ (ac_try="$ac_compiler --version >&5"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compiler --version >&5") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
- (eval $ac_compiler -v </dev/null >&5) 2>&5
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v >&5\"") >&5
-+ (eval $ac_compiler -v >&5) 2>&5
++{ (ac_try="$ac_compiler -v >&5"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compiler -v >&5") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
- (eval $ac_compiler -V </dev/null >&5) 2>&5
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V >&5\"") >&5
-+ (eval $ac_compiler -V >&5) 2>&5
++{ (ac_try="$ac_compiler -V >&5"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compiler -V >&5") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-
-+
-+# List of possible output files. We want to start from the most likely,
-+# but we have to check foo.exe before foo, because Cygwin `test -f' looks
-+# also for foo.exe. b.out is created by i960 compilers.
-+# As a last resort, we also try wildcards: `conftest.*' and `a.*'.
-+# But we are not allowed to rm a.*, and we do not want always remove
-+# conftest.*, so we will list them literally, when appropriate.
-+ac_outfiles="a_out.exe a.out conftest.exe conftest a.exe b.out"
-+
-+# The IRIX 6 linker writes into existing files which may not be
-+# executable, retaining their permissions. Remove them first so a
-+# subsequent execution test works.
-+rm -f $ac_outfiles conftest.*
-+
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -2829,51 +3610,40 @@
- return 0;
- }
- _ACEOF
-+
- ac_clean_files_save=$ac_clean_files
--ac_clean_files="$ac_clean_files a.out a.exe b.out"
-+ac_clean_files="$ac_clean_files $ac_outfiles"
-+
-+# The following tests should remove their output except files matching conftest.*.
+@@ -2834,46 +3619,70 @@
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
@@ -9152,9 +9599,34 @@
+{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
+- (eval $ac_link_default) 2>&5
++#
++# List of possible output files, starting from the most likely.
++# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
++# only as a last resort. b.out is created by i960 compilers.
++ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
++#
++# The IRIX 6 linker writes into existing files which may not be
++# executable, retaining their permissions. Remove them first so a
++# subsequent execution test works.
++ac_rmfiles=
++for ac_file in $ac_files
++do
++ case $ac_file in
++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
++ * ) ac_rmfiles="$ac_rmfiles $ac_file";;
++ esac
++done
++rm -f $ac_rmfiles
+
- if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
- (eval $ac_link_default) 2>&5
++if { (ac_try="$ac_link_default"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link_default") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -9167,7 +9639,12 @@
-ac_cv_exeext=
-# b.out is created by i960 compilers.
-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
-+ for ac_file in $ac_outfiles a.* conftest.* NO
++ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
++# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
++# in a Makefile. We should not override ac_cv_exeext if it was cached,
++# so that the user can short-circuit this test for compilers unknown to
++# Autoconf.
++for ac_file in $ac_files
do
test -f "$ac_file" || continue
case $ac_file in
@@ -9175,47 +9652,47 @@
- ;;
- conftest.$ac_ext )
- # This is the source file.
-- ;;
-- [ab].out )
-- # We found the default executable, but exeext='' is most
-- # certainly right.
-- break;;
-- *.* )
++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+ ;;
+ [ab].out )
+ # We found the default executable, but exeext='' is most
+ # certainly right.
+ break;;
+ *.* )
- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- # FIXME: I believe we export ac_cv_exeext for Libtool,
- # but it would be cool to find out if it's true. Does anybody
- # maintain Libtool? --akim.
- export ac_cv_exeext
-- break;;
-- * )
-- break;;
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-+ * ) break;;
++ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
++ then :; else
++ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
++ fi
++ # We set ac_cv_exeext here because the later test for it is not
++ # safe: cross compilers may not add the suffix if given an `-o'
++ # argument, so we may need to know it at that point already.
++ # Even if this section looks crufty: it has the advantage of
++ # actually working.
+ break;;
+ * )
+ break;;
esac
done
-+if test "$ac_file" = NO; then
-+ { { echo "$as_me:$LINENO: error: no output file found
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: no output file found
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
++test "$ac_cv_exeext" = no && ac_cv_exeext=
+
-+
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -2885,14 +3655,12 @@
- { (exit 77); exit 77; }; }
+@@ -2886,19 +3695,23 @@
fi
--ac_exeext=$ac_cv_exeext
+ ac_exeext=$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6
--
--# Check the compiler produces executables we can run. If not, either
+{ echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6; }
+
+-# Check the compiler produces executables we can run. If not, either
+# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
@@ -9225,7 +9702,19 @@
# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
# If not cross compiling, check that we can run a simple program.
if test "$cross_compiling" != yes; then
-@@ -2917,83 +3685,84 @@
+ if { ac_try='./$ac_file'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -2917,22 +3730,27 @@
fi
fi
fi
@@ -9234,20 +9723,20 @@
+{ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
--rm -f a.out a.exe conftest$ac_cv_exeext b.out
--ac_clean_files=$ac_clean_files_save
+ rm -f a.out a.exe conftest$ac_cv_exeext b.out
+ ac_clean_files=$ac_clean_files_save
-# Check the compiler produces executables we can run. If not, either
--# the compiler is broken, or we cross compile.
++# Check that the compiler produces executables we can run. If not, either
+ # the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6
-+# Clean up; list also $ac_file, in case it matched a wildcard entry.
-+rm -f $ac_outfiles $ac_file
-
+-
-echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
+{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
@@ -9255,100 +9744,59 @@
+
+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
-+if test "${ac_cv_exeext+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
-- # If both `conftest.exe' and `conftest' are `present' (well, observable)
--# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
--# work properly (i.e., refer to `conftest.exe'), while it won't with
--# `rm'.
--for ac_file in conftest.exe conftest conftest.*; do
-- test -f "$ac_file" || continue
-- case $ac_file in
+@@ -2943,9 +3761,8 @@
+ for ac_file in conftest.exe conftest conftest.*; do
+ test -f "$ac_file" || continue
+ case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
-- *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- export ac_cv_exeext
-- break;;
-- * ) break;;
-- esac
--done
-+ # If both `conftest.exe' and `conftest' are `present' (well, observable),
-+ # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
-+ # work properly (i.e., refer to `conftest.exe'), while it won't with `rm'.
-+ for ac_file in conftest.exe conftest conftest.* NO; do
-+ test -f "$ac_file" || continue
-+ case $ac_file in
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-+ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-+ break;;
-+ * ) break;;
-+ esac
-+ done
-+ if test "$ac_file" = NO; then
-+ { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: no output file found
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute suffix of executables: no output file found
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+ # Clean up; list also $ac_file, in case it matched conftest.*.
-+ rm -f $ac_outfiles $ac_file
-+
- else
- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
- See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
-+
+ break;;
+ * ) break;;
+ esac
+@@ -2959,14 +3776,14 @@
fi
--rm -f conftest$ac_cv_exeext
+ rm -f conftest$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6
-
--rm -f conftest.$ac_ext
-+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+echo "${ECHO_T}$ac_cv_exeext" >&6; }
+
+ rm -f conftest.$ac_ext
EXEEXT=$ac_cv_exeext
ac_exeext=$EXEEXT
-echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
-+
-+
-+ac_clean_files=$ac_clean_files_save
-+
+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
if test "${ac_cv_objext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--int
--main ()
--{
--
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.o conftest.obj
-+ rm -f conftest.o conftest.obj
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+@@ -2986,14 +3803,20 @@
+ }
+ _ACEOF
+ rm -f conftest.o conftest.obj
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&5
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -9361,11 +9809,9 @@
*) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
break;;
esac
-@@ -3009,14 +3778,16 @@
- { (exit 1); exit 1; }; }
- fi
+@@ -3011,12 +3834,12 @@
--rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6
@@ -9375,15 +9821,57 @@
ac_objext=$OBJEXT
-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-+
-+
-+rm -f conftest.*
+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
if test "${ac_cv_c_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3065,24 +3836,28 @@
+@@ -3039,24 +3862,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -3065,24 +3900,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9419,7 +9907,52 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -3124,97 +3899,23 @@
+@@ -3098,24 +3937,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -3124,285 +3975,273 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9473,10 +10006,7 @@
- return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-+
-+int
-+main ()
- {
+-{
- char *s;
- va_list v;
- va_start (v,p);
@@ -9484,7 +10014,7 @@
- va_end (v);
- return s;
-}
-
+-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
- function prototypes and stuff, but not '\xHH' hex character constants.
- These don't provoke an error unfortunately, instead are silently treated
@@ -9493,17 +10023,18 @@
- array size at least. It's necessary to write '\x00'==0 to get something
- that's true only with -std1. */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
--
+
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
--int
--main ()
--{
+ int
+ main ()
+ {
-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
++
;
return 0;
}
@@ -9519,13 +10050,47 @@
-do
- CC="$ac_save_CC $ac_arg"
- rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
-@@ -3236,81 +3937,24 @@
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_prog_cc_stdc=$ac_arg
-break
@@ -9611,9 +10176,48 @@
;
return 0;
}
-@@ -3337,30 +3981,104 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- :
+ ac_cv_prog_cc_g=yes
@@ -9714,17 +10318,51 @@
}
_ACEOF
-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+ CC="$ac_save_CC $ac_arg"
+ rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
-@@ -3382,27 +4100,36 @@
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- break
+ ac_cv_prog_cc_c89=$ac_arg
@@ -9771,7 +10409,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3411,8 +4138,8 @@
+@@ -3411,8 +4250,8 @@
depcc="$CC" am_compiler_list=
@@ -9782,7 +10420,7 @@
if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3501,8 +4228,8 @@
+@@ -3501,8 +4340,8 @@
fi
fi
@@ -9793,7 +10431,7 @@
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -3524,8 +4251,8 @@
+@@ -3524,8 +4363,8 @@
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -9804,7 +10442,23 @@
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
-@@ -3585,9 +4312,10 @@
+@@ -3559,8 +4398,13 @@
+ #endif
+ Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -3585,9 +4429,10 @@
# Broken: fails on valid input.
continue
fi
@@ -9816,7 +10470,23 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3625,6 +4353,7 @@
+@@ -3597,8 +4442,13 @@
+ /* end confdefs.h. */
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -3625,6 +4475,7 @@
ac_preproc_ok=:
break
fi
@@ -9824,7 +10494,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -3642,8 +4371,8 @@
+@@ -3642,8 +4493,8 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -9835,7 +10505,23 @@
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
-@@ -3692,9 +4421,10 @@
+@@ -3666,8 +4517,13 @@
+ #endif
+ Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -3692,9 +4548,10 @@
# Broken: fails on valid input.
continue
fi
@@ -9847,7 +10533,23 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3732,6 +4462,7 @@
+@@ -3704,8 +4561,13 @@
+ /* end confdefs.h. */
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -3732,6 +4594,7 @@
ac_preproc_ok=:
break
fi
@@ -9855,7 +10557,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -3782,18 +4513,22 @@
+@@ -3782,18 +4645,22 @@
CXXFLAGS=" $CXXFLAGS"
@@ -9883,7 +10585,7 @@
if test "${ac_cv_prog_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3806,36 +4541,38 @@
+@@ -3806,36 +4673,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -9930,7 +10632,7 @@
if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3848,55 +4585,70 @@
+@@ -3848,55 +4717,85 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -9992,22 +10694,37 @@
ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
- (eval $ac_compiler --version </dev/null >&5) 2>&5
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version >&5\"") >&5
-+ (eval $ac_compiler --version >&5) 2>&5
++{ (ac_try="$ac_compiler --version >&5"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compiler --version >&5") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
- (eval $ac_compiler -v </dev/null >&5) 2>&5
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v >&5\"") >&5
-+ (eval $ac_compiler -v >&5) 2>&5
++{ (ac_try="$ac_compiler -v >&5"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compiler -v >&5") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
- (eval $ac_compiler -V </dev/null >&5) 2>&5
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V >&5\"") >&5
-+ (eval $ac_compiler -V >&5) 2>&5
++{ (ac_try="$ac_compiler -V >&5"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compiler -V >&5") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
@@ -10019,7 +10736,52 @@
if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3945,24 +4697,28 @@
+@@ -3919,24 +4818,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -3945,24 +4856,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10055,7 +10817,52 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -4004,47 +4760,18 @@
+@@ -3978,24 +4893,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -4004,70 +4931,53 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10107,7 +10914,50 @@
;
return 0;
}
-@@ -4076,20 +4803,19 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -4076,61 +4986,91 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10133,9 +10983,48 @@
;
return 0;
}
-@@ -4116,21 +4842,40 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- break
+ ac_cv_prog_cxx_g=yes
@@ -10146,9 +11035,6 @@
+
fi
+
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
@@ -10159,6 +11045,9 @@
fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
@@ -10181,7 +11070,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4139,8 +4884,8 @@
+@@ -4139,8 +5079,8 @@
depcc="$CXX" am_compiler_list=
@@ -10192,7 +11081,7 @@
if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -4229,8 +4974,8 @@
+@@ -4229,8 +5169,8 @@
fi
fi
@@ -10203,7 +11092,7 @@
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-@@ -4248,8 +4993,8 @@
+@@ -4248,8 +5188,8 @@
@@ -10214,7 +11103,52 @@
cat >conftest.$ac_ext <<_ACEOF
-@@ -4300,13 +5045,14 @@
+@@ -4274,24 +5214,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -4300,13 +5252,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10232,7 +11166,7 @@
if test "$kde_bad_compiler" = "yes"; then
{ { echo "$as_me:$LINENO: error:
-@@ -4348,17 +5094,16 @@
+@@ -4348,17 +5301,16 @@
fi
fi
@@ -10254,7 +11188,52 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4412,7 +5157,9 @@
+@@ -4386,24 +5338,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -4412,7 +5376,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10264,7 +11243,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -4426,29 +5173,28 @@
+@@ -4426,29 +5392,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10302,7 +11281,52 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4501,7 +5247,9 @@
+@@ -4475,24 +5440,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -4501,7 +5478,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10312,7 +11336,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -4515,13 +5263,13 @@
+@@ -4515,13 +5494,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10330,7 +11354,7 @@
:
WOVERLOADED_VRITUAL=""
fi
-@@ -4542,16 +5290,15 @@
+@@ -4542,16 +5521,15 @@
if test "$kde_use_profiling" = "yes"; then
@@ -10351,7 +11375,52 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4604,7 +5351,9 @@
+@@ -4578,24 +5556,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -4604,7 +5594,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10361,7 +11430,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -4618,16 +5367,16 @@
+@@ -4618,16 +5610,16 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10382,7 +11451,7 @@
:
fi
-@@ -4642,16 +5391,15 @@
+@@ -4642,16 +5634,15 @@
CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"
@@ -10403,7 +11472,52 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4704,7 +5452,9 @@
+@@ -4678,24 +5669,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -4704,7 +5707,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10413,7 +11527,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -4718,27 +5468,26 @@
+@@ -4718,27 +5723,26 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10448,7 +11562,52 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4789,7 +5538,9 @@
+@@ -4763,24 +5767,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -4789,7 +5805,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10458,7 +11617,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$save_CFLAGS"
-@@ -4803,13 +5554,13 @@
+@@ -4803,13 +5821,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then
@@ -10476,7 +11635,7 @@
:
fi
-@@ -4817,16 +5568,15 @@
+@@ -4817,16 +5835,15 @@
;;
esac
@@ -10497,7 +11656,52 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4879,7 +5629,9 @@
+@@ -4853,24 +5870,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -4879,7 +5908,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10507,7 +11711,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -4893,28 +5645,27 @@
+@@ -4893,28 +5924,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10544,7 +11748,52 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4967,7 +5718,9 @@
+@@ -4941,24 +5971,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -4967,7 +6009,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10554,7 +11803,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -4981,28 +5734,27 @@
+@@ -4981,28 +6025,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10591,7 +11840,52 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5055,7 +5807,9 @@
+@@ -5029,24 +6072,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -5055,7 +6110,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10601,7 +11895,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5069,13 +5823,13 @@
+@@ -5069,13 +6126,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10619,7 +11913,7 @@
:
fi
-@@ -5087,13 +5841,13 @@
+@@ -5087,13 +6144,13 @@
CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
fi
@@ -10637,7 +11931,7 @@
HAVE_GCC_VISIBILITY=0
-@@ -5101,16 +5855,15 @@
+@@ -5101,16 +6158,15 @@
if test "$GXX" = "yes"; then
gcc_no_reorder_blocks=NO
@@ -10658,7 +11952,52 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5163,7 +5916,9 @@
+@@ -5137,24 +6193,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -5163,7 +6231,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10668,7 +12007,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5177,13 +5932,13 @@
+@@ -5177,13 +6247,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10686,7 +12025,7 @@
:
fi
-@@ -5195,16 +5950,15 @@
+@@ -5195,16 +6265,15 @@
CFLAGS="$CFLAGS -fno-reorder-blocks"
fi
@@ -10707,7 +12046,52 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5257,7 +6011,9 @@
+@@ -5231,24 +6300,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -5257,7 +6338,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10717,7 +12101,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5271,28 +6027,27 @@
+@@ -5271,28 +6354,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10754,7 +12138,52 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5345,7 +6100,9 @@
+@@ -5319,24 +6401,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -5345,7 +6439,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10764,7 +12193,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5359,28 +6116,27 @@
+@@ -5359,28 +6455,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10801,7 +12230,52 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5433,7 +6189,9 @@
+@@ -5407,24 +6502,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -5433,7 +6540,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10811,7 +12285,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5447,28 +6205,27 @@
+@@ -5447,28 +6556,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10848,7 +12322,52 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5521,7 +6278,9 @@
+@@ -5495,24 +6603,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -5521,7 +6641,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10858,7 +12377,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5535,13 +6294,13 @@
+@@ -5535,13 +6657,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10876,7 +12395,7 @@
:
USE_EXCEPTIONS=
fi
-@@ -5549,37 +6308,37 @@
+@@ -5549,37 +6671,37 @@
ENABLE_PERMISSIVE_FLAG="-fpermissive"
if test "$kde_use_pch" = "yes"; then
@@ -10928,7 +12447,52 @@
if test "${kde_cv_opt_noinline_match+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5637,9 +6396,10 @@
+@@ -5611,24 +6733,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -5637,9 +6771,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10940,7 +12504,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-@@ -5647,8 +6407,8 @@
+@@ -5647,8 +6782,8 @@
fi
fi
@@ -10951,7 +12515,7 @@
if test "x$kde_cv_opt_noinline_match" = "xno" ; then
CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
-@@ -5668,16 +6428,15 @@
+@@ -5668,16 +6803,15 @@
if test "$kde_use_pch" = "yes"; then
@@ -10972,7 +12536,52 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5730,7 +6489,9 @@
+@@ -5704,24 +6838,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -5730,7 +6876,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10982,7 +12591,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5744,29 +6505,28 @@
+@@ -5744,29 +6892,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11020,7 +12629,52 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5819,7 +6579,9 @@
+@@ -5793,24 +6940,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -5819,7 +6978,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11030,7 +12684,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5833,28 +6595,27 @@
+@@ -5833,28 +6994,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11067,7 +12721,52 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5907,7 +6668,9 @@
+@@ -5881,24 +7041,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -5907,7 +7079,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11077,7 +12776,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5921,28 +6684,27 @@
+@@ -5921,28 +7095,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11114,7 +12813,52 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5995,7 +6757,9 @@
+@@ -5969,24 +7142,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -5995,7 +7180,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11124,7 +12868,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -6009,28 +6773,27 @@
+@@ -6009,28 +7196,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11161,7 +12905,52 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6083,7 +6846,9 @@
+@@ -6057,24 +7243,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -6083,7 +7281,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11171,7 +12960,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -6097,28 +6862,27 @@
+@@ -6097,28 +7297,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11208,7 +12997,52 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6171,7 +6935,9 @@
+@@ -6145,24 +7344,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -6171,7 +7382,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11218,7 +13052,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -6185,13 +6951,13 @@
+@@ -6185,13 +7398,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11236,7 +13070,7 @@
:
fi
-@@ -6298,13 +7064,13 @@
+@@ -6298,13 +7511,13 @@
fi
@@ -11253,7 +13087,23 @@
if test -z "$CXXCPP"; then
if test "${ac_cv_prog_CXXCPP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6360,9 +7126,10 @@
+@@ -6334,8 +7547,13 @@
+ #endif
+ Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -6360,9 +7578,10 @@
# Broken: fails on valid input.
continue
fi
@@ -11265,7 +13115,23 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -6400,6 +7167,7 @@
+@@ -6372,8 +7591,13 @@
+ /* end confdefs.h. */
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -6400,6 +7624,7 @@
ac_preproc_ok=:
break
fi
@@ -11273,7 +13139,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -6417,8 +7185,8 @@
+@@ -6417,8 +7642,8 @@
else
ac_cv_prog_CXXCPP=$CXXCPP
fi
@@ -11284,7 +13150,23 @@
ac_preproc_ok=false
for ac_cxx_preproc_warn_flag in '' yes
do
-@@ -6467,9 +7235,10 @@
+@@ -6441,8 +7666,13 @@
+ #endif
+ Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -6467,9 +7697,10 @@
# Broken: fails on valid input.
continue
fi
@@ -11296,7 +13178,23 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -6507,6 +7276,7 @@
+@@ -6479,8 +7710,13 @@
+ /* end confdefs.h. */
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -6507,6 +7743,7 @@
ac_preproc_ok=:
break
fi
@@ -11304,7 +13202,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -6533,16 +7303,15 @@
+@@ -6533,16 +7770,15 @@
NOOPT_CFLAGS=-O0
fi
@@ -11325,7 +13223,52 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6595,7 +7364,9 @@
+@@ -6569,24 +7805,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -6595,7 +7843,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11335,7 +13278,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -6609,22 +7380,21 @@
+@@ -6609,22 +7859,21 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11364,13 +13307,12 @@
if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then
ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
ac_coverage_linker="-lgcc"
-@@ -6640,36 +7410,36 @@
+@@ -6640,36 +7889,36 @@
CXXFLAGS="$CXXFLAGS $ac_coverage_compiler"
LDFLAGS="$LDFLAGS $ac_coverage_linker"
-fi;
+fi
-+
@@ -11378,6 +13320,7 @@
- # Check whether --enable-new_ldflags or --disable-new_ldflags was given.
++
+ # Check whether --enable-new_ldflags was given.
if test "${enable_new_ldflags+set}" = set; then
- enableval="$enable_new_ldflags"
@@ -11411,7 +13354,52 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6722,7 +7492,9 @@
+@@ -6696,24 +7945,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -6722,7 +7983,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11421,7 +13409,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -6736,29 +7508,28 @@
+@@ -6736,29 +7999,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11459,7 +13447,52 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6811,7 +7582,9 @@
+@@ -6785,24 +8047,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -6811,7 +8085,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11469,7 +13502,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -6825,13 +7598,13 @@
+@@ -6825,13 +8101,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11487,7 +13520,7 @@
:
fi
-@@ -6841,13 +7614,13 @@
+@@ -6841,13 +8117,13 @@
@@ -11505,7 +13538,7 @@
if test "x$kde_use_final" = "xyes"; then
KDE_USE_FINAL_TRUE=""
-@@ -6860,13 +7633,13 @@
+@@ -6860,13 +8136,13 @@
@@ -11523,7 +13556,7 @@
KDE_NO_UNDEFINED=""
if test "x$kde_use_closure" = "xyes"; then
-@@ -6877,198 +7650,19 @@
+@@ -6877,240 +8153,60 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -11538,16 +13571,17 @@
-else
-
-
--
++ fi
+
- ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--
+
-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--
--
+
+
- save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -Wl,--no-undefined"
- cat >conftest.$ac_ext <<_ACEOF
@@ -11556,7 +13590,7 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
--
+
-int
-main ()
-{
@@ -11588,11 +13622,15 @@
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- eval "kde_cv_prog_cxx_$kde_cache=yes"
--else
++ # Check whether --enable-nmcheck was given.
++if test "${enable_nmcheck+set}" = set; then
++ enableval=$enable_nmcheck; kde_use_nmcheck=$enableval
+ else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
--fi
++ kde_use_nmcheck=no
+ fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- CXXFLAGS="$save_CXXFLAGS"
@@ -11602,32 +13640,61 @@
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
--
+
-fi
--
+
-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- :
--
++ if test "$kde_use_nmcheck" = "yes"; then
++ KDE_USE_NMCHECK_TRUE=""
++ KDE_USE_NMCHECK_FALSE="#"
++ else
++ KDE_USE_NMCHECK_TRUE="#"
++ KDE_USE_NMCHECK_FALSE=""
++ fi
+
-echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--allow-shlib-undefined" >&5
-echo $ECHO_N "checking whether $CXX supports -Wl,--allow-shlib-undefined... $ECHO_C" >&6
-kde_cache=`echo Wl,--allow-shlib-undefined | sed 'y% .=/+-,%____p__%'`
-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
--
--
--
+
+
+
- ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--
+
-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--
--
+
++# Check whether --enable-shared was given.
++if test "${enable_shared+set}" = set; then
++ enableval=$enable_shared; p=${PACKAGE-default}
++ case $enableval in
++ yes) enable_shared=yes ;;
++ no) enable_shared=no ;;
++ *)
++ enable_shared=no
++ # Look at the argument we got. We use all the common list separators.
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++ for pkg in $enableval; do
++ IFS="$lt_save_ifs"
++ if test "X$pkg" = "X$p"; then
++ enable_shared=yes
++ fi
++ done
++ IFS="$lt_save_ifs"
++ ;;
++ esac
++else
++ enable_shared=yes
++fi
+
- save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -Wl,--allow-shlib-undefined"
- cat >conftest.$ac_ext <<_ACEOF
@@ -11636,7 +13703,7 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
--
+
-int
-main ()
-{
@@ -11706,48 +13773,58 @@
-
- ;;
- esac
- fi
-
-
-
-
-
+- fi
+-
+-
+-
+-
+-
- # Check whether --enable-nmcheck or --disable-nmcheck was given.
-+ # Check whether --enable-nmcheck was given.
- if test "${enable_nmcheck+set}" = set; then
+-if test "${enable_nmcheck+set}" = set; then
- enableval="$enable_nmcheck"
- kde_use_nmcheck=$enableval
-+ enableval=$enable_nmcheck; kde_use_nmcheck=$enableval
- else
- kde_use_nmcheck=no
+-else
+- kde_use_nmcheck=no
-fi;
-+fi
-+
-
- if test "$kde_use_nmcheck" = "yes"; then
- KDE_USE_NMCHECK_TRUE=""
-@@ -7083,10 +7677,9 @@
-
-
-
+-
+- if test "$kde_use_nmcheck" = "yes"; then
+- KDE_USE_NMCHECK_TRUE=""
+- KDE_USE_NMCHECK_FALSE="#"
+- else
+- KDE_USE_NMCHECK_TRUE="#"
+- KDE_USE_NMCHECK_FALSE=""
+- fi
+-
+-
+-
+-
+-
+-
-# Check whether --enable-shared or --disable-shared was given.
-+# Check whether --enable-shared was given.
- if test "${enable_shared+set}" = set; then
+-if test "${enable_shared+set}" = set; then
- enableval="$enable_shared"
- p=${PACKAGE-default}
-+ enableval=$enable_shared; p=${PACKAGE-default}
- case $enableval in
- yes) enable_shared=yes ;;
- no) enable_shared=no ;;
-@@ -7105,12 +7698,12 @@
- esac
- else
- enable_shared=yes
+- case $enableval in
+- yes) enable_shared=yes ;;
+- no) enable_shared=no ;;
+- *)
+- enable_shared=no
+- # Look at the argument we got. We use all the common list separators.
+- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+- for pkg in $enableval; do
+- IFS="$lt_save_ifs"
+- if test "X$pkg" = "X$p"; then
+- enable_shared=yes
+- fi
+- done
+- IFS="$lt_save_ifs"
+- ;;
+- esac
+-else
+- enable_shared=yes
-fi;
-+fi
-
+-
-# Check whether --enable-static or --disable-static was given.
-+
+# Check whether --enable-static was given.
if test "${enable_static+set}" = set; then
- enableval="$enable_static"
@@ -11756,7 +13833,7 @@
case $enableval in
yes) enable_static=yes ;;
no) enable_static=no ;;
-@@ -7129,7 +7722,8 @@
+@@ -7129,7 +8225,8 @@
esac
else
enable_static=no
@@ -11766,7 +13843,7 @@
-@@ -7138,11 +7732,11 @@
+@@ -7138,11 +8235,11 @@
if test -z "$kdelibsuff"; then
kdelibsuff="no"
fi
@@ -11782,7 +13859,7 @@
if test "$kdelibsuff" = "auto"; then
-@@ -7163,8 +7757,8 @@
+@@ -7163,8 +8260,8 @@
kdelibsuff=
fi
if test -z "$kdelibsuff"; then
@@ -11793,7 +13870,7 @@
cat >>confdefs.h <<\_ACEOF
#define KDELIBSUFF ""
-@@ -7180,14 +7774,13 @@
+@@ -7180,14 +8277,13 @@
#define KDELIBSUFF "${kdelibsuff}"
_ACEOF
@@ -11812,22 +13889,22 @@
case $enableval in
yes) enable_fast_install=yes ;;
no) enable_fast_install=no ;;
-@@ -7206,10 +7799,11 @@
+@@ -7206,10 +8302,11 @@
esac
else
enable_fast_install=yes
-fi;
+fi
-+
-echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6
++
+{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
if test "${lt_cv_path_SED+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7233,7 +7827,7 @@
+@@ -7233,7 +8330,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
@@ -11836,7 +13913,7 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7262,37 +7856,184 @@
+@@ -7262,37 +8359,184 @@
fi
SED=$lt_cv_path_SED
@@ -11844,18 +13921,12 @@
-echo "${ECHO_T}$SED" >&6
+{ echo "$as_me:$LINENO: result: $SED" >&5
+echo "${ECHO_T}$SED" >&6; }
-
--echo "$as_me:$LINENO: checking for egrep" >&5
--echo $ECHO_N "checking for egrep... $ECHO_C" >&6
--if test "${ac_cv_prog_egrep+set}" = set; then
++
+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
+if test "${ac_cv_path_GREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-- then ac_cv_prog_egrep='grep -E'
-- else ac_cv_prog_egrep='egrep'
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
+ # Extract the first word of "grep ggrep" to use in msg output
+if test -z "$GREP"; then
+set dummy grep ggrep; ac_prog_name=$2
@@ -11894,7 +13965,7 @@
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_GREP="$ac_path_GREP"
+ ac_path_GREP_max=$ac_count
- fi
++ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
@@ -11908,29 +13979,25 @@
+
+done
+IFS=$as_save_IFS
+
+-echo "$as_me:$LINENO: checking for egrep" >&5
+-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+-if test "${ac_cv_prog_egrep+set}" = set; then
+
++fi
+
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
--echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-- EGREP=$ac_cv_prog_egrep
-
+GREP="$ac_cv_path_GREP"
+if test -z "$GREP"; then
+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ { (exit 1); exit 1; }; }
+fi
-
++
+else
+ ac_cv_path_GREP=$GREP
+fi
-
--# Check whether --with-gnu-ld or --without-gnu-ld was given.
--if test "${with_gnu_ld+set}" = set; then
-- withval="$with_gnu_ld"
-- test "$withval" = no || with_gnu_ld=yes
+
++
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
@@ -11941,10 +14008,7 @@
+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- with_gnu_ld=no
--fi;
--ac_prog=ld
++else
+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+ then ac_cv_path_EGREP="$GREP -E"
+ else
@@ -11952,8 +14016,11 @@
+if test -z "$EGREP"; then
+set dummy egrep; ac_prog_name=$2
+if test "${ac_cv_path_EGREP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+- then ac_cv_prog_egrep='grep -E'
+- else ac_cv_prog_egrep='egrep'
+ ac_path_EGREP_found=false
+# Loop through the user's path and test for each of PROGNAME-LIST
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -11986,7 +14053,7 @@
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_EGREP="$ac_path_EGREP"
+ ac_path_EGREP_max=$ac_count
-+ fi
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
@@ -12017,21 +14084,28 @@
+
+
+ fi
-+fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
+-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+- EGREP=$ac_cv_prog_egrep
+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
-+
-+
-+
+
+
+
+-# Check whether --with-gnu-ld or --without-gnu-ld was given.
+# Check whether --with-gnu-ld was given.
-+if test "${with_gnu_ld+set}" = set; then
+ if test "${with_gnu_ld+set}" = set; then
+- withval="$with_gnu_ld"
+- test "$withval" = no || with_gnu_ld=yes
+ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-+else
-+ with_gnu_ld=no
+ else
+ with_gnu_ld=no
+-fi;
+fi
+
-+ac_prog=ld
+ ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
- echo "$as_me:$LINENO: checking for ld used by $CC" >&5
@@ -12041,7 +14115,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -7321,11 +8062,11 @@
+@@ -7321,11 +8565,11 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -12057,7 +14131,7 @@
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7338,7 +8079,7 @@
+@@ -7338,7 +8582,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,
@@ -12066,7 +14140,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'*)
-@@ -7358,21 +8099,21 @@
+@@ -7358,21 +8602,21 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -12095,7 +14169,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -7382,29 +8123,38 @@
+@@ -7382,29 +8626,38 @@
;;
esac
fi
@@ -12142,7 +14216,7 @@
if test "${lt_cv_path_NM+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7412,56 +8162,63 @@
+@@ -7412,56 +8665,63 @@
# Let the user override the test.
lt_cv_path_NM="$NM"
else
@@ -12240,7 +14314,7 @@
if test "${lt_cv_deplibs_check_method+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7488,44 +8245,36 @@
+@@ -7488,44 +8748,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -12295,7 +14369,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -7541,7 +8290,7 @@
+@@ -7541,7 +8793,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -12304,7 +14378,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
-@@ -7557,43 +8306,27 @@
+@@ -7557,43 +8809,27 @@
esac
;;
@@ -12361,7 +14435,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
-@@ -7612,32 +8345,22 @@
+@@ -7612,32 +8848,22 @@
;;
openbsd*)
@@ -12397,7 +14471,7 @@
case $host_vendor in
motorola)
lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-@@ -7658,17 +8381,20 @@
+@@ -7658,17 +8884,20 @@
siemens)
lt_cv_deplibs_check_method=pass_all
;;
@@ -12421,7 +14495,7 @@
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -7677,14 +8403,17 @@
+@@ -7677,14 +8906,17 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -12442,16 +14516,16 @@
test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
# Some flags need to be propagated to the compiler or linker for good
-@@ -7711,7 +8440,7 @@
+@@ -7711,7 +8943,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 7714 "configure"' > conftest.$ac_ext
-+ echo '#line 8443 "configure"' > conftest.$ac_ext
++ echo '#line 8946 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7754,14 +8483,13 @@
+@@ -7754,14 +8986,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -12468,7 +14542,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7773,7 +8501,6 @@
+@@ -7773,7 +9004,6 @@
esac
;;
*64-bit*)
@@ -12476,7 +14550,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7798,8 +8525,8 @@
+@@ -7798,8 +9028,8 @@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -12487,7 +14561,52 @@
if test "${lt_cv_cc_needs_belf+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7851,8 +8578,9 @@
+@@ -7825,24 +9055,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -7851,8 +9093,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12498,7 +14617,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
-@@ -7862,13 +8590,33 @@
+@@ -7862,13 +9105,33 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -12534,7 +14653,7 @@
esac
-@@ -7876,8 +8624,8 @@
+@@ -7876,8 +9139,8 @@
@@ -12545,7 +14664,52 @@
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7927,8 +8675,9 @@
+@@ -7901,24 +9164,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -7927,8 +9202,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12556,7 +14720,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
if test $ac_cv_header_stdc = yes; then
-@@ -7985,6 +8734,7 @@
+@@ -7985,6 +9261,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
@@ -12564,7 +14728,7 @@
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -8004,8 +8754,8 @@
+@@ -8004,18 +9281,27 @@
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
@@ -12575,7 +14739,30 @@
}
_ACEOF
rm -f conftest$ac_exeext
-@@ -8028,12 +8778,14 @@
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -8028,12 +9314,14 @@
( exit $ac_status )
ac_cv_header_stdc=no
fi
@@ -12593,7 +14780,7 @@
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -8056,9 +8808,9 @@
+@@ -8056,9 +9344,9 @@
inttypes.h stdint.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12606,7 +14793,52 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -8098,12 +8850,14 @@
+@@ -8072,24 +9360,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -8098,12 +9398,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12624,7 +14856,7 @@
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -8118,18 +8872,19 @@
+@@ -8118,18 +9420,19 @@
for ac_header in dlfcn.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12652,7 +14884,52 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8166,15 +8921,16 @@
+@@ -8140,24 +9443,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -8166,15 +9481,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12674,7 +14951,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8208,9 +8964,10 @@
+@@ -8183,8 +9499,13 @@
+ /* end confdefs.h. */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -8208,9 +9529,10 @@
ac_header_preproc=no
fi
@@ -12687,7 +14980,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8234,25 +8991,19 @@
+@@ -8234,25 +9556,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -12720,7 +15013,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -8264,17 +9015,258 @@
+@@ -8264,17 +9580,278 @@
done
@@ -12765,8 +15058,13 @@
+#endif
+ Syntax error
+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
@@ -12804,8 +15102,13 @@
+/* end confdefs.h. */
+#include <ac_nonexistent.h>
+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
@@ -12874,8 +15177,13 @@
+#endif
+ Syntax error
+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
@@ -12913,8 +15221,13 @@
+/* end confdefs.h. */
+#include <ac_nonexistent.h>
+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
@@ -12982,7 +15295,7 @@
if test "${ac_cv_prog_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8287,36 +9279,38 @@
+@@ -8287,36 +9864,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13029,7 +15342,7 @@
if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8329,48 +9323,63 @@
+@@ -8329,48 +9908,78 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13088,26 +15401,41 @@
ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
- (eval $ac_compiler --version </dev/null >&5) 2>&5
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version >&5\"") >&5
-+ (eval $ac_compiler --version >&5) 2>&5
++{ (ac_try="$ac_compiler --version >&5"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compiler --version >&5") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
- (eval $ac_compiler -v </dev/null >&5) 2>&5
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v >&5\"") >&5
-+ (eval $ac_compiler -v >&5) 2>&5
++{ (ac_try="$ac_compiler -v >&5"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compiler -v >&5") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
- (eval $ac_compiler -V </dev/null >&5) 2>&5
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V >&5\"") >&5
-+ (eval $ac_compiler -V >&5) 2>&5
++{ (ac_try="$ac_compiler -V >&5"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compiler -V >&5") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-@@ -8380,8 +9389,8 @@
+@@ -8380,8 +9989,8 @@
# input file. (Note that this only needs to work for GNU compilers.)
ac_save_ext=$ac_ext
ac_ext=F
@@ -13118,7 +15446,52 @@
if test "${ac_cv_f77_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8420,20 +9429,21 @@
+@@ -8394,24 +10003,36 @@
+ end
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_f77_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -8420,20 +10041,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -13145,7 +15518,52 @@
if test "${ac_cv_prog_f77_g+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8470,13 +9480,14 @@
+@@ -8444,24 +10066,36 @@
+ end
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_f77_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -8470,13 +10104,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -13163,7 +15581,7 @@
if test "$ac_test_FFLAGS" = set; then
FFLAGS=$ac_save_FFLAGS
elif test $ac_cv_prog_f77_g = yes; then
-@@ -8505,13 +9516,13 @@
+@@ -8505,13 +10140,13 @@
# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
# find the maximum length of command line arguments
@@ -13180,7 +15598,7 @@
case $build_os in
msdosdjgpp*)
-@@ -8540,20 +9551,70 @@
+@@ -8540,20 +10175,70 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -13257,7 +15675,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.
-@@ -8564,19 +9625,19 @@
+@@ -8564,19 +10249,19 @@
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -13283,7 +15701,7 @@
if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8590,9 +9651,6 @@
+@@ -8590,9 +10275,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
@@ -13293,7 +15711,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'"
-@@ -8614,14 +9672,30 @@
+@@ -8614,14 +10296,30 @@
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'"
;;
@@ -13326,7 +15744,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8639,14 +9713,17 @@
+@@ -8639,14 +10337,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -13346,7 +15764,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -8764,15 +9841,15 @@
+@@ -8764,15 +10465,15 @@
lt_cv_sys_global_symbol_to_cdecl=
fi
if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
@@ -13368,7 +15786,7 @@
if test "${lt_cv_objdir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8786,8 +9863,8 @@
+@@ -8786,8 +10487,8 @@
fi
rmdir .libs 2>/dev/null
fi
@@ -13379,7 +15797,7 @@
objdir=$lt_cv_objdir
-@@ -8808,7 +9885,7 @@
+@@ -8808,7 +10509,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -13388,7 +15806,7 @@
sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
-@@ -8828,7 +9905,7 @@
+@@ -8828,7 +10529,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -13397,7 +15815,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8838,8 +9915,8 @@
+@@ -8838,8 +10539,8 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -13408,7 +15826,7 @@
if test "${ac_cv_prog_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8852,32 +9929,34 @@
+@@ -8852,32 +10553,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13450,7 +15868,7 @@
if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8890,27 +9969,41 @@
+@@ -8890,27 +10593,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13499,7 +15917,7 @@
else
AR="$ac_cv_prog_AR"
fi
-@@ -8918,8 +10011,8 @@
+@@ -8918,8 +10635,8 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -13510,7 +15928,7 @@
if test "${ac_cv_prog_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8932,32 +10025,34 @@
+@@ -8932,32 +10649,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13552,7 +15970,7 @@
if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8970,27 +10065,41 @@
+@@ -8970,27 +10689,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13601,7 +16019,7 @@
else
RANLIB="$ac_cv_prog_RANLIB"
fi
-@@ -8998,8 +10107,8 @@
+@@ -8998,8 +10731,8 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -13612,7 +16030,7 @@
if test "${ac_cv_prog_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9012,32 +10121,34 @@
+@@ -9012,32 +10745,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13654,7 +16072,7 @@
if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9050,27 +10161,41 @@
+@@ -9050,27 +10785,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13703,7 +16121,7 @@
else
STRIP="$ac_cv_prog_STRIP"
fi
-@@ -9085,6 +10210,7 @@
+@@ -9085,6 +10834,7 @@
test -z "$AS" && AS=as
test -z "$CC" && CC=cc
test -z "$LTCC" && LTCC=$CC
@@ -13711,7 +16129,7 @@
test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$LD" && LD=ld
test -z "$LN_S" && LN_S="ln -s"
-@@ -9104,21 +10230,32 @@
+@@ -9104,21 +10854,32 @@
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
@@ -13748,7 +16166,7 @@
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9138,7 +10275,7 @@
+@@ -9138,7 +10899,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -13757,7 +16175,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
-@@ -9170,17 +10307,17 @@
+@@ -9170,17 +10931,17 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -13781,7 +16199,7 @@
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9200,7 +10337,7 @@
+@@ -9200,7 +10961,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -13790,7 +16208,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
-@@ -9232,11 +10369,11 @@
+@@ -9232,11 +10993,11 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -13806,7 +16224,7 @@
fi
else
-@@ -9251,21 +10388,21 @@
+@@ -9251,21 +11012,21 @@
enable_dlopen=yes
enable_win32_dll=no
@@ -13835,7 +16253,7 @@
test -z "$pic_mode" && pic_mode=default
# Use C for the default configuration in the libtool script
-@@ -9295,68 +10432,25 @@
+@@ -9295,68 +11056,25 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -13919,7 +16337,7 @@
## CAVEAT EMPTOR:
-@@ -9370,8 +10464,8 @@
+@@ -9370,8 +11088,8 @@
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -13930,7 +16348,7 @@
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9385,26 +10479,28 @@
+@@ -9385,26 +11103,28 @@
# 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 \
@@ -13939,12 +16357,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9391: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:10485: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11109: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9395: \$? = $ac_status" >&5
-+ echo "$as_me:10489: \$? = $ac_status" >&5
++ echo "$as_me:11113: \$? = $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
@@ -13966,7 +16384,7 @@
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-@@ -9418,8 +10514,8 @@
+@@ -9418,8 +11138,8 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -13977,7 +16395,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl='-Wl,'
-@@ -9457,6 +10553,11 @@
+@@ -9457,6 +11177,11 @@
lt_prog_compiler_pic='-fno-common'
;;
@@ -13989,7 +16407,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -9473,7 +10574,7 @@
+@@ -9473,7 +11198,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -13998,7 +16416,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9499,6 +10600,16 @@
+@@ -9499,6 +11224,16 @@
lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -14015,7 +16433,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -9510,7 +10621,7 @@
+@@ -9510,7 +11245,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.
@@ -14024,7 +16442,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9533,13 +10644,20 @@
+@@ -9533,13 +11268,20 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -14047,7 +16465,7 @@
ccc*)
lt_prog_compiler_wl='-Wl,'
# All Alpha code is PIC.
-@@ -9554,15 +10672,15 @@
+@@ -9554,15 +11296,15 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -14069,7 +16487,7 @@
;;
sunos4*)
-@@ -9571,7 +10689,7 @@
+@@ -9571,7 +11313,7 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -14078,7 +16496,7 @@
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
-@@ -9584,6 +10702,17 @@
+@@ -9584,6 +11326,17 @@
fi
;;
@@ -14096,7 +16514,7 @@
uts4*)
lt_prog_compiler_pic='-pic'
lt_prog_compiler_static='-Bstatic'
-@@ -9595,16 +10724,16 @@
+@@ -9595,16 +11348,16 @@
esac
fi
@@ -14117,7 +16535,7 @@
if test "${lt_prog_compiler_pic_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9618,26 +10747,28 @@
+@@ -9618,26 +11371,28 @@
# 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 \
@@ -14126,12 +16544,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9624: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:10753: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11377: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9628: \$? = $ac_status" >&5
-+ echo "$as_me:10757: \$? = $ac_status" >&5
++ echo "$as_me:11381: \$? = $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
@@ -14153,7 +16571,7 @@
if test x"$lt_prog_compiler_pic_works" = xyes; then
case $lt_prog_compiler_pic in
-@@ -9650,7 +10781,7 @@
+@@ -9650,7 +11405,7 @@
fi
fi
@@ -14162,7 +16580,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
-@@ -9660,8 +10791,50 @@
+@@ -9660,8 +11415,50 @@
;;
esac
@@ -14215,7 +16633,7 @@
if test "${lt_cv_prog_compiler_c_o+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9672,60 +10845,58 @@
+@@ -9672,60 +11469,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -14237,12 +16655,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9691: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:10857: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11481: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9695: \$? = $ac_status" >&5
-+ echo "$as_me:10861: \$? = $ac_status" >&5
++ echo "$as_me:11485: \$? = $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
@@ -14294,7 +16712,7 @@
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -9735,8 +10906,8 @@
+@@ -9735,8 +11530,8 @@
need_locks=no
fi
@@ -14305,7 +16723,7 @@
runpath_var=
allow_undefined_flag=
-@@ -9774,6 +10945,16 @@
+@@ -9774,6 +11569,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -14322,7 +16740,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -9784,6 +10965,10 @@
+@@ -9784,6 +11589,10 @@
with_gnu_ld=no
fi
;;
@@ -14333,7 +16751,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -9794,6 +10979,27 @@
+@@ -9794,6 +11603,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -14361,7 +16779,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -9831,7 +11037,7 @@
+@@ -9831,7 +11661,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -14370,7 +16788,7 @@
else
ld_shlibs=no
fi
-@@ -9841,13 +11047,13 @@
+@@ -9841,13 +11671,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'
@@ -14387,7 +16805,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
-@@ -9856,23 +11062,70 @@
+@@ -9856,23 +11686,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -14463,7 +16881,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs=no
cat <<EOF 1>&2
-@@ -9886,13 +11139,40 @@
+@@ -9886,13 +11763,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -14506,7 +16924,7 @@
sunos4*)
archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -9902,24 +11182,19 @@
+@@ -9902,24 +11806,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -14538,7 +16956,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9931,7 +11206,7 @@
+@@ -9931,7 +11830,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L=yes
@@ -14547,7 +16965,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct=unsupported
-@@ -9953,9 +11228,21 @@
+@@ -9953,9 +11852,21 @@
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
@@ -14571,7 +16989,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9972,7 +11259,7 @@
+@@ -9972,7 +11883,7 @@
link_all_deplibs=yes
if test "$GCC" = yes; then
@@ -14580,7 +16998,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`
-@@ -9991,8 +11278,12 @@
+@@ -9991,8 +11902,12 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_libdir_separator=
fi
@@ -14593,7 +17011,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -10000,22 +11291,23 @@
+@@ -10000,22 +11915,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -14624,7 +17042,52 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -10062,19 +11354,20 @@
+@@ -10031,24 +11947,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -10062,19 +11990,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -14649,7 +17112,52 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -10124,7 +11417,9 @@
+@@ -10093,24 +12022,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -10124,7 +12065,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -14659,7 +17167,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -10134,13 +11429,11 @@
+@@ -10134,13 +12077,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag=' ${wl}-bernotok'
allow_undefined_flag=' ${wl}-berok'
@@ -14676,7 +17184,7 @@
fi
fi
;;
-@@ -10153,7 +11446,7 @@
+@@ -10153,7 +12094,7 @@
ld_shlibs=no
;;
@@ -14685,7 +17193,7 @@
export_dynamic_flag_spec=-rdynamic
;;
-@@ -10163,13 +11456,13 @@
+@@ -10163,13 +12104,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -14702,7 +17210,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.
-@@ -10179,52 +11472,52 @@
+@@ -10179,52 +12120,52 @@
;;
darwin* | rhapsody*)
@@ -14795,7 +17303,7 @@
fi
;;
-@@ -10258,8 +11551,8 @@
+@@ -10258,8 +12199,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -14806,7 +17314,7 @@
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -10267,7 +11560,7 @@
+@@ -10267,7 +12208,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -14815,7 +17323,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
-@@ -10281,47 +11574,62 @@
+@@ -10281,47 +12222,62 @@
export_dynamic_flag_spec='${wl}-E'
;;
@@ -14902,7 +17410,7 @@
hardcode_direct=yes
export_dynamic_flag_spec='${wl}-E'
-@@ -10335,7 +11643,7 @@
+@@ -10335,7 +12291,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -14911,7 +17419,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'
-@@ -10345,7 +11653,7 @@
+@@ -10345,7 +12301,7 @@
link_all_deplibs=yes
;;
@@ -14920,7 +17428,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10368,7 +11676,8 @@
+@@ -10368,7 +12324,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
@@ -14930,7 +17438,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10378,7 +11687,7 @@
+@@ -10378,7 +12335,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -14939,7 +17447,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10389,14 +11698,14 @@
+@@ -10389,14 +12346,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -14956,7 +17464,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'
-@@ -10408,13 +11717,13 @@
+@@ -10408,13 +12365,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -14972,7 +17480,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10422,21 +11731,15 @@
+@@ -10422,21 +12379,15 @@
hardcode_libdir_separator=:
;;
@@ -14998,7 +17506,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'
-@@ -10445,8 +11748,18 @@
+@@ -10445,8 +12396,18 @@
hardcode_shlibpath_var=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -15019,7 +17527,7 @@
esac
link_all_deplibs=yes
;;
-@@ -10455,7 +11768,7 @@
+@@ -10455,7 +12416,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.
@@ -15028,7 +17536,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10503,36 +11816,45 @@
+@@ -10503,36 +12464,45 @@
fi
;;
@@ -15095,7 +17603,7 @@
;;
uts4*)
-@@ -10547,15 +11869,10 @@
+@@ -10547,15 +12517,10 @@
esac
fi
@@ -15113,7 +17621,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -10573,8 +11890,8 @@
+@@ -10573,8 +12538,8 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -15124,7 +17632,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -10588,6 +11905,7 @@
+@@ -10588,6 +12553,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl
@@ -15132,7 +17640,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -10610,20 +11928,20 @@
+@@ -10610,20 +12576,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -15158,7 +17666,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10633,7 +11951,20 @@
+@@ -10633,7 +12599,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -15180,7 +17688,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10698,7 +12029,7 @@
+@@ -10698,7 +12677,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -15189,7 +17697,7 @@
;;
beos*)
-@@ -10707,7 +12038,7 @@
+@@ -10707,7 +12686,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -15198,7 +17706,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10723,7 +12054,7 @@
+@@ -10723,7 +12702,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -15207,7 +17715,7 @@
need_version=no
need_lib_prefix=no
-@@ -10735,7 +12066,8 @@
+@@ -10735,7 +12714,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -15217,7 +17725,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -10765,7 +12097,7 @@
+@@ -10765,7 +12745,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -15226,7 +17734,7 @@
;;
esac
;;
-@@ -10788,7 +12120,7 @@
+@@ -10788,7 +12768,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -15235,7 +17743,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"`
-@@ -10811,20 +12143,17 @@
+@@ -10811,20 +12791,17 @@
dynamic_linker=no
;;
@@ -15267,7 +17775,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -10842,14 +12171,19 @@
+@@ -10842,14 +12819,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -15289,7 +17797,7 @@
esac
;;
-@@ -10869,9 +12203,9 @@
+@@ -10869,9 +12851,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -15301,7 +17809,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10886,7 +12220,7 @@
+@@ -10886,7 +12868,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -15310,7 +17818,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10897,7 +12231,7 @@
+@@ -10897,7 +12879,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -15319,7 +17827,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10909,6 +12243,18 @@
+@@ -10909,6 +12891,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -15338,7 +17846,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -10952,29 +12298,26 @@
+@@ -10952,29 +12946,26 @@
;;
# This must be Linux ELF.
@@ -15375,7 +17883,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,
-@@ -10984,6 +12327,18 @@
+@@ -10984,6 +12975,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -15394,7 +17902,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10993,7 +12348,7 @@
+@@ -10993,7 +12996,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -15403,7 +17911,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -11021,8 +12376,13 @@
+@@ -11021,8 +13024,13 @@
openbsd*)
version_type=sunos
@@ -15418,7 +17926,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
-@@ -11042,7 +12402,7 @@
+@@ -11042,7 +13050,7 @@
os2*)
libname_spec='$name'
@@ -15427,7 +17935,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -11060,13 +12420,6 @@
+@@ -11060,13 +13068,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -15441,7 +17949,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -11092,7 +12445,7 @@
+@@ -11092,7 +13093,7 @@
need_version=yes
;;
@@ -15450,7 +17958,7 @@
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
-@@ -11125,6 +12478,29 @@
+@@ -11125,6 +13126,29 @@
fi
;;
@@ -15480,7 +17988,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11136,16 +12512,21 @@
+@@ -11136,16 +13160,21 @@
dynamic_linker=no
;;
esac
@@ -15508,7 +18016,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct" != no &&
-@@ -11165,8 +12546,8 @@
+@@ -11165,8 +13194,8 @@
# directories.
hardcode_action=unsupported
fi
@@ -15519,7 +18027,7 @@
if test "$hardcode_action" = relink; then
# Fast installation is not supported
-@@ -11179,29 +12560,29 @@
+@@ -11179,29 +13208,29 @@
striplib=
old_striplib=
@@ -15559,7 +18067,7 @@
;;
esac
fi
-@@ -11233,8 +12614,8 @@
+@@ -11233,8 +13262,8 @@
darwin*)
# if libdl is installed we need to link against it
@@ -15570,7 +18078,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11247,17 +12628,17 @@
+@@ -11247,40 +13276,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -15592,7 +18100,50 @@
;
return 0;
}
-@@ -11289,14 +12670,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -11289,14 +13330,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15611,7 +18162,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -11310,8 +12692,8 @@
+@@ -11310,8 +13352,8 @@
;;
*)
@@ -15622,7 +18173,7 @@
if test "${ac_cv_func_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11338,30 +12720,24 @@
+@@ -11338,53 +13380,59 @@
#undef shl_load
@@ -15658,7 +18209,50 @@
;
return 0;
}
-@@ -11393,18 +12769,19 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -11393,18 +13441,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15683,7 +18277,7 @@
if test "${ac_cv_lib_dld_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11417,17 +12794,17 @@
+@@ -11417,40 +13466,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -15705,7 +18299,50 @@
;
return 0;
}
-@@ -11459,19 +12836,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -11459,19 +13520,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15731,7 +18368,7 @@
if test "${ac_cv_func_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11498,30 +12876,24 @@
+@@ -11498,53 +13560,59 @@
#undef dlopen
@@ -15767,7 +18404,50 @@
;
return 0;
}
-@@ -11553,18 +12925,19 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -11553,18 +13621,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15792,7 +18472,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11577,17 +12950,17 @@
+@@ -11577,40 +13646,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -15814,7 +18494,50 @@
;
return 0;
}
-@@ -11619,19 +12992,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -11619,19 +13700,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15840,7 +18563,7 @@
if test "${ac_cv_lib_svld_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11644,17 +13018,17 @@
+@@ -11644,40 +13726,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -15862,7 +18585,50 @@
;
return 0;
}
-@@ -11686,19 +13060,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -11686,19 +13780,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15888,7 +18654,7 @@
if test "${ac_cv_lib_dld_dld_link+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11711,17 +13086,17 @@
+@@ -11711,40 +13806,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -15910,7 +18676,50 @@
;
return 0;
}
-@@ -11753,14 +13128,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -11753,14 +13860,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15929,7 +18738,7 @@
if test $ac_cv_lib_dld_dld_link = yes; then
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
fi
-@@ -11795,13 +13171,13 @@
+@@ -11795,13 +13903,13 @@
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
save_LDFLAGS="$LDFLAGS"
@@ -15946,16 +18755,16 @@
if test "${lt_cv_dlopen_self+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11811,7 +13187,7 @@
+@@ -11811,7 +13919,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11814 "configure"
-+#line 13190 "configure"
++#line 13922 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11868,6 +13244,8 @@
+@@ -11868,6 +13976,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -15964,7 +18773,7 @@
exit (status);
}
-@@ -11877,12 +13255,12 @@
+@@ -11877,12 +13987,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -15979,7 +18788,7 @@
esac
else :
# compilation failed
-@@ -11893,13 +13271,13 @@
+@@ -11893,13 +14003,13 @@
fi
@@ -15998,16 +18807,16 @@
if test "${lt_cv_dlopen_self_static+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11909,7 +13287,7 @@
+@@ -11909,7 +14019,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11912 "configure"
-+#line 13290 "configure"
++#line 14022 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11966,6 +13344,8 @@
+@@ -11966,6 +14076,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -16016,7 +18825,7 @@
exit (status);
}
-@@ -11975,12 +13355,12 @@
+@@ -11975,12 +14087,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -16031,7 +18840,7 @@
esac
else :
# compilation failed
-@@ -11991,8 +13371,8 @@
+@@ -11991,8 +14103,8 @@
fi
@@ -16042,7 +18851,7 @@
fi
CPPFLAGS="$save_CPPFLAGS"
-@@ -12013,19 +13393,19 @@
+@@ -12013,19 +14125,19 @@
fi
@@ -16070,7 +18879,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -12034,58 +13414,21 @@
+@@ -12034,58 +14146,21 @@
fi
;;
@@ -16136,7 +18945,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -12100,7 +13443,8 @@
+@@ -12100,7 +14175,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.
@@ -16146,7 +18955,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 \
-@@ -12214,11 +13558,11 @@
+@@ -12214,11 +14290,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -16160,7 +18969,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -12248,6 +13592,12 @@
+@@ -12248,6 +14324,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -16173,7 +18982,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -12259,6 +13609,9 @@
+@@ -12259,6 +14341,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -16183,7 +18992,7 @@
# A language-specific compiler.
CC=$lt_compiler
-@@ -12278,7 +13631,7 @@
+@@ -12278,7 +14363,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -16192,7 +19001,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12309,7 +13662,7 @@
+@@ -12309,7 +14394,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -16201,7 +19010,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12324,7 +13677,7 @@
+@@ -12324,7 +14409,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o
@@ -16210,7 +19019,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -12551,7 +13904,10 @@
+@@ -12551,7 +14636,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.
@@ -16222,7 +19031,7 @@
fi
-@@ -12564,11 +13920,11 @@
+@@ -12564,11 +14652,11 @@
CC="$lt_save_CC"
@@ -16238,7 +19047,7 @@
if test -f "$ltmain" && test -n "$tagnames"; then
if test ! -f "${ofile}"; then
-@@ -12586,6 +13942,9 @@
+@@ -12586,6 +14674,9 @@
echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
fi
fi
@@ -16248,7 +19057,7 @@
# Extract list of available tagged configurations in $ofile.
# Note that this assumes the entire list is on one line.
-@@ -12616,8 +13975,10 @@
+@@ -12616,8 +14707,10 @@
case $tagname in
CXX)
@@ -16261,7 +19070,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -12636,6 +13997,7 @@
+@@ -12636,6 +14729,7 @@
hardcode_libdir_flag_spec_ld_CXX=
hardcode_libdir_separator_CXX=
hardcode_minus_L_CXX=no
@@ -16269,7 +19078,7 @@
hardcode_automatic_CXX=no
module_cmds_CXX=
module_expsym_cmds_CXX=
-@@ -12653,7 +14015,7 @@
+@@ -12653,7 +14747,7 @@
compiler_lib_search_path_CXX=
# Source file extension for C++ test sources.
@@ -16278,7 +19087,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -12663,17 +14025,34 @@
+@@ -12663,17 +14757,34 @@
lt_simple_compile_test_code="int some_variable = 0;\n"
# Code to be used in simple link tests
@@ -16314,7 +19123,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -12684,18 +14063,27 @@
+@@ -12684,18 +14795,27 @@
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
@@ -16345,7 +19154,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -12709,18 +14097,18 @@
+@@ -12709,18 +14829,18 @@
# Set up default GNU C++ configuration
@@ -16370,7 +19179,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -12749,11 +14137,11 @@
+@@ -12749,11 +14869,11 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -16386,7 +19195,7 @@
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12766,7 +14154,7 @@
+@@ -12766,7 +14886,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,
@@ -16395,7 +19204,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'*)
-@@ -12786,21 +14174,21 @@
+@@ -12786,21 +14906,21 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -16424,7 +19233,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -12810,8 +14198,8 @@
+@@ -12810,8 +14930,8 @@
;;
esac
fi
@@ -16435,7 +19244,7 @@
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -12819,8 +14207,8 @@
+@@ -12819,8 +14939,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
@@ -16446,7 +19255,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12846,7 +14234,7 @@
+@@ -12846,7 +14966,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.
@@ -16455,7 +19264,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12861,8 +14249,8 @@
+@@ -12861,8 +14981,8 @@
fi
# PORTME: fill in a description of your system's C++ link characteristics
@@ -16466,7 +19275,7 @@
ld_shlibs_CXX=yes
case $host_os in
aix3*)
-@@ -12877,8 +14265,23 @@
+@@ -12877,8 +14997,23 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -16492,7 +19301,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12895,7 +14298,7 @@
+@@ -12895,7 +15030,7 @@
link_all_deplibs_CXX=yes
if test "$GXX" = yes; then
@@ -16501,7 +19310,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`
-@@ -12914,8 +14317,12 @@
+@@ -12914,8 +15049,12 @@
hardcode_libdir_flag_spec_CXX='-L$libdir'
hardcode_libdir_separator_CXX=
fi
@@ -16514,7 +19323,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -12924,15 +14331,16 @@
+@@ -12924,15 +15063,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -16535,7 +19344,52 @@
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.
-@@ -12985,20 +14393,21 @@
+@@ -12954,24 +15094,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -12985,20 +15137,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16560,7 +19414,52 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -13048,7 +14457,9 @@
+@@ -13017,24 +15170,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -13048,7 +15213,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16570,7 +19469,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -13058,16 +14469,26 @@
+@@ -13058,16 +15225,26 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_CXX=' ${wl}-bernotok'
allow_undefined_flag_CXX=' ${wl}-berok'
@@ -16602,7 +19501,7 @@
chorus*)
case $cc_basename in
*)
-@@ -13081,12 +14502,12 @@
+@@ -13081,12 +15258,12 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_CXX='-L$libdir'
@@ -16617,7 +19516,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
-@@ -13095,70 +14516,81 @@
+@@ -13095,70 +15272,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -16751,7 +19650,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13169,14 +14601,14 @@
+@@ -13169,14 +15357,14 @@
;;
esac
;;
@@ -16768,7 +19667,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -13193,12 +14625,12 @@
+@@ -13193,12 +15381,12 @@
# location of the library.
case $cc_basename in
@@ -16784,7 +19683,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13207,11 +14639,11 @@
+@@ -13207,11 +15395,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.
@@ -16798,7 +19697,7 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13221,33 +14653,22 @@
+@@ -13221,33 +15409,22 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -16839,7 +19738,7 @@
;;
*)
hardcode_direct_CXX=yes
-@@ -13258,17 +14679,20 @@
+@@ -13258,17 +15435,20 @@
esac
case $cc_basename in
@@ -16866,7 +19765,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -13284,12 +14708,15 @@
+@@ -13284,12 +15464,15 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -16886,7 +19785,7 @@
;;
esac
fi
-@@ -13300,11 +14727,25 @@
+@@ -13300,11 +15483,25 @@
;;
esac
;;
@@ -16914,7 +19813,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -13315,9 +14756,9 @@
+@@ -13315,9 +15512,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -16926,7 +19825,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -13326,16 +14767,16 @@
+@@ -13326,16 +15523,16 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
;;
@@ -16947,7 +19846,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13353,20 +14794,44 @@
+@@ -13353,20 +15550,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -16998,7 +19897,7 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13394,7 +14859,7 @@
+@@ -13394,7 +15615,7 @@
;;
mvs*)
case $cc_basename in
@@ -17007,7 +19906,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13404,7 +14869,7 @@
+@@ -13404,7 +15625,7 @@
;;
esac
;;
@@ -17016,7 +19915,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=
-@@ -13415,15 +14880,31 @@
+@@ -13415,15 +15636,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::"'
;;
@@ -17050,7 +19949,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13433,14 +14914,14 @@
+@@ -13433,14 +15670,14 @@
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -17068,7 +19967,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13458,7 +14939,7 @@
+@@ -13458,7 +15695,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -17077,7 +19976,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13477,13 +14958,13 @@
+@@ -13477,13 +15714,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -17093,7 +19992,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13492,17 +14973,17 @@
+@@ -13492,17 +15729,17 @@
# the KAI C++ compiler.
old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
;;
@@ -17115,7 +20014,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13521,7 +15002,7 @@
+@@ -13521,7 +15758,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -17124,7 +20023,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13542,27 +15023,14 @@
+@@ -13542,27 +15779,14 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
@@ -17154,7 +20053,7 @@
# Lucid
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13575,36 +15043,33 @@
+@@ -13575,36 +15799,33 @@
;;
solaris*)
case $cc_basename in
@@ -17203,7 +20102,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -13612,9 +15077,9 @@
+@@ -13612,9 +15833,9 @@
# in the archive.
old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
;;
@@ -17215,7 +20114,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13624,9 +15089,9 @@
+@@ -13624,9 +15845,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
@@ -17227,7 +20126,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13635,9 +15100,9 @@
+@@ -13635,9 +15856,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -17239,7 +20138,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13650,12 +15115,63 @@
+@@ -13650,12 +15871,63 @@
;;
esac
;;
@@ -17305,7 +20204,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13675,8 +15191,8 @@
+@@ -13675,8 +15947,8 @@
ld_shlibs_CXX=no
;;
esac
@@ -17316,7 +20215,7 @@
test "$ld_shlibs_CXX" = no && can_build_shared=no
GCC_CXX="$GXX"
-@@ -13712,7 +15228,7 @@
+@@ -13712,7 +15984,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.
@@ -17325,7 +20224,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -13752,7 +15268,7 @@
+@@ -13752,7 +16024,7 @@
fi
;;
@@ -17334,7 +20233,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13788,6 +15304,29 @@
+@@ -13788,6 +16060,29 @@
$rm -f confest.$objext
@@ -17364,7 +20263,7 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -13796,8 +15335,8 @@
+@@ -13796,8 +16091,8 @@
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
@@ -17375,7 +20274,7 @@
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
-@@ -13835,6 +15374,10 @@
+@@ -13835,6 +16130,10 @@
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
@@ -17386,7 +20285,7 @@
sysv4*MP*)
if test -d /usr/nec; then
lt_prog_compiler_pic_CXX=-Kconform_pic
-@@ -13843,7 +15386,7 @@
+@@ -13843,7 +16142,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -17395,7 +20294,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -13868,18 +15411,28 @@
+@@ -13868,18 +16167,28 @@
;;
chorus*)
case $cc_basename in
@@ -17427,7 +20326,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13887,22 +15440,22 @@
+@@ -13887,22 +16196,22 @@
;;
esac
;;
@@ -17456,7 +20355,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -13915,9 +15468,13 @@
+@@ -13915,9 +16224,13 @@
;;
esac
;;
@@ -17471,7 +20370,7 @@
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -13926,20 +15483,26 @@
+@@ -13926,20 +16239,26 @@
;;
esac
;;
@@ -17502,7 +20401,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13956,25 +15519,25 @@
+@@ -13956,25 +16275,25 @@
;;
mvs*)
case $cc_basename in
@@ -17533,7 +20432,7 @@
# Digital/Compaq C++
lt_prog_compiler_wl_CXX='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -13988,24 +15551,15 @@
+@@ -13988,24 +16307,15 @@
;;
psos*)
;;
@@ -17560,7 +20459,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-PIC'
;;
-@@ -14015,12 +15569,12 @@
+@@ -14015,12 +16325,12 @@
;;
sunos4*)
case $cc_basename in
@@ -17575,7 +20474,7 @@
# Lucid
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -14030,7 +15584,7 @@
+@@ -14030,7 +16340,7 @@
;;
tandem*)
case $cc_basename in
@@ -17584,7 +20483,7 @@
# NonStop-UX NCC 3.20
lt_prog_compiler_pic_CXX='-KPIC'
;;
-@@ -14038,7 +15592,14 @@
+@@ -14038,7 +16348,14 @@
;;
esac
;;
@@ -17600,7 +20499,7 @@
;;
vxworks*)
;;
-@@ -14048,16 +15609,16 @@
+@@ -14048,16 +16365,16 @@
esac
fi
@@ -17621,7 +20520,7 @@
if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -14071,26 +15632,28 @@
+@@ -14071,26 +16388,28 @@
# 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 \
@@ -17630,12 +20529,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14077: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15638: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16394: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14081: \$? = $ac_status" >&5
-+ echo "$as_me:15642: \$? = $ac_status" >&5
++ echo "$as_me:16398: \$? = $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
@@ -17657,7 +20556,7 @@
if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
case $lt_prog_compiler_pic_CXX in
-@@ -14103,7 +15666,7 @@
+@@ -14103,7 +16422,7 @@
fi
fi
@@ -17666,7 +20565,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_CXX=
-@@ -14113,8 +15676,50 @@
+@@ -14113,8 +16432,50 @@
;;
esac
@@ -17719,7 +20618,7 @@
if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -14125,60 +15730,58 @@
+@@ -14125,60 +16486,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -17741,12 +20640,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14144: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15742: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16498: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14148: \$? = $ac_status" >&5
-+ echo "$as_me:15746: \$? = $ac_status" >&5
++ echo "$as_me:16502: \$? = $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
@@ -17798,7 +20697,7 @@
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -14188,8 +15791,8 @@
+@@ -14188,8 +16547,8 @@
need_locks=no
fi
@@ -17809,7 +20708,7 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
-@@ -14206,22 +15809,20 @@
+@@ -14206,22 +16565,20 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -17838,7 +20737,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -14239,8 +15840,8 @@
+@@ -14239,8 +16596,8 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -17849,7 +20748,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -14254,6 +15855,7 @@
+@@ -14254,6 +16611,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_CXX
@@ -17857,7 +20756,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -14276,20 +15878,20 @@
+@@ -14276,20 +16634,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -17883,7 +20782,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14299,7 +15901,20 @@
+@@ -14299,7 +16657,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -17905,7 +20804,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14364,7 +15979,7 @@
+@@ -14364,7 +16735,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -17914,7 +20813,7 @@
;;
beos*)
-@@ -14373,7 +15988,7 @@
+@@ -14373,7 +16744,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -17923,7 +20822,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14389,7 +16004,7 @@
+@@ -14389,7 +16760,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -17932,7 +20831,7 @@
need_version=no
need_lib_prefix=no
-@@ -14401,7 +16016,8 @@
+@@ -14401,7 +16772,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -17942,7 +20841,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -14431,7 +16047,7 @@
+@@ -14431,7 +16803,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -17951,7 +20850,7 @@
;;
esac
;;
-@@ -14454,7 +16070,7 @@
+@@ -14454,7 +16826,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -17960,7 +20859,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"`
-@@ -14477,20 +16093,17 @@
+@@ -14477,20 +16849,17 @@
dynamic_linker=no
;;
@@ -17992,7 +20891,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -14508,14 +16121,19 @@
+@@ -14508,14 +16877,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -18014,7 +20913,7 @@
esac
;;
-@@ -14535,9 +16153,9 @@
+@@ -14535,9 +16909,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -18026,7 +20925,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14552,7 +16170,7 @@
+@@ -14552,7 +16926,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -18035,7 +20934,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14563,7 +16181,7 @@
+@@ -14563,7 +16937,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -18044,7 +20943,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14575,6 +16193,18 @@
+@@ -14575,6 +16949,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -18063,7 +20962,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -14618,29 +16248,26 @@
+@@ -14618,29 +17004,26 @@
;;
# This must be Linux ELF.
@@ -18100,20 +20999,14 @@
# 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,
-@@ -14650,16 +16277,28 @@
+@@ -14650,6 +17033,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
--netbsd*)
-- version_type=sunos
+netbsdelf*-gnu)
+ version_type=linux
- need_lib_prefix=no
- need_version=no
-- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-- dynamic_linker='NetBSD (a.out) ld.so'
++ need_lib_prefix=no
++ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
@@ -18122,21 +21015,19 @@
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
-+netbsd*)
-+ version_type=sunos
-+ need_lib_prefix=no
-+ need_version=no
-+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+ dynamic_linker='NetBSD (a.out) ld.so'
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -14659,7 +17054,7 @@
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ dynamic_linker='NetBSD (a.out) ld.so'
else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14687,8 +16326,13 @@
+@@ -14687,8 +17082,13 @@
openbsd*)
version_type=sunos
@@ -18151,7 +21042,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
-@@ -14708,7 +16352,7 @@
+@@ -14708,7 +17108,7 @@
os2*)
libname_spec='$name'
@@ -18160,7 +21051,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14726,13 +16370,6 @@
+@@ -14726,13 +17126,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -18174,7 +21065,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -14758,7 +16395,7 @@
+@@ -14758,7 +17151,7 @@
need_version=yes
;;
@@ -18183,7 +21074,7 @@
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
-@@ -14791,6 +16428,29 @@
+@@ -14791,6 +17184,29 @@
fi
;;
@@ -18213,7 +21104,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14802,16 +16462,21 @@
+@@ -14802,16 +17218,21 @@
dynamic_linker=no
;;
esac
@@ -18241,7 +21132,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_CXX" != no &&
-@@ -14831,8 +16496,8 @@
+@@ -14831,8 +17252,8 @@
# directories.
hardcode_action_CXX=unsupported
fi
@@ -18252,7 +21143,7 @@
if test "$hardcode_action_CXX" = relink; then
# Fast installation is not supported
-@@ -14843,1155 +16508,330 @@
+@@ -14843,1118 +17264,293 @@
enable_fast_install=needless
fi
@@ -19227,10 +22118,7 @@
-# define LT_DLGLOBAL 0
-# endif
-#endif
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdeps=$lt_postdeps_CXX
-
+-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
@@ -19252,33 +22140,24 @@
-# endif
-# endif
-#endif
-+# The library search path used internally by the compiler when linking
-+# a shared library.
-+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
-
+-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method=$lt_deplibs_check_method
-
+-
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
-+# Command to use when deplibs_check_method == file_magic.
-+file_magic_cmd=$lt_file_magic_cmd
-
+-
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=$lt_allow_undefined_flag_CXX
-
+-
- exit (status);
-}
-EOF
@@ -19300,45 +22179,31 @@
- fi
-fi
-rm -fr conftest*
-+# Flag that forces no undefined symbols.
-+no_undefined_flag=$lt_no_undefined_flag_CXX
-
-+# Commands used to finish a libtool library installation in a directory.
-+finish_cmds=$lt_finish_cmds
-
+-
+-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
- fi
-+# Same as above, but a single script fragment to be evaled but not shown.
-+finish_eval=$lt_finish_eval
-
+-
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
- ;;
- esac
-+# Take the output of nm and produce a listing of raw symbols and C names.
-+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
+-
- case $lt_cv_dlopen_self in
- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
- *) enable_dlopen_self=unknown ;;
- esac
-+# Transform the output of nm in a proper C declaration
-+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
+-
- case $lt_cv_dlopen_self_static in
- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
- *) enable_dlopen_self_static=unknown ;;
- esac
-fi
-+# Transform the output of nm in a C name address pair
-+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-+# This is the shared library runtime path variable.
-+runpath_var=$runpath_var
-
+-
+-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
@@ -19615,49 +22480,13 @@
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_CXX
--
--# The library search path used internally by the compiler when linking
--# a shared library.
--compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
--
--# Method to check whether dependent libraries are shared objects.
--deplibs_check_method=$lt_deplibs_check_method
--
--# Command to use when deplibs_check_method == file_magic.
--file_magic_cmd=$lt_file_magic_cmd
--
--# Flag that allows shared libraries with undefined symbols to be built.
--allow_undefined_flag=$lt_allow_undefined_flag_CXX
--
--# Flag that forces no undefined symbols.
--no_undefined_flag=$lt_no_undefined_flag_CXX
--
--# Commands used to finish a libtool library installation in a directory.
--finish_cmds=$lt_finish_cmds
--
--# Same as above, but a single script fragment to be evaled but not shown.
--finish_eval=$lt_finish_eval
--
--# Take the output of nm and produce a listing of raw symbols and C names.
--global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
--
--# Transform the output of nm in a proper C declaration
--global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
--
--# Transform the output of nm in a C name address pair
--global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
--
--# This is the shared library runtime path variable.
--runpath_var=$runpath_var
--
--# This is the shared library path variable.
--shlibpath_var=$shlibpath_var
-+# This is the shared library path variable.
-+shlibpath_var=$shlibpath_var
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdeps=$lt_postdeps_CXX
- # Is shlibpath searched before the hard-coded library search path?
- shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-@@ -16070,7 +16910,10 @@
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+@@ -16070,7 +17666,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.
@@ -19669,7 +22498,7 @@
fi
-@@ -16142,29 +16985,55 @@
+@@ -16142,29 +17741,55 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -19733,7 +22562,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -16172,21 +17041,21 @@
+@@ -16172,21 +17797,21 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -19765,7 +22594,7 @@
GCC_F77="$G77"
LD_F77="$LD"
-@@ -16195,8 +17064,8 @@
+@@ -16195,8 +17820,8 @@
lt_prog_compiler_pic_F77=
lt_prog_compiler_static_F77=
@@ -19776,7 +22605,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_F77='-Wl,'
-@@ -16234,6 +17103,11 @@
+@@ -16234,6 +17859,11 @@
lt_prog_compiler_pic_F77='-fno-common'
;;
@@ -19788,7 +22617,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -16250,7 +17124,7 @@
+@@ -16250,7 +17880,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -19797,7 +22626,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16276,6 +17150,16 @@
+@@ -16276,6 +17906,16 @@
lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -19814,7 +22643,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -16287,7 +17171,7 @@
+@@ -16287,7 +17927,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.
@@ -19823,7 +22652,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16310,13 +17194,20 @@
+@@ -16310,13 +17950,20 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -19846,7 +22675,7 @@
ccc*)
lt_prog_compiler_wl_F77='-Wl,'
# All Alpha code is PIC.
-@@ -16331,15 +17222,15 @@
+@@ -16331,15 +17978,15 @@
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -19868,7 +22697,7 @@
;;
sunos4*)
-@@ -16348,7 +17239,7 @@
+@@ -16348,7 +17995,7 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -19877,7 +22706,7 @@
lt_prog_compiler_wl_F77='-Wl,'
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16361,6 +17252,17 @@
+@@ -16361,6 +18008,17 @@
fi
;;
@@ -19895,7 +22724,7 @@
uts4*)
lt_prog_compiler_pic_F77='-pic'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16372,16 +17274,16 @@
+@@ -16372,16 +18030,16 @@
esac
fi
@@ -19916,7 +22745,7 @@
if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -16395,26 +17297,28 @@
+@@ -16395,26 +18053,28 @@
# 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 \
@@ -19925,12 +22754,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16401: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17303: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18059: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16405: \$? = $ac_status" >&5
-+ echo "$as_me:17307: \$? = $ac_status" >&5
++ echo "$as_me:18063: \$? = $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
@@ -19952,7 +22781,7 @@
if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
case $lt_prog_compiler_pic_F77 in
-@@ -16427,7 +17331,7 @@
+@@ -16427,7 +18087,7 @@
fi
fi
@@ -19961,7 +22790,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_F77=
-@@ -16437,8 +17341,50 @@
+@@ -16437,8 +18097,50 @@
;;
esac
@@ -20014,7 +22843,7 @@
if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -16449,60 +17395,58 @@
+@@ -16449,60 +18151,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -20036,12 +22865,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16468: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17407: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18163: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16472: \$? = $ac_status" >&5
-+ echo "$as_me:17411: \$? = $ac_status" >&5
++ echo "$as_me:18167: \$? = $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
@@ -20093,7 +22922,7 @@
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -16512,8 +17456,8 @@
+@@ -16512,8 +18212,8 @@
need_locks=no
fi
@@ -20104,7 +22933,7 @@
runpath_var=
allow_undefined_flag_F77=
-@@ -16551,6 +17495,16 @@
+@@ -16551,6 +18251,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -20121,7 +22950,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -16561,6 +17515,10 @@
+@@ -16561,6 +18271,10 @@
with_gnu_ld=no
fi
;;
@@ -20132,7 +22961,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -16571,6 +17529,27 @@
+@@ -16571,6 +18285,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -20160,7 +22989,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -16608,7 +17587,7 @@
+@@ -16608,7 +18343,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -20169,7 +22998,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16618,13 +17597,13 @@
+@@ -16618,13 +18353,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'
@@ -20186,7 +23015,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
-@@ -16633,23 +17612,70 @@
+@@ -16633,23 +18368,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -20195,10 +23024,9 @@
else
- ld_shlibs=no
+ ld_shlibs_F77=no
- fi
- ;;
-
-- netbsd*)
++ fi
++ ;;
++
+ interix3*)
+ hardcode_direct_F77=no
+ hardcode_shlibpath_var_F77=no
@@ -20243,9 +23071,10 @@
+ link_all_deplibs_F77=no
+ else
+ ld_shlibs_F77=no
-+ fi
-+ ;;
-+
+ fi
+ ;;
+
+- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -20263,7 +23092,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_F77=no
cat <<EOF 1>&2
-@@ -16663,13 +17689,40 @@
+@@ -16663,13 +18445,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -20306,7 +23135,7 @@
sunos4*)
archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -16679,24 +17732,19 @@
+@@ -16679,24 +18488,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -20338,7 +23167,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16708,7 +17756,7 @@
+@@ -16708,7 +18512,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_F77=yes
@@ -20347,7 +23176,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_F77=unsupported
-@@ -16730,9 +17778,21 @@
+@@ -16730,9 +18534,21 @@
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
@@ -20371,7 +23200,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16749,7 +17809,7 @@
+@@ -16749,7 +18565,7 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes; then
@@ -20380,7 +23209,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`
-@@ -16768,8 +17828,12 @@
+@@ -16768,8 +18584,12 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_libdir_separator_F77=
fi
@@ -20393,7 +23222,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -16777,22 +17841,23 @@
+@@ -16777,45 +18597,58 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -20424,7 +23253,50 @@
program main
end
-@@ -16829,19 +17894,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_f77_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -16829,19 +18662,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -20449,7 +23321,52 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16881,7 +17947,9 @@
+@@ -16850,24 +18684,36 @@
+ end
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_f77_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -16881,7 +18727,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -20459,7 +23376,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -16891,13 +17959,11 @@
+@@ -16891,13 +18739,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_F77=' ${wl}-bernotok'
allow_undefined_flag_F77=' ${wl}-berok'
@@ -20476,7 +23393,7 @@
fi
fi
;;
-@@ -16910,7 +17976,7 @@
+@@ -16910,7 +18756,7 @@
ld_shlibs_F77=no
;;
@@ -20485,7 +23402,7 @@
export_dynamic_flag_spec_F77=-rdynamic
;;
-@@ -16920,68 +17986,68 @@
+@@ -16920,68 +18766,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -20598,7 +23515,7 @@
fi
;;
-@@ -17015,8 +18081,8 @@
+@@ -17015,8 +18861,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -20609,7 +23526,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -17024,7 +18090,7 @@
+@@ -17024,7 +18870,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -20618,7 +23535,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
-@@ -17038,47 +18104,62 @@
+@@ -17038,47 +18884,62 @@
export_dynamic_flag_spec_F77='${wl}-E'
;;
@@ -20705,7 +23622,7 @@
hardcode_direct_F77=yes
export_dynamic_flag_spec_F77='${wl}-E'
-@@ -17092,7 +18173,7 @@
+@@ -17092,7 +18953,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -20714,7 +23631,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'
-@@ -17102,7 +18183,7 @@
+@@ -17102,7 +18963,7 @@
link_all_deplibs_F77=yes
;;
@@ -20723,7 +23640,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
-@@ -17125,7 +18206,8 @@
+@@ -17125,7 +18986,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
@@ -20733,7 +23650,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -17135,7 +18217,7 @@
+@@ -17135,7 +18997,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -20742,7 +23659,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -17146,14 +18228,14 @@
+@@ -17146,14 +19008,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -20759,7 +23676,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'
-@@ -17165,13 +18247,13 @@
+@@ -17165,13 +19027,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -20775,7 +23692,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -17179,21 +18261,15 @@
+@@ -17179,21 +19041,15 @@
hardcode_libdir_separator_F77=:
;;
@@ -20801,7 +23718,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'
-@@ -17202,8 +18278,18 @@
+@@ -17202,8 +19058,18 @@
hardcode_shlibpath_var_F77=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -20822,7 +23739,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -17212,7 +18298,7 @@
+@@ -17212,7 +19078,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.
@@ -20831,7 +23748,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -17260,36 +18346,45 @@
+@@ -17260,36 +19126,45 @@
fi
;;
@@ -20898,7 +23815,7 @@
;;
uts4*)
-@@ -17304,15 +18399,10 @@
+@@ -17304,15 +19179,10 @@
esac
fi
@@ -20916,7 +23833,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -17330,8 +18420,8 @@
+@@ -17330,8 +19200,8 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -20927,7 +23844,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -17345,6 +18435,7 @@
+@@ -17345,6 +19215,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_F77
@@ -20935,7 +23852,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -17367,20 +18458,20 @@
+@@ -17367,20 +19238,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -20961,7 +23878,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17390,7 +18481,20 @@
+@@ -17390,7 +19261,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -20983,7 +23900,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17455,7 +18559,7 @@
+@@ -17455,7 +19339,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -20992,7 +23909,7 @@
;;
beos*)
-@@ -17464,7 +18568,7 @@
+@@ -17464,7 +19348,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -21001,7 +23918,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17480,7 +18584,7 @@
+@@ -17480,7 +19364,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -21010,7 +23927,7 @@
need_version=no
need_lib_prefix=no
-@@ -17492,7 +18596,8 @@
+@@ -17492,7 +19376,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -21020,7 +23937,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -17522,7 +18627,7 @@
+@@ -17522,7 +19407,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -21029,7 +23946,7 @@
;;
esac
;;
-@@ -17545,7 +18650,7 @@
+@@ -17545,7 +19430,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -21038,7 +23955,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"`
-@@ -17568,20 +18673,17 @@
+@@ -17568,20 +19453,17 @@
dynamic_linker=no
;;
@@ -21070,7 +23987,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -17599,14 +18701,19 @@
+@@ -17599,14 +19481,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -21092,7 +24009,7 @@
esac
;;
-@@ -17626,9 +18733,9 @@
+@@ -17626,9 +19513,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -21104,7 +24021,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17643,7 +18750,7 @@
+@@ -17643,7 +19530,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -21113,7 +24030,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17654,7 +18761,7 @@
+@@ -17654,7 +19541,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -21122,7 +24039,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17666,6 +18773,18 @@
+@@ -17666,6 +19553,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -21141,7 +24058,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -17709,29 +18828,26 @@
+@@ -17709,29 +19608,26 @@
;;
# This must be Linux ELF.
@@ -21178,7 +24095,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,
-@@ -17741,6 +18857,18 @@
+@@ -17741,6 +19637,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -21197,7 +24114,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17750,7 +18878,7 @@
+@@ -17750,7 +19658,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -21206,7 +24123,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17778,8 +18906,13 @@
+@@ -17778,8 +19686,13 @@
openbsd*)
version_type=sunos
@@ -21221,7 +24138,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
-@@ -17799,7 +18932,7 @@
+@@ -17799,7 +19712,7 @@
os2*)
libname_spec='$name'
@@ -21230,7 +24147,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17817,13 +18950,6 @@
+@@ -17817,13 +19730,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -21244,7 +24161,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -17849,7 +18975,7 @@
+@@ -17849,7 +19755,7 @@
need_version=yes
;;
@@ -21253,13 +24170,10 @@
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
-@@ -17882,9 +19008,32 @@
+@@ -17882,6 +19788,29 @@
fi
;;
--uts4*)
-- version_type=linux
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ version_type=freebsd-elf
+ need_lib_prefix=no
@@ -21283,13 +24197,10 @@
+ sys_lib_dlsearch_path_spec='/usr/lib'
+ ;;
+
-+uts4*)
-+ version_type=linux
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-@@ -17893,16 +19042,21 @@
+ uts4*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -17893,16 +19822,21 @@
dynamic_linker=no
;;
esac
@@ -21317,7 +24228,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_F77" != no &&
-@@ -17922,8 +19076,8 @@
+@@ -17922,8 +19856,8 @@
# directories.
hardcode_action_F77=unsupported
fi
@@ -21328,7 +24239,7 @@
if test "$hardcode_action_F77" = relink; then
# Fast installation is not supported
-@@ -17934,36 +19088,6 @@
+@@ -17934,36 +19868,6 @@
enable_fast_install=needless
fi
@@ -21365,7 +24276,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -17978,7 +19102,8 @@
+@@ -17978,7 +19882,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.
@@ -21375,7 +24286,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 \
-@@ -18078,6 +19203,12 @@
+@@ -18078,6 +19983,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -21388,7 +24299,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -18089,6 +19220,9 @@
+@@ -18089,6 +20000,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -21398,7 +24309,7 @@
# A language-specific compiler.
CC=$lt_compiler_F77
-@@ -18108,7 +19242,7 @@
+@@ -18108,7 +20022,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -21407,7 +24318,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -18139,7 +19273,7 @@
+@@ -18139,7 +20053,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -21416,7 +24327,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -18154,7 +19288,7 @@
+@@ -18154,7 +20068,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
@@ -21425,7 +24336,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -18356,7 +19490,10 @@
+@@ -18356,7 +20270,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.
@@ -21437,7 +24348,7 @@
fi
-@@ -18377,7 +19514,6 @@
+@@ -18377,7 +20294,6 @@
if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
@@ -21445,7 +24356,7 @@
# Source file extension for Java test sources.
ac_ext=java
-@@ -18389,26 +19525,55 @@
+@@ -18389,26 +20305,55 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -21502,7 +24413,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
-@@ -18420,8 +19585,8 @@
+@@ -18420,8 +20365,8 @@
lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
@@ -21513,7 +24424,7 @@
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18435,26 +19600,28 @@
+@@ -18435,26 +20380,28 @@
# 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 \
@@ -21522,12 +24433,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18441: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19606: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20386: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18445: \$? = $ac_status" >&5
-+ echo "$as_me:19610: \$? = $ac_status" >&5
++ echo "$as_me:20390: \$? = $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
@@ -21549,7 +24460,7 @@
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
-@@ -18468,8 +19635,8 @@
+@@ -18468,8 +20415,8 @@
lt_prog_compiler_pic_GCJ=
lt_prog_compiler_static_GCJ=
@@ -21560,7 +24471,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -18507,6 +19674,11 @@
+@@ -18507,6 +20454,11 @@
lt_prog_compiler_pic_GCJ='-fno-common'
;;
@@ -21572,7 +24483,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -18523,7 +19695,7 @@
+@@ -18523,7 +20475,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -21581,7 +24492,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18549,6 +19721,16 @@
+@@ -18549,6 +20501,16 @@
lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -21598,7 +24509,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -18560,7 +19742,7 @@
+@@ -18560,7 +20522,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.
@@ -21607,7 +24518,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18583,13 +19765,20 @@
+@@ -18583,13 +20545,20 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -21630,7 +24541,7 @@
ccc*)
lt_prog_compiler_wl_GCJ='-Wl,'
# All Alpha code is PIC.
-@@ -18604,15 +19793,15 @@
+@@ -18604,15 +20573,15 @@
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -21652,7 +24563,7 @@
;;
sunos4*)
-@@ -18621,7 +19810,7 @@
+@@ -18621,7 +20590,7 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -21661,7 +24572,7 @@
lt_prog_compiler_wl_GCJ='-Wl,'
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18634,6 +19823,17 @@
+@@ -18634,6 +20603,17 @@
fi
;;
@@ -21679,7 +24590,7 @@
uts4*)
lt_prog_compiler_pic_GCJ='-pic'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18645,16 +19845,16 @@
+@@ -18645,16 +20625,16 @@
esac
fi
@@ -21700,7 +24611,7 @@
if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18668,26 +19868,28 @@
+@@ -18668,26 +20648,28 @@
# 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 \
@@ -21709,12 +24620,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18674: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19874: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20654: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18678: \$? = $ac_status" >&5
-+ echo "$as_me:19878: \$? = $ac_status" >&5
++ echo "$as_me:20658: \$? = $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
@@ -21736,7 +24647,7 @@
if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
case $lt_prog_compiler_pic_GCJ in
-@@ -18700,7 +19902,7 @@
+@@ -18700,7 +20682,7 @@
fi
fi
@@ -21745,7 +24656,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_GCJ=
-@@ -18710,8 +19912,50 @@
+@@ -18710,8 +20692,50 @@
;;
esac
@@ -21798,7 +24709,7 @@
if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18722,60 +19966,58 @@
+@@ -18722,60 +20746,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -21820,12 +24731,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18741: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19978: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20758: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18745: \$? = $ac_status" >&5
-+ echo "$as_me:19982: \$? = $ac_status" >&5
++ echo "$as_me:20762: \$? = $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
@@ -21877,7 +24788,7 @@
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -18785,8 +20027,8 @@
+@@ -18785,8 +20807,8 @@
need_locks=no
fi
@@ -21888,7 +24799,7 @@
runpath_var=
allow_undefined_flag_GCJ=
-@@ -18824,6 +20066,16 @@
+@@ -18824,6 +20846,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -21905,7 +24816,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -18834,6 +20086,10 @@
+@@ -18834,6 +20866,10 @@
with_gnu_ld=no
fi
;;
@@ -21916,7 +24827,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -18844,6 +20100,27 @@
+@@ -18844,6 +20880,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -21944,7 +24855,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -18881,7 +20158,7 @@
+@@ -18881,7 +20938,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -21953,7 +24864,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18891,13 +20168,13 @@
+@@ -18891,13 +20948,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'
@@ -21970,7 +24881,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
-@@ -18906,23 +20183,70 @@
+@@ -18906,23 +20963,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -22047,7 +24958,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_GCJ=no
cat <<EOF 1>&2
-@@ -18936,13 +20260,40 @@
+@@ -18936,13 +21040,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -22090,7 +25001,7 @@
sunos4*)
archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -18952,24 +20303,19 @@
+@@ -18952,24 +21083,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -22122,7 +25033,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18981,7 +20327,7 @@
+@@ -18981,7 +21107,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_GCJ=yes
@@ -22131,7 +25042,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_GCJ=unsupported
-@@ -19003,9 +20349,21 @@
+@@ -19003,9 +21129,21 @@
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
@@ -22155,7 +25066,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -19022,7 +20380,7 @@
+@@ -19022,7 +21160,7 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes; then
@@ -22164,7 +25075,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`
-@@ -19041,8 +20399,12 @@
+@@ -19041,8 +21179,12 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_libdir_separator_GCJ=
fi
@@ -22177,7 +25088,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -19050,22 +20412,23 @@
+@@ -19050,22 +21192,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -22208,7 +25119,52 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -19112,19 +20475,20 @@
+@@ -19081,24 +21224,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -19112,19 +21267,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -22233,7 +25189,52 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -19174,7 +20538,9 @@
+@@ -19143,24 +21299,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -19174,7 +21342,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -22243,7 +25244,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -19184,13 +20550,11 @@
+@@ -19184,13 +21354,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_GCJ=' ${wl}-bernotok'
allow_undefined_flag_GCJ=' ${wl}-berok'
@@ -22260,7 +25261,7 @@
fi
fi
;;
-@@ -19203,7 +20567,7 @@
+@@ -19203,7 +21371,7 @@
ld_shlibs_GCJ=no
;;
@@ -22269,7 +25270,7 @@
export_dynamic_flag_spec_GCJ=-rdynamic
;;
-@@ -19213,68 +20577,68 @@
+@@ -19213,68 +21381,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -22382,7 +25383,7 @@
fi
;;
-@@ -19308,8 +20672,8 @@
+@@ -19308,8 +21476,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -22393,7 +25394,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -19317,7 +20681,7 @@
+@@ -19317,7 +21485,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -22402,7 +25403,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
-@@ -19331,47 +20695,62 @@
+@@ -19331,47 +21499,62 @@
export_dynamic_flag_spec_GCJ='${wl}-E'
;;
@@ -22489,7 +25490,7 @@
hardcode_direct_GCJ=yes
export_dynamic_flag_spec_GCJ='${wl}-E'
-@@ -19385,7 +20764,7 @@
+@@ -19385,7 +21568,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -22498,7 +25499,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'
-@@ -19395,7 +20774,7 @@
+@@ -19395,7 +21578,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -22507,7 +25508,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
-@@ -19418,7 +20797,8 @@
+@@ -19418,7 +21601,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
@@ -22517,7 +25518,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19428,7 +20808,7 @@
+@@ -19428,7 +21612,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -22526,7 +25527,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19439,14 +20819,14 @@
+@@ -19439,14 +21623,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -22543,7 +25544,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'
-@@ -19458,13 +20838,13 @@
+@@ -19458,13 +21642,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -22559,7 +25560,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19472,21 +20852,15 @@
+@@ -19472,21 +21656,15 @@
hardcode_libdir_separator_GCJ=:
;;
@@ -22585,7 +25586,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'
-@@ -19495,8 +20869,18 @@
+@@ -19495,8 +21673,18 @@
hardcode_shlibpath_var_GCJ=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -22606,7 +25607,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -19505,7 +20889,7 @@
+@@ -19505,7 +21693,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.
@@ -22615,7 +25616,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19553,36 +20937,45 @@
+@@ -19553,36 +21741,45 @@
fi
;;
@@ -22682,7 +25683,7 @@
;;
uts4*)
-@@ -19597,15 +20990,10 @@
+@@ -19597,15 +21794,10 @@
esac
fi
@@ -22700,7 +25701,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -19623,8 +21011,8 @@
+@@ -19623,8 +21815,8 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -22711,7 +25712,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -19638,6 +21026,7 @@
+@@ -19638,6 +21830,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_GCJ
@@ -22719,7 +25720,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -19660,20 +21049,20 @@
+@@ -19660,20 +21853,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -22745,7 +25746,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -19683,7 +21072,20 @@
+@@ -19683,7 +21876,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -22767,7 +25768,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19748,7 +21150,7 @@
+@@ -19748,7 +21954,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -22776,7 +25777,7 @@
;;
beos*)
-@@ -19757,7 +21159,7 @@
+@@ -19757,7 +21963,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -22785,7 +25786,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19773,7 +21175,7 @@
+@@ -19773,7 +21979,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -22794,7 +25795,7 @@
need_version=no
need_lib_prefix=no
-@@ -19785,7 +21187,8 @@
+@@ -19785,7 +21991,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -22804,7 +25805,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -19815,7 +21218,7 @@
+@@ -19815,7 +22022,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -22813,7 +25814,7 @@
;;
esac
;;
-@@ -19838,7 +21241,7 @@
+@@ -19838,7 +22045,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -22822,7 +25823,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"`
-@@ -19861,20 +21264,17 @@
+@@ -19861,20 +22068,17 @@
dynamic_linker=no
;;
@@ -22854,7 +25855,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -19892,14 +21292,19 @@
+@@ -19892,14 +22096,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -22876,7 +25877,7 @@
esac
;;
-@@ -19919,9 +21324,9 @@
+@@ -19919,1147 +22128,359 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -22888,55 +25889,90 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -19936,7 +21341,7 @@
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- hppa*64*)
+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- if test "X$HPUX_IA64_MODE" = X32; then
+- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+- else
+- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+- fi
+- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+- ;;
+- hppa*64*)
- shrext='.sl'
-+ shrext_cmds='.sl'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19947,7 +21352,7 @@
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- *)
+- hardcode_into_libs=yes
+- dynamic_linker="$host_os dld.sl"
+- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+- ;;
+- *)
- shrext='.sl'
-+ shrext_cmds='.sl'
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=SHLIB_PATH
- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19959,6 +21364,18 @@
- postinstall_cmds='chmod 555 $lib'
- ;;
-
-+interix3*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ ;;
-+
- irix5* | irix6* | nonstopux*)
- case $host_os in
- nonstopux*) version_type=nonstopux ;;
-@@ -20002,29 +21419,26 @@
- ;;
-
- # This must be Linux ELF.
+- dynamic_linker="$host_os dld.sl"
+- shlibpath_var=SHLIB_PATH
+- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- ;;
+- esac
+- # HP-UX runs *really* slowly unless shared libraries are mode 555.
+- postinstall_cmds='chmod 555 $lib'
+- ;;
+-
+-irix5* | irix6* | nonstopux*)
+- case $host_os in
+- nonstopux*) version_type=nonstopux ;;
+- *)
+- if test "$lt_cv_prog_gnu_ld" = yes; then
+- version_type=linux
+- else
+- version_type=irix
+- fi ;;
+- esac
+- need_lib_prefix=no
+- need_version=no
+- soname_spec='${libname}${release}${shared_ext}$major'
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+- case $host_os in
+- irix5* | nonstopux*)
+- libsuff= shlibsuff=
+- ;;
+- *)
+- case $LD in # libtool.m4 will add one of these switches to LD
+- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+- libsuff= shlibsuff= libmagic=32-bit;;
+- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+- libsuff=32 shlibsuff=N32 libmagic=N32;;
+- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+- libsuff=64 shlibsuff=64 libmagic=64-bit;;
+- *) libsuff= shlibsuff= libmagic=never-match;;
+- esac
+- ;;
+- esac
+- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+- shlibpath_overrides_runpath=no
+- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+- hardcode_into_libs=yes
+- ;;
+-
+-# No shared lib support for Linux oldld, aout, or coff.
+-linux*oldld* | linux*aout* | linux*coff*)
+- dynamic_linker=no
+- ;;
+-
+-# This must be Linux ELF.
-linux*)
-+linux* | k*bsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
- libsuff=
- if test "x$LINUX_64_MODE" = x64; then
- # Some platforms are per default 64-bit, so there's no /lib64
@@ -22944,80 +25980,100 @@
- libsuff=64
- fi
- fi
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=no
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
- # This implies no fast_install, which is unacceptable.
- # Some rework will be needed to allow for fast_install
- # before this can be enabled.
- hardcode_into_libs=yes
-
-+ # Append ld.so.conf contents to the search path
-+ if test -f /etc/ld.so.conf; then
-+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+ fi
-+
- # 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,
-@@ -20034,6 +21448,18 @@
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-+netbsdelf*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='NetBSD ld.elf_so'
-+ ;;
-+
- netbsd*)
- version_type=sunos
- need_lib_prefix=no
-@@ -20043,7 +21469,7 @@
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- dynamic_linker='NetBSD (a.out) ld.so'
- else
+- # This implies no fast_install, which is unacceptable.
+- # Some rework will be needed to allow for fast_install
+- # before this can be enabled.
+- hardcode_into_libs=yes
+-
+- # 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,
+- # most powerpc-linux boxes support dynamic linking these days and
+- # people can always --disable-shared, the test was removed, and we
+- # assume the GNU/Linux dynamic linker is in use.
+- dynamic_linker='GNU/Linux ld.so'
+- ;;
+-
+-netbsd*)
+- version_type=sunos
+- need_lib_prefix=no
+- need_version=no
+- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+- dynamic_linker='NetBSD (a.out) ld.so'
+- else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- dynamic_linker='NetBSD ld.elf_so'
- fi
-@@ -20071,8 +21497,13 @@
-
- openbsd*)
- version_type=sunos
-+ sys_lib_dlsearch_path_spec="/usr/lib"
- need_lib_prefix=no
+- soname_spec='${libname}${release}${shared_ext}$major'
+- dynamic_linker='NetBSD ld.elf_so'
+- fi
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
+- hardcode_into_libs=yes
+- ;;
+-
+-newsos6)
+- version_type=linux
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
+- ;;
+-
+-nto-qnx*)
+- version_type=linux
+- need_lib_prefix=no
- need_version=no
-+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+ case $host_os in
-+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-+ *) need_version=no ;;
-+ esac
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- shlibpath_var=LD_LIBRARY_PATH
-@@ -20092,7 +21523,7 @@
-
- os2*)
- libname_spec='$name'
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
+- ;;
+-
+-openbsd*)
+- version_type=sunos
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+- shlibpath_var=LD_LIBRARY_PATH
+- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- case $host_os in
+- openbsd2.[89] | openbsd2.[89].*)
+- shlibpath_overrides_runpath=no
+- ;;
+- *)
+- shlibpath_overrides_runpath=yes
+- ;;
+- esac
+- else
+- shlibpath_overrides_runpath=yes
+- fi
+- ;;
+-
+-os2*)
+- libname_spec='$name'
- shrext=".dll"
-+ shrext_cmds=".dll"
- need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
- dynamic_linker='OS/2 ld.exe'
-@@ -20110,13 +21541,6 @@
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
-
+- need_lib_prefix=no
+- library_names_spec='$libname${shared_ext} $libname.a'
+- dynamic_linker='OS/2 ld.exe'
+- shlibpath_var=LIBPATH
+- ;;
+-
+-osf3* | osf4* | osf5*)
+- version_type=osf
+- need_lib_prefix=no
+- need_version=no
+- soname_spec='${libname}${release}${shared_ext}$major'
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- shlibpath_var=LD_LIBRARY_PATH
+- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+- ;;
+-
-sco3.2v5*)
- version_type=osf
- soname_spec='${libname}${release}${shared_ext}$major'
@@ -23025,32 +26081,69 @@
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
- solaris*)
- version_type=linux
- need_lib_prefix=no
-@@ -20142,7 +21566,7 @@
- need_version=yes
- ;;
-
+-solaris*)
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
+- hardcode_into_libs=yes
+- # ldd complains unless libraries are executable
+- postinstall_cmds='chmod +x $lib'
+- ;;
+-
+-sunos4*)
+- version_type=sunos
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
+- if test "$with_gnu_ld" = yes; then
+- need_lib_prefix=no
+- fi
+- need_version=yes
+- ;;
+-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+sysv4 | sysv4.3*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
-@@ -20175,891 +21599,84 @@
- fi
- ;;
-
+- version_type=linux
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- case $host_vendor in
+- sni)
+- shlibpath_overrides_runpath=no
+- need_lib_prefix=no
+- export_dynamic_flag_spec='${wl}-Blargedynsym'
+- runpath_var=LD_RUN_PATH
+- ;;
+- siemens)
+- need_lib_prefix=no
+- ;;
+- motorola)
+- need_lib_prefix=no
+- need_version=no
+- shlibpath_overrides_runpath=no
+- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+- ;;
+- esac
+- ;;
+-
+-sysv4*MP*)
+- if test -d /usr/nec ;then
+- version_type=linux
+- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+- soname_spec='$libname${shared_ext}.$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- fi
+- ;;
+-
-uts4*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+ version_type=freebsd-elf
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
-*)
@@ -23077,21 +26170,10 @@
- test "$hardcode_minus_L_GCJ" != no; then
- # Linking always hardcodes the temporary library directory.
- hardcode_action_GCJ=relink
-+ hardcode_into_libs=yes
-+ if test "$with_gnu_ld" = yes; then
-+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-+ shlibpath_overrides_runpath=no
- else
+- else
- # We can link without hardcoding, and we can hardcode nonexisting dirs.
- hardcode_action_GCJ=immediate
-+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-+ shlibpath_overrides_runpath=yes
-+ case $host_os in
-+ sco3.2v5*)
-+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-+ ;;
-+ esac
- fi
+- fi
-else
- # We cannot hardcode anything, or else we can only hardcode existing
- # directories.
@@ -23289,9 +26371,7 @@
-#ifdef __cplusplus
-}
-#endif
-+ sys_lib_dlsearch_path_spec='/usr/lib'
-+ ;;
-
+-
-int
-main ()
-{
@@ -23698,31 +26778,206 @@
-if test $ac_cv_lib_dld_dld_link = yes; then
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-fi
--
--
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ if test "X$HPUX_IA64_MODE" = X32; then
++ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
++ else
++ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
++ fi
++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++ ;;
++ hppa*64*)
++ shrext_cmds='.sl'
++ hardcode_into_libs=yes
++ dynamic_linker="$host_os dld.sl"
++ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
++ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++ ;;
++ *)
++ shrext_cmds='.sl'
++ dynamic_linker="$host_os dld.sl"
++ shlibpath_var=SHLIB_PATH
++ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ ;;
++ esac
++ # HP-UX runs *really* slowly unless shared libraries are mode 555.
++ postinstall_cmds='chmod 555 $lib'
++ ;;
+
++interix3*)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ ;;
+
-fi
--
--
++irix5* | irix6* | nonstopux*)
++ case $host_os in
++ nonstopux*) version_type=nonstopux ;;
++ *)
++ if test "$lt_cv_prog_gnu_ld" = yes; then
++ version_type=linux
++ else
++ version_type=irix
++ fi ;;
++ esac
++ need_lib_prefix=no
++ need_version=no
++ soname_spec='${libname}${release}${shared_ext}$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
++ case $host_os in
++ irix5* | nonstopux*)
++ libsuff= shlibsuff=
++ ;;
++ *)
++ case $LD in # libtool.m4 will add one of these switches to LD
++ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
++ libsuff= shlibsuff= libmagic=32-bit;;
++ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
++ libsuff=32 shlibsuff=N32 libmagic=N32;;
++ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
++ libsuff=64 shlibsuff=64 libmagic=64-bit;;
++ *) libsuff= shlibsuff= libmagic=never-match;;
++ esac
++ ;;
++ esac
++ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
++ shlibpath_overrides_runpath=no
++ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++ hardcode_into_libs=yes
++ ;;
+
++# No shared lib support for Linux oldld, aout, or coff.
++linux*oldld* | linux*aout* | linux*coff*)
++ dynamic_linker=no
++ ;;
+
-fi
--
--
++# This must be Linux ELF.
++linux* | k*bsd*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ # This implies no fast_install, which is unacceptable.
++ # Some rework will be needed to allow for fast_install
++ # before this can be enabled.
++ hardcode_into_libs=yes
+
++ # Append ld.so.conf contents to the search path
++ if test -f /etc/ld.so.conf; then
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++ fi
+
-fi
--
--
++ # 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,
++ # most powerpc-linux boxes support dynamic linking these days and
++ # people can always --disable-shared, the test was removed, and we
++ # assume the GNU/Linux dynamic linker is in use.
++ dynamic_linker='GNU/Linux ld.so'
++ ;;
+
++netbsdelf*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
++ ;;
+
-fi
--
--
++netbsd*)
++ version_type=sunos
++ need_lib_prefix=no
++ need_version=no
++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++ dynamic_linker='NetBSD (a.out) ld.so'
++ else
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ dynamic_linker='NetBSD ld.elf_so'
++ fi
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ hardcode_into_libs=yes
++ ;;
+
++newsos6)
++ version_type=linux
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ ;;
+
-fi
--
++nto-qnx*)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ ;;
+
- ;;
-- esac
++openbsd*)
++ version_type=sunos
++ sys_lib_dlsearch_path_spec="/usr/lib"
++ need_lib_prefix=no
++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++ case $host_os in
++ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++ *) need_version=no ;;
+ esac
-
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
-- else
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++ shlibpath_var=LD_LIBRARY_PATH
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ case $host_os in
++ openbsd2.[89] | openbsd2.[89].*)
++ shlibpath_overrides_runpath=no
++ ;;
++ *)
++ shlibpath_overrides_runpath=yes
++ ;;
++ esac
+ else
- enable_dlopen=no
-- fi
--
++ shlibpath_overrides_runpath=yes
+ fi
++ ;;
+
- case $lt_cv_dlopen in
- dlopen)
- save_CPPFLAGS="$CPPFLAGS"
@@ -23753,7 +27008,15 @@
-#endif
-
-#include <stdio.h>
--
++os2*)
++ libname_spec='$name'
++ shrext_cmds=".dll"
++ need_lib_prefix=no
++ library_names_spec='$libname${shared_ext} $libname.a'
++ dynamic_linker='OS/2 ld.exe'
++ shlibpath_var=LIBPATH
++ ;;
+
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
-#else
@@ -23763,7 +27026,17 @@
-# define LT_DLGLOBAL 0
-# endif
-#endif
--
++osf3* | osf4* | osf5*)
++ version_type=osf
++ need_lib_prefix=no
++ need_version=no
++ soname_spec='${libname}${release}${shared_ext}$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ shlibpath_var=LD_LIBRARY_PATH
++ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++ ;;
+
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
@@ -23785,24 +27058,78 @@
-# endif
-# endif
-#endif
--
++solaris*)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ hardcode_into_libs=yes
++ # ldd complains unless libraries are executable
++ postinstall_cmds='chmod +x $lib'
++ ;;
+
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
--
++sunos4*)
++ version_type=sunos
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ if test "$with_gnu_ld" = yes; then
++ need_lib_prefix=no
++ fi
++ need_version=yes
++ ;;
+
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
--
++sysv4 | sysv4.3*)
++ version_type=linux
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ case $host_vendor in
++ sni)
++ shlibpath_overrides_runpath=no
++ need_lib_prefix=no
++ export_dynamic_flag_spec='${wl}-Blargedynsym'
++ runpath_var=LD_RUN_PATH
++ ;;
++ siemens)
++ need_lib_prefix=no
++ ;;
++ motorola)
++ need_lib_prefix=no
++ need_version=no
++ shlibpath_overrides_runpath=no
++ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++ ;;
++ esac
++ ;;
+
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
--
++sysv4*MP*)
++ if test -d /usr/nec ;then
++ version_type=linux
++ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
++ soname_spec='$libname${shared_ext}.$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ fi
++ ;;
+
- exit (status);
-}
-EOF
@@ -23817,11 +27144,29 @@
- x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
- x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
- x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
-- esac
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++ version_type=freebsd-elf
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ hardcode_into_libs=yes
++ if test "$with_gnu_ld" = yes; then
++ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
++ shlibpath_overrides_runpath=no
++ else
++ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
++ shlibpath_overrides_runpath=yes
++ case $host_os in
++ sco3.2v5*)
++ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
++ ;;
+ esac
- else :
- # compilation failed
- lt_cv_dlopen_self=no
-- fi
+ fi
-fi
-rm -fr conftest*
-
@@ -23887,20 +27232,35 @@
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
--
++ sys_lib_dlsearch_path_spec='/usr/lib'
++ ;;
+
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
--
++uts4*)
++ version_type=linux
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ ;;
+
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
--
++*)
++ dynamic_linker=no
++ ;;
++esac
++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6; }
++test "$dynamic_linker" = no && can_build_shared=no
+
- exit (status);
-}
-EOF
@@ -23920,36 +27280,12 @@
- # compilation failed
- lt_cv_dlopen_self_static=no
- fi
--fi
--rm -fr conftest*
-+uts4*)
-+ version_type=linux
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ ;;
-
-+*)
-+ dynamic_linker=no
-+ ;;
-+esac
-+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-+echo "${ECHO_T}$dynamic_linker" >&6; }
-+test "$dynamic_linker" = no && can_build_shared=no
-
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
--echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
-- fi
+-rm -fr conftest*
-- CPPFLAGS="$save_CPPFLAGS"
-- LDFLAGS="$save_LDFLAGS"
-- LIBS="$save_LIBS"
-- ;;
-- esac
+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+hardcode_action_GCJ=
@@ -23957,10 +27293,6 @@
+ test -n "$runpath_var_GCJ" || \
+ test "X$hardcode_automatic_GCJ" = "Xyes" ; then
-- case $lt_cv_dlopen_self in
-- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-- *) enable_dlopen_self=unknown ;;
-- esac
+ # We can hardcode non-existant directories.
+ if test "$hardcode_direct_GCJ" != no &&
+ # If the only mechanism to avoid hardcoding is shlibpath_var, we
@@ -23978,10 +27310,24 @@
+ # We cannot hardcode anything, or else we can only hardcode existing
+ # directories.
+ hardcode_action_GCJ=unsupported
-+fi
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
+- fi
+-
+- CPPFLAGS="$save_CPPFLAGS"
+- LDFLAGS="$save_LDFLAGS"
+- LIBS="$save_LIBS"
+- ;;
+- esac
+{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
+echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
+- case $lt_cv_dlopen_self in
+- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+- *) enable_dlopen_self=unknown ;;
+- esac
+-
- case $lt_cv_dlopen_self_static in
- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
- *) enable_dlopen_self_static=unknown ;;
@@ -23996,7 +27342,7 @@
fi
-@@ -21076,7 +21693,8 @@
+@@ -21076,7 +22497,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.
@@ -24006,7 +27352,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 \
-@@ -21176,6 +21794,12 @@
+@@ -21176,6 +22598,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -24019,7 +27365,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21187,6 +21811,9 @@
+@@ -21187,6 +22615,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -24029,7 +27375,7 @@
# A language-specific compiler.
CC=$lt_compiler_GCJ
-@@ -21206,7 +21833,7 @@
+@@ -21206,7 +22637,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -24038,7 +27384,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21237,7 +21864,7 @@
+@@ -21237,7 +22668,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -24047,7 +27393,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21252,7 +21879,7 @@
+@@ -21252,7 +22683,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
@@ -24056,7 +27402,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21454,7 +22081,10 @@
+@@ -21454,7 +22885,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.
@@ -24068,7 +27414,7 @@
fi
-@@ -21474,7 +22104,6 @@
+@@ -21474,7 +22908,6 @@
RC)
@@ -24076,7 +27422,7 @@
# Source file extension for RC test sources.
ac_ext=rc
-@@ -21493,15 +22122,42 @@
+@@ -21493,15 +22926,42 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -24119,7 +27465,7 @@
lt_cv_prog_compiler_c_o_RC=yes
# The else clause should only fire when bootstrapping the
-@@ -21517,7 +22173,8 @@
+@@ -21517,7 +22977,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.
@@ -24129,7 +27475,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 \
-@@ -21617,6 +22274,12 @@
+@@ -21617,6 +23078,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -24142,7 +27488,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21628,6 +22291,9 @@
+@@ -21628,6 +23095,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -24152,7 +27498,7 @@
# A language-specific compiler.
CC=$lt_compiler_RC
-@@ -21647,7 +22313,7 @@
+@@ -21647,7 +23117,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -24161,7 +27507,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21678,7 +22344,7 @@
+@@ -21678,7 +23148,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -24170,7 +27516,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21693,7 +22359,7 @@
+@@ -21693,7 +23163,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
@@ -24179,7 +27525,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21895,7 +22561,10 @@
+@@ -21895,7 +23365,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.
@@ -24191,7 +27537,7 @@
fi
-@@ -21942,7 +22611,7 @@
+@@ -21942,7 +23415,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -24200,7 +27546,7 @@
# Prevent multiple expansion
-@@ -21997,8 +22666,8 @@
+@@ -21997,8 +23470,8 @@
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
@@ -24211,7 +27557,7 @@
if test "${ac_cv_path_MSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22024,17 +22693,17 @@
+@@ -22024,17 +23497,17 @@
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test -n "$MSGFMT"; then
@@ -24235,7 +27581,7 @@
if test "${ac_cv_path_GMSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22049,32 +22718,33 @@
+@@ -22049,32 +23522,33 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -24277,7 +27623,7 @@
GMSGFMT=":"
fi
MSGFMT=$GMSGFMT
-@@ -22083,8 +22753,8 @@
+@@ -22083,8 +23557,8 @@
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
@@ -24288,7 +27634,7 @@
if test "${ac_cv_path_XGETTEXT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22110,11 +22780,11 @@
+@@ -22110,11 +23584,11 @@
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test -n "$XGETTEXT"; then
@@ -24304,7 +27650,7 @@
fi
-@@ -22122,8 +22792,8 @@
+@@ -22122,8 +23596,8 @@
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -24315,7 +27661,7 @@
XGETTEXT=":"
fi
fi
-@@ -22133,8 +22803,7 @@
+@@ -22133,8 +23607,7 @@
@@ -24325,7 +27671,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22146,8 +22815,8 @@
+@@ -22146,8 +23619,8 @@
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
@@ -24336,7 +27682,52 @@
if test "${kde_cv_stl_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22201,15 +22870,16 @@
+@@ -22175,24 +23648,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -22201,15 +23686,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24356,7 +27747,7 @@
if test "$kde_cv_stl_works" = "yes"; then
# back compatible
-@@ -22238,15 +22908,14 @@
+@@ -22238,15 +23724,14 @@
@@ -24375,7 +27766,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22258,9 +22927,6 @@
+@@ -22258,9 +23743,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -24385,7 +27776,52 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22312,8 +22978,9 @@
+@@ -22286,24 +23768,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -22312,8 +23806,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24396,7 +27832,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
-@@ -22327,11 +22994,11 @@
+@@ -22327,11 +23822,11 @@
fi
@@ -24412,7 +27848,7 @@
if test "${kde_cv_proto_strlcat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22352,8 +23019,7 @@
+@@ -22352,8 +23847,7 @@
if test "x$kde_cv_proto_strlcat" = xunknown; then
@@ -24422,7 +27858,52 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22418,9 +23084,10 @@
+@@ -22391,24 +23885,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -22418,9 +23924,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24434,7 +27915,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -22434,8 +23101,8 @@
+@@ -22434,8 +23941,8 @@
fi
@@ -24445,7 +27926,7 @@
if test "x$kde_cv_func_strlcat" = xyes; then
-@@ -22459,15 +23126,14 @@
+@@ -22459,15 +23966,14 @@
@@ -24464,7 +27945,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22479,9 +23145,6 @@
+@@ -22479,9 +23985,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -24474,7 +27955,52 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22532,8 +23195,9 @@
+@@ -22506,24 +24009,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -22532,8 +24047,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24485,7 +28011,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
-@@ -22547,11 +23211,11 @@
+@@ -22547,11 +24063,11 @@
fi
@@ -24501,7 +28027,7 @@
if test "${kde_cv_proto_strlcpy+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22572,8 +23236,7 @@
+@@ -22572,8 +24088,7 @@
if test "x$kde_cv_proto_strlcpy" = xunknown; then
@@ -24511,7 +28037,52 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22637,9 +23300,10 @@
+@@ -22610,24 +24125,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -22637,9 +24164,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24523,7 +28094,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -22653,8 +23317,8 @@
+@@ -22653,8 +24181,8 @@
fi
@@ -24534,7 +28105,7 @@
if test "x$kde_cv_func_strlcpy" = xyes; then
-@@ -22677,8 +23341,8 @@
+@@ -22677,8 +24205,8 @@
@@ -24545,7 +28116,7 @@
if test "${ac_cv_lib_util_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22695,7 +23359,7 @@
+@@ -22695,30 +24223,42 @@
int
main ()
{
@@ -24554,7 +28125,50 @@
;
return 0;
}
-@@ -22727,20 +23391,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -22727,20 +24267,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24581,7 +28195,7 @@
if test "${ac_cv_lib_compat_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22757,7 +23422,7 @@
+@@ -22757,30 +24298,42 @@
int
main ()
{
@@ -24590,7 +28204,50 @@
;
return 0;
}
-@@ -22789,21 +23454,22 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -22789,21 +24342,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24618,7 +28275,7 @@
if test "${ac_cv_lib_crypt_crypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22816,17 +23482,17 @@
+@@ -22816,40 +24370,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -24640,7 +28297,50 @@
;
return 0;
}
-@@ -22858,19 +23524,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -22858,19 +24424,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24666,7 +28366,7 @@
if test "${ac_cv_lib_c_crypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22883,17 +23550,17 @@
+@@ -22883,40 +24450,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -24688,7 +28388,50 @@
;
return 0;
}
-@@ -22925,14 +23592,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -22925,14 +24504,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24707,7 +28450,7 @@
if test $ac_cv_lib_c_crypt = yes; then
kde_have_crypt=yes
else
-@@ -22958,13 +23626,13 @@
+@@ -22958,13 +24538,13 @@
fi
@@ -24724,7 +28467,52 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -23022,7 +23690,9 @@
+@@ -22993,24 +24573,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -23022,7 +24614,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24734,7 +28522,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -23033,17 +23703,17 @@
+@@ -23033,17 +24627,17 @@
fi
@@ -24757,7 +28545,52 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -23101,7 +23771,9 @@
+@@ -23072,24 +24666,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -23101,7 +24707,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24767,7 +28600,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
done
ac_ext=c
-@@ -23113,8 +23785,8 @@
+@@ -23113,8 +24721,8 @@
fi
@@ -24778,7 +28611,7 @@
fi
cat >>confdefs.h <<_ACEOF
-@@ -23127,8 +23799,8 @@
+@@ -23127,8 +24735,8 @@
_ACEOF
@@ -24789,7 +28622,7 @@
if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23141,17 +23813,17 @@
+@@ -23141,40 +24749,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -24811,7 +28644,50 @@
;
return 0;
}
-@@ -23183,21 +23855,22 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -23183,21 +24803,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24839,7 +28715,7 @@
if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23210,17 +23883,17 @@
+@@ -23210,40 +24831,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -24861,7 +28737,50 @@
;
return 0;
}
-@@ -23252,21 +23925,22 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -23252,21 +24885,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24889,7 +28808,7 @@
if test "${ac_cv_func_inet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23293,30 +23967,24 @@
+@@ -23293,53 +24927,59 @@
#undef inet_ntoa
@@ -24925,7 +28844,50 @@
;
return 0;
}
-@@ -23348,17 +24016,18 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -23348,17 +24988,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24949,7 +28911,7 @@
if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23371,17 +24040,17 @@
+@@ -23371,40 +25012,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -24971,7 +28933,50 @@
;
return 0;
}
-@@ -23413,21 +24082,22 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -23413,21 +25066,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24999,7 +29004,7 @@
if test "${ac_cv_func_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23454,30 +24124,24 @@
+@@ -23454,53 +25108,59 @@
#undef connect
@@ -25035,7 +29040,50 @@
;
return 0;
}
-@@ -23509,17 +24173,18 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -23509,17 +25169,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25059,7 +29107,7 @@
if test "${ac_cv_lib_socket_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23532,17 +24197,17 @@
+@@ -23532,40 +25193,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -25081,7 +29129,50 @@
;
return 0;
}
-@@ -23574,22 +24239,23 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -23574,22 +25247,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25110,7 +29201,7 @@
if test "${ac_cv_func_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23616,30 +24282,24 @@
+@@ -23616,53 +25290,59 @@
#undef remove
@@ -25146,7 +29237,50 @@
;
return 0;
}
-@@ -23671,17 +24331,18 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -23671,17 +25351,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25170,7 +29304,7 @@
if test "${ac_cv_lib_posix_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23694,17 +24355,17 @@
+@@ -23694,40 +25375,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -25192,7 +29326,50 @@
;
return 0;
}
-@@ -23736,14 +24397,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -23736,14 +25429,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25211,7 +29388,7 @@
if test $ac_cv_lib_posix_remove = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
fi
-@@ -23751,8 +24413,8 @@
+@@ -23751,8 +25445,8 @@
fi
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
@@ -25222,7 +29399,7 @@
if test "${ac_cv_func_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23779,30 +24441,24 @@
+@@ -23779,53 +25473,59 @@
#undef shmat
@@ -25258,7 +29435,50 @@
;
return 0;
}
-@@ -23834,18 +24490,19 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -23834,18 +25534,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25283,7 +29503,7 @@
if test "${ac_cv_lib_ipc_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23858,17 +24515,17 @@
+@@ -23858,40 +25559,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -25305,7 +29525,50 @@
;
return 0;
}
-@@ -23900,14 +24557,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -23900,14 +25613,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25324,7 +29587,7 @@
if test $ac_cv_lib_ipc_shmat = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
fi
-@@ -23921,18 +24579,19 @@
+@@ -23921,18 +25635,19 @@
for ac_header in sys/types.h stdint.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -25352,7 +29615,52 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23969,15 +24628,16 @@
+@@ -23943,24 +25658,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -23969,15 +25696,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25374,7 +29682,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24011,9 +24671,10 @@
+@@ -23986,8 +25714,13 @@
+ /* end confdefs.h. */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -24011,9 +25744,10 @@
ac_header_preproc=no
fi
@@ -25387,7 +29711,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24037,25 +24698,19 @@
+@@ -24037,25 +25771,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -25420,7 +29744,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24073,18 +24728,19 @@
+@@ -24073,18 +25801,19 @@
for ac_header in sys/bitypes.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -25448,7 +29772,52 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24121,15 +24777,16 @@
+@@ -24095,24 +25824,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -24121,15 +25862,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25470,7 +29839,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24163,9 +24820,10 @@
+@@ -24138,8 +25880,13 @@
+ /* end confdefs.h. */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -24163,9 +25910,10 @@
ac_header_preproc=no
fi
@@ -25483,7 +29868,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24189,25 +24847,19 @@
+@@ -24189,25 +25937,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -25516,7 +29901,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24221,8 +24873,8 @@
+@@ -24221,8 +25963,8 @@
# darwin requires a poll emulation library
@@ -25527,7 +29912,7 @@
if test "${ac_cv_lib_poll_poll+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24235,17 +24887,17 @@
+@@ -24235,40 +25977,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -25549,7 +29934,50 @@
;
return 0;
}
-@@ -24277,14 +24929,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -24277,14 +26031,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25568,7 +29996,7 @@
if test $ac_cv_lib_poll_poll = yes; then
LIB_POLL="-lpoll"
fi
-@@ -24295,18 +24948,19 @@
+@@ -24295,18 +26050,19 @@
for ac_header in Carbon/Carbon.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -25596,7 +30024,52 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24343,15 +24997,16 @@
+@@ -24317,24 +26073,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -24343,15 +26111,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25618,7 +30091,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24385,9 +25040,10 @@
+@@ -24360,8 +26129,13 @@
+ /* end confdefs.h. */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -24385,9 +26159,10 @@
ac_header_preproc=no
fi
@@ -25631,7 +30120,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24411,25 +25067,19 @@
+@@ -24411,25 +26186,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -25664,7 +30153,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24444,17 +25094,17 @@
+@@ -24444,17 +26213,17 @@
# CoreAudio framework
if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
@@ -25688,7 +30177,52 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24491,15 +25141,16 @@
+@@ -24465,24 +26234,36 @@
+ #include <CoreAudio/CoreAudio.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -24491,15 +26272,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25710,7 +30244,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24533,9 +25184,10 @@
+@@ -24508,8 +26290,13 @@
+ /* end confdefs.h. */
+ #include <CoreAudio/CoreAudio.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -24533,9 +26320,10 @@
ac_header_preproc=no
fi
@@ -25723,7 +30273,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24559,25 +25211,18 @@
+@@ -24559,25 +26347,18 @@
echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&2;}
@@ -25754,7 +30304,7 @@
fi
if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
-@@ -24594,8 +25239,8 @@
+@@ -24594,8 +26375,8 @@
@@ -25765,7 +30315,50 @@
kde_libs_safe="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
cat >conftest.$ac_ext <<_ACEOF
-@@ -24644,8 +25289,8 @@
+@@ -24621,31 +26402,43 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
LIBRESOLV="-lresolv"
@@ -25776,7 +30369,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_RES_INIT 1
-@@ -24656,25 +25301,25 @@
+@@ -24656,25 +26449,25 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25808,7 +30401,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -24686,9 +25331,6 @@
+@@ -24686,9 +26479,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -25818,7 +30411,52 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24740,8 +25382,9 @@
+@@ -24714,24 +26504,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -24740,8 +26542,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25829,7 +30467,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
-@@ -24755,11 +25398,11 @@
+@@ -24755,11 +26558,11 @@
fi
@@ -25845,7 +30483,7 @@
if test "${kde_cv_proto_res_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24780,8 +25423,7 @@
+@@ -24780,8 +26583,7 @@
if test "x$kde_cv_proto_res_init" = xunknown; then
@@ -25855,7 +30493,52 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -24846,9 +25488,10 @@
+@@ -24819,24 +26621,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -24846,9 +26660,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25867,7 +30550,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -24862,8 +25505,8 @@
+@@ -24862,8 +26677,8 @@
fi
@@ -25878,7 +30561,7 @@
if test "x$kde_cv_func_res_init" = xyes; then
-@@ -24890,8 +25533,8 @@
+@@ -24890,8 +26705,8 @@
LIBSOCKET="$X_EXTRA_LIBS"
@@ -25889,7 +30572,7 @@
if test "${ac_cv_lib_ucb_killpg+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24904,17 +25547,17 @@
+@@ -24904,40 +26719,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -25911,7 +30594,50 @@
;
return 0;
}
-@@ -24946,27 +25589,28 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -24946,27 +26773,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25949,7 +30675,7 @@
if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24979,17 +25623,17 @@
+@@ -24979,40 +26807,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -25971,7 +30697,50 @@
;
return 0;
}
-@@ -25021,22 +25665,23 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -25021,22 +26861,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26000,7 +30769,7 @@
if test "${ac_cv_type_int+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25047,12 +25692,13 @@
+@@ -25047,36 +26888,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -26016,7 +30785,51 @@
return 0;
;
return 0;
-@@ -25085,20 +25731,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -25085,20 +26939,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26044,7 +30857,7 @@
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-@@ -25111,10 +25758,11 @@
+@@ -25111,10 +26966,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -26057,7 +30870,52 @@
test_array [0] = 0
;
-@@ -25152,10 +25800,11 @@
+@@ -25122,24 +26978,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -25152,10 +27020,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -26070,7 +30928,52 @@
test_array [0] = 0
;
-@@ -25189,30 +25838,32 @@
+@@ -25163,24 +27032,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -25189,30 +27070,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26111,7 +31014,52 @@
test_array [0] = 0
;
-@@ -25250,10 +25901,11 @@
+@@ -25220,24 +27103,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -25250,10 +27145,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -26124,7 +31072,52 @@
test_array [0] = 0
;
-@@ -25287,23 +25939,26 @@
+@@ -25261,24 +27157,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -25287,23 +27195,26 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26158,7 +31151,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
-@@ -25315,10 +25970,11 @@
+@@ -25315,10 +27226,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -26171,7 +31164,52 @@
test_array [0] = 0
;
-@@ -25352,26 +26008,20 @@
+@@ -25326,24 +27238,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -25352,26 +27276,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26203,7 +31241,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25379,8 +26029,9 @@
+@@ -25379,8 +27297,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -26215,7 +31253,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -25389,22 +26040,22 @@
+@@ -25389,35 +27308,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -26247,7 +31285,33 @@
;
return 0;
-@@ -25428,28 +26079,27 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -25428,28 +27356,27 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -26284,7 +31348,7 @@
if test "${ac_cv_type_short+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25460,12 +26110,13 @@
+@@ -25460,36 +27387,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -26300,7 +31364,51 @@
return 0;
;
return 0;
-@@ -25498,20 +26149,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -25498,20 +27438,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26328,7 +31436,7 @@
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-@@ -25524,10 +26176,11 @@
+@@ -25524,10 +27465,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -26341,7 +31449,52 @@
test_array [0] = 0
;
-@@ -25565,10 +26218,11 @@
+@@ -25535,24 +27477,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -25565,10 +27519,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -26354,7 +31507,52 @@
test_array [0] = 0
;
-@@ -25602,30 +26256,32 @@
+@@ -25576,24 +27531,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -25602,30 +27569,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26395,7 +31593,52 @@
test_array [0] = 0
;
-@@ -25663,10 +26319,11 @@
+@@ -25633,24 +27602,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -25663,10 +27644,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -26408,7 +31651,52 @@
test_array [0] = 0
;
-@@ -25700,23 +26357,26 @@
+@@ -25674,24 +27656,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -25700,23 +27694,26 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26442,7 +31730,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
-@@ -25728,10 +26388,11 @@
+@@ -25728,10 +27725,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -26455,7 +31743,52 @@
test_array [0] = 0
;
-@@ -25765,26 +26426,20 @@
+@@ -25739,24 +27737,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -25765,26 +27775,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26487,7 +31820,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25792,8 +26447,9 @@
+@@ -25792,8 +27796,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -26499,7 +31832,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -25802,22 +26458,22 @@
+@@ -25802,35 +27807,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -26531,7 +31864,33 @@
;
return 0;
-@@ -25841,28 +26497,27 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -25841,28 +27855,27 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -26568,7 +31927,7 @@
if test "${ac_cv_type_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25873,12 +26528,13 @@
+@@ -25873,36 +27886,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -26584,7 +31943,51 @@
return 0;
;
return 0;
-@@ -25911,20 +26567,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -25911,20 +27937,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26612,7 +32015,7 @@
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-@@ -25937,10 +26594,11 @@
+@@ -25937,10 +27964,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -26625,7 +32028,52 @@
test_array [0] = 0
;
-@@ -25978,10 +26636,11 @@
+@@ -25948,24 +27976,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -25978,10 +28018,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -26638,7 +32086,52 @@
test_array [0] = 0
;
-@@ -26015,30 +26674,32 @@
+@@ -25989,24 +28030,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -26015,30 +28068,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26679,7 +32172,52 @@
test_array [0] = 0
;
-@@ -26076,10 +26737,11 @@
+@@ -26046,24 +28101,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -26076,10 +28143,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -26692,7 +32230,52 @@
test_array [0] = 0
;
-@@ -26113,23 +26775,26 @@
+@@ -26087,24 +28155,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -26113,23 +28193,26 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26726,7 +32309,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
-@@ -26141,10 +26806,11 @@
+@@ -26141,10 +28224,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -26739,7 +32322,52 @@
test_array [0] = 0
;
-@@ -26178,26 +26844,20 @@
+@@ -26152,24 +28236,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -26178,26 +28274,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26771,7 +32399,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26205,8 +26865,9 @@
+@@ -26205,8 +28295,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -26783,7 +32411,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -26215,22 +26876,22 @@
+@@ -26215,35 +28306,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -26815,7 +32443,33 @@
;
return 0;
-@@ -26254,28 +26915,27 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -26254,28 +28354,27 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -26852,7 +32506,7 @@
if test "${ac_cv_type_char_p+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26286,12 +26946,13 @@
+@@ -26286,36 +28385,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -26868,7 +32522,51 @@
return 0;
;
return 0;
-@@ -26324,20 +26985,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -26324,20 +28436,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26896,7 +32594,7 @@
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-@@ -26350,10 +27012,11 @@
+@@ -26350,10 +28463,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -26909,7 +32607,52 @@
test_array [0] = 0
;
-@@ -26391,10 +27054,11 @@
+@@ -26361,24 +28475,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -26391,10 +28517,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -26922,7 +32665,52 @@
test_array [0] = 0
;
-@@ -26428,30 +27092,32 @@
+@@ -26402,24 +28529,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -26428,30 +28567,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26963,7 +32751,52 @@
test_array [0] = 0
;
-@@ -26489,10 +27155,11 @@
+@@ -26459,24 +28600,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -26489,10 +28642,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -26976,7 +32809,52 @@
test_array [0] = 0
;
-@@ -26526,23 +27193,26 @@
+@@ -26500,24 +28654,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -26526,23 +28692,26 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27010,7 +32888,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
-@@ -26554,10 +27224,11 @@
+@@ -26554,10 +28723,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -27023,7 +32901,52 @@
test_array [0] = 0
;
-@@ -26591,26 +27262,20 @@
+@@ -26565,24 +28735,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -26591,26 +28773,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27055,7 +32978,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26618,8 +27283,9 @@
+@@ -26618,8 +28794,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -27067,7 +32990,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -26628,22 +27294,22 @@
+@@ -26628,35 +28805,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -27099,7 +33022,33 @@
;
return 0;
-@@ -26667,30 +27333,29 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -26667,30 +28853,29 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -27138,7 +33087,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26703,17 +27368,17 @@
+@@ -26703,40 +28888,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27160,7 +33109,50 @@
;
return 0;
}
-@@ -26745,14 +27410,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -26745,14 +28942,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27179,7 +33171,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
LIBDL="-ldl"
-@@ -26761,8 +27427,8 @@
+@@ -26761,8 +28959,8 @@
fi
@@ -27190,7 +33182,7 @@
if test "${ac_cv_lib_dld_shl_unload+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26775,17 +27441,17 @@
+@@ -26775,40 +28973,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27212,7 +33204,50 @@
;
return 0;
}
-@@ -26817,14 +27483,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -26817,14 +29027,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27231,7 +33266,7 @@
if test $ac_cv_lib_dld_shl_unload = yes; then
LIBDL="-ldld"
-@@ -26838,8 +27505,8 @@
+@@ -26838,8 +29049,8 @@
@@ -27242,7 +33277,7 @@
if test "${ac_cv_type_size_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26850,12 +27517,13 @@
+@@ -26850,36 +29061,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -27258,7 +33293,51 @@
return 0;
;
return 0;
-@@ -26888,20 +27556,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -26888,20 +29112,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27286,7 +33365,7 @@
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-@@ -26914,10 +27583,11 @@
+@@ -26914,10 +29139,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -27299,7 +33378,52 @@
test_array [0] = 0
;
-@@ -26955,10 +27625,11 @@
+@@ -26925,24 +29151,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -26955,10 +29193,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -27312,7 +33436,52 @@
test_array [0] = 0
;
-@@ -26992,30 +27663,32 @@
+@@ -26966,24 +29205,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -26992,30 +29243,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27353,7 +33522,52 @@
test_array [0] = 0
;
-@@ -27053,10 +27726,11 @@
+@@ -27023,24 +29276,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -27053,10 +29318,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -27366,7 +33580,52 @@
test_array [0] = 0
;
-@@ -27090,23 +27764,26 @@
+@@ -27064,24 +29330,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -27090,23 +29368,26 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27400,7 +33659,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
-@@ -27118,10 +27795,11 @@
+@@ -27118,10 +29399,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -27413,7 +33672,52 @@
test_array [0] = 0
;
-@@ -27155,26 +27833,20 @@
+@@ -27129,24 +29411,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -27155,26 +29449,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27445,7 +33749,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27182,8 +27854,9 @@
+@@ -27182,8 +29470,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -27457,7 +33761,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -27192,22 +27865,22 @@
+@@ -27192,35 +29481,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -27489,7 +33793,33 @@
;
return 0;
-@@ -27231,29 +27904,28 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -27231,29 +29529,28 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -27527,7 +33857,7 @@
if test "${ac_cv_type_unsigned_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -27264,12 +27936,13 @@
+@@ -27264,36 +29561,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -27543,7 +33873,51 @@
return 0;
;
return 0;
-@@ -27302,20 +27975,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -27302,20 +29612,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27571,7 +33945,7 @@
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-@@ -27328,10 +28002,11 @@
+@@ -27328,10 +29639,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -27584,7 +33958,52 @@
test_array [0] = 0
;
-@@ -27369,10 +28044,11 @@
+@@ -27339,24 +29651,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -27369,10 +29693,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -27597,7 +34016,52 @@
test_array [0] = 0
;
-@@ -27406,30 +28082,32 @@
+@@ -27380,24 +29705,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -27406,30 +29743,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27638,7 +34102,52 @@
test_array [0] = 0
;
-@@ -27467,10 +28145,11 @@
+@@ -27437,24 +29776,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -27467,10 +29818,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -27651,7 +34160,52 @@
test_array [0] = 0
;
-@@ -27504,23 +28183,26 @@
+@@ -27478,24 +29830,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -27504,23 +29868,26 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27685,7 +34239,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
-@@ -27532,10 +28214,11 @@
+@@ -27532,10 +29899,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -27698,7 +34252,52 @@
test_array [0] = 0
;
-@@ -27569,26 +28252,20 @@
+@@ -27543,24 +29911,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -27569,25 +29949,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27707,30 +34306,33 @@
fi
+
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) ac_cv_sizeof_unsigned_long=$ac_lo;;
+-done
+-case $ac_lo in
+-?*) ac_cv_sizeof_unsigned_long=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (unsigned long), 77
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; } ;;
+-esac
+-else
+- if test "$cross_compiling" = yes; then
+- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
++done
++case $ac_lo in
++?*) ac_cv_sizeof_unsigned_long=$ac_lo;;
+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (unsigned long), 77
+-echo "$as_me: error: cannot run test program while cross compiling
+echo "$as_me: error: cannot compute sizeof (unsigned long)
See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; } ;;
+- { (exit 1); exit 1; }; }
+ { (exit 77); exit 77; }; } ;;
- esac
++esac
else
-- if test "$cross_compiling" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
--else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
- _ACEOF
-@@ -27596,8 +28273,9 @@
+@@ -27596,8 +29970,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -27742,7 +34344,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -27606,22 +28284,22 @@
+@@ -27606,35 +29981,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -27774,7 +34376,33 @@
;
return 0;
-@@ -27645,30 +28323,29 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -27645,30 +30029,29 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -27813,9 +34441,50 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27710,15 +28387,15 @@
+@@ -27689,36 +30072,48 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
@@ -27833,7 +34502,7 @@
{ { echo "$as_me:$LINENO: error:
Apparently on your system our assumption sizeof size_t == sizeof unsigned long
does not apply. Please mail kde-devel at kde.org with a description of your system!
-@@ -27730,18 +28407,18 @@
+@@ -27730,18 +30125,18 @@
{ (exit 1); exit 1; }; }
fi
@@ -27856,7 +34525,52 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -27797,8 +28474,9 @@
+@@ -27771,24 +30166,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -27797,8 +30204,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27867,7 +34581,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-@@ -27812,26 +28490,26 @@
+@@ -27812,26 +30220,26 @@
fi
@@ -27904,7 +34618,7 @@
KDE_USE_FPIE=""
KDE_USE_PIE=""
-@@ -27850,18 +28528,19 @@
+@@ -27850,18 +30258,19 @@
for ac_header in crt_externs.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -27932,7 +34646,52 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27898,15 +28577,16 @@
+@@ -27872,24 +30281,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -27898,15 +30319,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27954,7 +34713,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27940,9 +28620,10 @@
+@@ -27915,8 +30337,13 @@
+ /* end confdefs.h. */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -27940,9 +30367,10 @@
ac_header_preproc=no
fi
@@ -27967,7 +34742,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -27966,25 +28647,19 @@
+@@ -27966,25 +30394,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -28000,7 +34775,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -27996,8 +28671,8 @@
+@@ -27996,8 +30418,8 @@
done
@@ -28011,7 +34786,7 @@
if test "${ac_cv_func__NSGetEnviron+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28024,30 +28699,24 @@
+@@ -28024,53 +30446,59 @@
#undef _NSGetEnviron
@@ -28047,7 +34822,50 @@
;
return 0;
}
-@@ -28079,13 +28748,14 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -28079,13 +30507,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28065,7 +34883,7 @@
if test $ac_cv_func__NSGetEnviron = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -28106,9 +28776,9 @@
+@@ -28106,9 +30535,9 @@
for ac_func in vsnprintf snprintf
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -28078,7 +34896,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -28134,30 +28804,24 @@
+@@ -28134,53 +30563,59 @@
#undef $ac_func
@@ -28114,7 +34932,50 @@
;
return 0;
}
-@@ -28189,13 +28853,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -28189,13 +30624,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28133,7 +34994,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -28212,32 +28878,32 @@
+@@ -28212,32 +30649,32 @@
@@ -28148,9 +35009,9 @@
-fi;
+fi
-+
-# Check whether --enable-qtopia or --disable-qtopia was given.
++
+# Check whether --enable-qtopia was given.
if test "${enable_qtopia+set}" = set; then
- enableval="$enable_qtopia"
@@ -28161,9 +35022,9 @@
-fi;
+fi
++
-# Check whether --enable-mac or --disable-mac was given.
-+
+# Check whether --enable-mac was given.
if test "${enable_mac+set}" = set; then
- enableval="$enable_mac"
@@ -28178,7 +35039,7 @@
# used to disable x11-specific stuff on special platforms
-@@ -28253,8 +28919,8 @@
+@@ -28253,8 +30690,8 @@
if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
@@ -28189,7 +35050,23 @@
if test "${kde_cv_have_x+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -28359,6 +29025,7 @@
+@@ -28291,8 +30728,13 @@
+ /* end confdefs.h. */
+ #include <$x_direct_test_include>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -28359,6 +30801,7 @@
fi
done
fi
@@ -28197,7 +35074,52 @@
rm -f conftest.err conftest.$ac_ext
fi # $ac_x_includes = NO
-@@ -28416,7 +29083,7 @@
+@@ -28388,24 +30831,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -28416,7 +30871,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28206,7 +35128,7 @@
# First see if replacing the include by lib works.
# Check X11 before X11Rn because it is often a symlink to the current release.
for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
-@@ -28464,6 +29131,7 @@
+@@ -28464,6 +30919,7 @@
done
done
fi
@@ -28214,7 +35136,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi # $ac_x_libraries = NO
-@@ -28474,7 +29142,7 @@
+@@ -28474,21 +30930,26 @@
*-*-solaris*)
;;
*)
@@ -28222,15 +35144,24 @@
+ rm -f -r conftest.dir
if mkdir conftest.dir; then
cd conftest.dir
- # Make sure to not put "make" in the Imakefile rules, since we grep it out.
-@@ -28482,13 +29150,13 @@
- acfindx:
- @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
+- # Make sure to not put "make" in the Imakefile rules, since we grep it out.
+ cat >Imakefile <<'_ACEOF'
+-acfindx:
+- @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
++incroot:
++ @echo incroot='${INCROOT}'
++usrlibdir:
++ @echo usrlibdir='${USRLIBDIR}'
++libdir:
++ @echo libdir='${LIBDIR}'
_ACEOF
- if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
+ if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
- eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
+- eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
++ for ac_var in incroot usrlibdir libdir; do
++ eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
++ done
# Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
for ac_extension in a so sl; do
- if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
@@ -28240,7 +35171,7 @@
ac_im_usrlibdir=$ac_im_libdir; break
fi
done
-@@ -28496,7 +29164,7 @@
+@@ -28496,7 +30957,7 @@
# bogus both because they are the default anyway, and because
# using them would break gcc on systems where it needs fixed includes.
case $ac_im_incroot in
@@ -28249,7 +35180,7 @@
*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
esac
case $ac_im_usrlibdir in
-@@ -28505,7 +29173,7 @@
+@@ -28505,7 +30966,7 @@
esac
fi
cd ..
@@ -28258,7 +35189,7 @@
fi
if test -z "$ac_x_includes"; then
-@@ -28549,12 +29217,12 @@
+@@ -28549,12 +31010,12 @@
eval "$kde_cv_have_x"
if test "$have_x" != yes; then
@@ -28275,7 +35206,7 @@
fi
if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
-@@ -28582,8 +29250,8 @@
+@@ -28582,8 +31043,8 @@
# These have to be linked with before -lX11, unlike the other
# libraries we check for below, so use a different variable.
# --interran at uluru.Stanford.EDU, kb at cs.umb.edu.
@@ -28286,7 +35217,7 @@
if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28596,17 +29264,17 @@
+@@ -28596,40 +31057,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28308,7 +35239,50 @@
;
return 0;
}
-@@ -28638,14 +29306,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -28638,14 +31111,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28327,7 +35301,7 @@
if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
LIBSM="-lSM -lICE"
fi
-@@ -28654,8 +29323,8 @@
+@@ -28654,8 +31128,8 @@
LIB_X11='-lX11 $(LIBSOCKET)'
@@ -28338,7 +35312,52 @@
if test "${kde_cv_have_libXext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28715,9 +29384,10 @@
+@@ -28689,24 +31163,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -28715,9 +31201,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28350,7 +35369,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-@@ -28727,8 +29397,8 @@
+@@ -28727,8 +31214,8 @@
fi
@@ -28361,7 +35380,7 @@
if test "$kde_cv_have_libXext" = "no"; then
{ { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
-@@ -28874,8 +29544,8 @@
+@@ -28874,8 +31361,8 @@
else
PTHREAD_LIBS_save="$PTHREAD_LIBS"
PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
@@ -28372,7 +35391,7 @@
kde_save_LDFLAGS="$LDFLAGS"
kde_save_LIBS="$LIBS"
-@@ -28886,9 +29556,9 @@
+@@ -28886,9 +31373,9 @@
;;
esac
as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
@@ -28385,7 +35404,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -28900,17 +29570,17 @@
+@@ -28900,40 +31387,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28407,7 +35426,50 @@
;
return 0;
}
-@@ -28942,14 +29612,16 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -28942,14 +31441,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28427,7 +35489,7 @@
if test `eval echo '${'$as_ac_Lib'}'` = yes; then
LIBPTHREAD="$PTHREAD_LIBS_save"
fi
-@@ -28962,8 +29634,8 @@
+@@ -28962,8 +31463,8 @@
fi
if test -z "$LIBPTHREAD"; then
@@ -28438,7 +35500,7 @@
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28976,17 +29648,17 @@
+@@ -28976,40 +31477,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28460,7 +35522,50 @@
;
return 0;
}
-@@ -29018,14 +29690,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -29018,14 +31531,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28479,7 +35584,7 @@
if test $ac_cv_lib_pthread_pthread_create = yes; then
LIBPTHREAD="-lpthread"
fi
-@@ -29033,8 +29706,8 @@
+@@ -29033,8 +31547,8 @@
fi
if test -z "$LIBPTHREAD" ; then
@@ -28490,8 +35595,50 @@
kde_safe_libs=$LIBS
LIBS="$LIBS -lpthread"
cat >conftest.$ac_ext <<_ACEOF
-@@ -29075,17 +29748,18 @@
+@@ -29053,39 +31567,52 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:$LINENO: result: yes" >&5
@@ -28513,7 +35660,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -29101,16 +29775,15 @@
+@@ -29101,16 +31628,15 @@
USE_THREADS=""
if test -z "$LIBPTHREAD"; then
@@ -28534,7 +35681,52 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -29163,7 +29836,9 @@
+@@ -29137,24 +31663,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -29163,7 +31701,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28544,7 +35736,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -29177,13 +29852,13 @@
+@@ -29177,13 +31717,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -28562,7 +35754,7 @@
:
fi
-@@ -29195,16 +29870,15 @@
+@@ -29195,16 +31735,15 @@
case $host_os in
solaris*)
@@ -28583,7 +35775,52 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -29257,7 +29931,9 @@
+@@ -29231,24 +31770,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -29257,7 +31808,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28593,7 +35830,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -29271,13 +29947,13 @@
+@@ -29271,13 +31824,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -28611,7 +35848,7 @@
:
fi
-@@ -29304,17 +29980,17 @@
+@@ -29304,17 +31857,17 @@
@@ -28635,7 +35872,7 @@
kde_extra_includes=
if test -n "$kde_use_extra_includes" && \
test "$kde_use_extra_includes" != "NONE"; then
-@@ -29332,21 +30008,21 @@
+@@ -29332,21 +31885,21 @@
fi
@@ -28665,7 +35902,7 @@
if test -n "$kde_use_extra_libs" && \
test "$kde_use_extra_libs" != "NONE"; then
-@@ -29365,14 +30041,14 @@
+@@ -29365,14 +31918,14 @@
@@ -28684,7 +35921,52 @@
if test "${ac_cv_lib_z+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29432,8 +30108,9 @@
+@@ -29406,24 +31959,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -29432,8 +31997,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28695,7 +35977,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$kde_save_LIBS"
-@@ -29447,8 +30124,8 @@
+@@ -29447,8 +32013,8 @@
_ACEOF
LIBZ="$ac_cv_lib_z"
@@ -28706,7 +35988,7 @@
else
{ { echo "$as_me:$LINENO: error: not found.
Possibly configure picks up an outdated version
-@@ -29468,8 +30145,8 @@
+@@ -29468,8 +32034,8 @@
@@ -28717,7 +35999,52 @@
if test "${ac_cv_lib_png+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29531,9 +30208,10 @@
+@@ -29505,24 +32071,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -29531,9 +32109,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28729,7 +36056,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$kde_save_LIBS"
-@@ -29548,19 +30226,19 @@
+@@ -29548,19 +32127,19 @@
LIBPNG="$ac_cv_lib_png"
@@ -28755,7 +36082,52 @@
if test "${ac_cv_lib_jpeg_6b+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29619,8 +30297,9 @@
+@@ -29593,24 +32172,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -29619,8 +32210,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28766,7 +36138,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
-@@ -29631,14 +30310,14 @@
+@@ -29631,14 +32223,14 @@
if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
LIBJPEG="$ac_cv_lib_jpeg_6b"
@@ -28787,7 +36159,52 @@
if test "${ac_cv_lib_jpeg_normal+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29697,8 +30376,9 @@
+@@ -29671,24 +32263,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -29697,8 +32301,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28798,7 +36215,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
-@@ -29709,11 +30389,11 @@
+@@ -29709,11 +32314,11 @@
if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
LIBJPEG="$ac_cv_lib_jpeg_normal"
@@ -28814,16 +36231,16 @@
LIBJPEG=
-@@ -29733,7 +30413,7 @@
+@@ -29733,7 +32338,7 @@
do
for j in jpeglib.h;
do
- echo "configure: 29736: $i/$j" >&5
-+ echo "configure: 30416: $i/$j" >&5
++ echo "configure: 32341: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -29780,14 +30460,14 @@
+@@ -29780,14 +32385,14 @@
@@ -28841,7 +36258,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29830,8 +30510,8 @@
+@@ -29830,8 +32435,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -28852,7 +36269,7 @@
{ { echo "$as_me:$LINENO: error: No Perl found in your $PATH.
We need perl to generate some code." >&5
-@@ -29840,8 +30520,8 @@
+@@ -29840,8 +32445,8 @@
{ (exit 1); exit 1; }; }
else
@@ -28863,7 +36280,7 @@
PERL=$kde_cv_path
fi
-@@ -29855,10 +30535,9 @@
+@@ -29855,10 +32460,9 @@
@@ -28876,7 +36293,7 @@
else
if test $kde_qtver = 3; then
-@@ -29868,7 +30547,8 @@
+@@ -29868,7 +32472,8 @@
fi
@@ -28886,7 +36303,7 @@
USING_QT_MT=""
-@@ -29888,13 +30568,13 @@
+@@ -29888,13 +32493,13 @@
else
kde_check_threading_default=yes
fi
@@ -28904,7 +36321,7 @@
if test "x$kde_use_threading" = "xyes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -29966,8 +30646,8 @@
+@@ -29966,8 +32571,8 @@
LIBQT="$LIBQT $LIBDL"
fi
@@ -28915,7 +36332,7 @@
if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
-@@ -29976,34 +30656,34 @@
+@@ -29976,34 +32581,34 @@
qt_libraries=""
qt_includes=""
@@ -28962,16 +36379,16 @@
if test "${ac_cv_have_qt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -30031,7 +30711,7 @@
+@@ -30031,7 +32636,7 @@
do
for j in $kde_qt_header;
do
- echo "configure: 30034: $i/$j" >&5
-+ echo "configure: 30714: $i/$j" >&5
++ echo "configure: 32639: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -30068,8 +30748,7 @@
+@@ -30068,8 +32673,7 @@
ac_qt_libraries="$qt_libdir"
@@ -28981,7 +36398,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30206,13 +30885,13 @@
+@@ -30206,13 +32810,13 @@
eval "$ac_cv_have_qt"
if test "$have_qt" != yes; then
@@ -28999,7 +36416,7 @@
qt_libraries="$ac_qt_libraries"
qt_includes="$ac_qt_includes"
-@@ -30221,15 +30900,14 @@
+@@ -30221,15 +32825,14 @@
if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
@@ -29018,7 +36435,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30350,12 +31028,12 @@
+@@ -30350,12 +32953,12 @@
if test "$kde_cv_qt_direct" = "yes"; then
@@ -29035,7 +36452,7 @@
fi
-@@ -30393,14 +31071,14 @@
+@@ -30393,14 +32996,14 @@
fi
@@ -29053,7 +36470,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30443,8 +31121,8 @@
+@@ -30443,8 +33046,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -29064,7 +36481,7 @@
{ { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found!
Please check whether you installed Qt correctly.
-@@ -30465,22 +31143,22 @@
+@@ -30465,22 +33068,22 @@
{ (exit 1); exit 1; }; }
else
@@ -29092,7 +36509,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30523,12 +31201,12 @@
+@@ -30523,12 +33126,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -29109,7 +36526,7 @@
UIC_PATH=$kde_cv_path
fi
-@@ -30558,10 +31236,10 @@
+@@ -30558,10 +33161,10 @@
if test $kde_qtver = 3; then
@@ -29123,7 +36540,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30584,22 +31262,22 @@
+@@ -30584,22 +33187,22 @@
if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -29153,7 +36570,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30622,13 +31300,13 @@
+@@ -30622,13 +33225,13 @@
if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -29171,7 +36588,7 @@
:
ac_uic_supports_nounload=no
fi
-@@ -30659,15 +31337,14 @@
+@@ -30659,15 +33262,14 @@
if test -n "$LIBJPEG"; then
@@ -29190,7 +36607,52 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30726,8 +31403,9 @@
+@@ -30700,24 +33302,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -30726,8 +33340,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29201,7 +36663,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
-@@ -30744,12 +31422,12 @@
+@@ -30744,12 +33359,12 @@
if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
@@ -29218,7 +36680,7 @@
LIBJPEG_QT=
fi
-@@ -30780,15 +31458,15 @@
+@@ -30780,15 +33395,15 @@
@@ -29240,7 +36702,7 @@
if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
-@@ -30812,11 +31490,11 @@
+@@ -30812,11 +33427,11 @@
@@ -29256,34 +36718,34 @@
if test "${prefix}" != NONE; then
kde_includes=${includedir}
-@@ -30868,7 +31546,7 @@
+@@ -30868,7 +33483,7 @@
do
for j in $kde_check_header;
do
- echo "configure: 30871: $i/$j" >&5
-+ echo "configure: 31549: $i/$j" >&5
++ echo "configure: 33486: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -30898,7 +31576,7 @@
+@@ -30898,7 +33513,7 @@
do
for j in $kde_check_lib;
do
- echo "configure: 30901: $i/$j" >&5
-+ echo "configure: 31579: $i/$j" >&5
++ echo "configure: 33516: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -30916,7 +31594,7 @@
+@@ -30916,7 +33531,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
- echo "configure: 30919: $i/$j" >&5
-+ echo "configure: 31597: $i/$j" >&5
++ echo "configure: 33534: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -30975,12 +31653,12 @@
+@@ -30975,12 +33590,12 @@
fi
if test "$exec_prefix" = NONE; then
ac_kde_exec_prefix="$ac_kde_prefix"
@@ -29300,7 +36762,7 @@
fi
kde_libraries="${libdir}"
-@@ -30989,8 +31667,8 @@
+@@ -30989,8 +33604,8 @@
else
ac_cv_have_kde="have_kde=yes \
ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
@@ -29311,7 +36773,7 @@
kde_libraries="$ac_kde_libraries"
kde_includes="$ac_kde_includes"
-@@ -31028,8 +31706,8 @@
+@@ -31028,8 +33643,8 @@
if test x$ac_uic_supports_libpath = xyes; then
@@ -29322,7 +36784,7 @@
if test "${kde_cv_uic_plugins+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31072,8 +31750,8 @@
+@@ -31072,8 +33687,8 @@
fi
@@ -29333,7 +36795,7 @@
if test "$kde_cv_uic_plugins" != yes; then
{ { echo "$as_me:$LINENO: error:
you need to install kdelibs first.
-@@ -31105,10 +31783,9 @@
+@@ -31105,10 +33720,9 @@
@@ -29346,46 +36808,46 @@
if test "$enableval" = "no";
then ac_use_path_checking="default"
else ac_use_path_checking=""
-@@ -31122,13 +31799,14 @@
+@@ -31122,13 +33736,14 @@
fi
-fi;
+fi
++
-echo "$as_me:$LINENO: checking for KDE paths" >&5
-echo $ECHO_N "checking for KDE paths... $ECHO_C" >&6
-+
+{ echo "$as_me:$LINENO: checking for KDE paths" >&5
+echo $ECHO_N "checking for KDE paths... $ECHO_C" >&6; }
kde_result=""
kde_cached_paths=yes
if test "${kde_cv_all_paths+set}" = set; then
-@@ -31239,15 +31917,14 @@
+@@ -31239,15 +33854,14 @@
else
if test $kde_qtver = 1; then
- echo "$as_me:$LINENO: result: compiling" >&5
-echo "${ECHO_T}compiling" >&6
--
+ { echo "$as_me:$LINENO: result: compiling" >&5
+echo "${ECHO_T}compiling" >&6; }
+
- echo "$as_me:$LINENO: checking for KDE headers installed" >&5
-echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6
-
+ { echo "$as_me:$LINENO: checking for KDE headers installed" >&5
+echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6; }
+-
- ac_ext=cc
+ ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -31299,8 +31976,8 @@
+@@ -31299,8 +33913,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -29396,7 +36858,7 @@
else
{ { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
Check, if you installed the KDE header files correctly.
-@@ -31339,8 +32016,8 @@
+@@ -31339,8 +33953,8 @@
KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
fi
@@ -29407,7 +36869,7 @@
ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-@@ -31348,8 +32025,8 @@
+@@ -31348,8 +33962,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest; then
@@ -29418,28 +36880,28 @@
else
{ { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
Check, if your compiler is installed correctly and if you have used the
-@@ -31542,15 +32219,14 @@
+@@ -31542,15 +34156,14 @@
else
if test $kde_qtver = 1; then
- echo "$as_me:$LINENO: result: compiling" >&5
-echo "${ECHO_T}compiling" >&6
+-
+ { echo "$as_me:$LINENO: result: compiling" >&5
+echo "${ECHO_T}compiling" >&6; }
-
- echo "$as_me:$LINENO: checking for KDE headers installed" >&5
-echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6
+
+ { echo "$as_me:$LINENO: checking for KDE headers installed" >&5
+echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6; }
--
- ac_ext=cc
+ ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -31602,8 +32278,8 @@
+@@ -31602,8 +34215,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -29450,7 +36912,7 @@
else
{ { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
Check, if you installed the KDE header files correctly.
-@@ -31642,8 +32318,8 @@
+@@ -31642,8 +34255,8 @@
KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
fi
@@ -29461,7 +36923,7 @@
ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-@@ -31651,8 +32327,8 @@
+@@ -31651,8 +34264,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest; then
@@ -29472,7 +36934,7 @@
else
{ { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
Check, if your compiler is installed correctly and if you have used the
-@@ -31744,22 +32420,22 @@
+@@ -31744,22 +34357,22 @@
{ (exit 1); exit 1; }; }
else
rm -f conftest*
@@ -29501,7 +36963,7 @@
if test "$build_arts" '!=' "no"; then
-@@ -31792,14 +32468,14 @@
+@@ -31792,14 +34405,14 @@
kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
@@ -29519,7 +36981,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31842,8 +32518,8 @@
+@@ -31842,8 +34455,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -29530,7 +36992,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidl was not found!
Please check whether you installed KDE correctly.
-@@ -31854,21 +32530,21 @@
+@@ -31854,21 +34467,21 @@
{ (exit 1); exit 1; }; }
else
@@ -29557,7 +37019,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31911,8 +32587,8 @@
+@@ -31911,8 +34524,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -29568,7 +37030,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found!
Please check whether you installed KDE correctly.
-@@ -31923,22 +32599,22 @@
+@@ -31923,22 +34536,22 @@
{ (exit 1); exit 1; }; }
else
@@ -29596,7 +37058,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31981,8 +32657,8 @@
+@@ -31981,8 +34594,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -29607,7 +37069,7 @@
{ { echo "$as_me:$LINENO: error: The important program mcopidl was not found!
Please check whether you installed aRts correctly or use
-@@ -31995,21 +32671,21 @@
+@@ -31995,21 +34608,21 @@
{ (exit 1); exit 1; }; }
else
@@ -29634,7 +37096,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32052,8 +32728,8 @@
+@@ -32052,8 +34665,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -29645,7 +37107,7 @@
{ { echo "$as_me:$LINENO: error: The important program artsc-config was not found!
Please check whether you installed aRts correctly or use
-@@ -32066,22 +32742,22 @@
+@@ -32066,22 +34679,22 @@
{ (exit 1); exit 1; }; }
else
@@ -29673,7 +37135,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32124,12 +32800,12 @@
+@@ -32124,12 +34737,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -29690,7 +37152,7 @@
MEINPROC=$kde_cv_path
fi
-@@ -32158,14 +32834,14 @@
+@@ -32158,14 +34771,14 @@
if test -n "$kde32ornewer"; then
@@ -29708,7 +37170,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32208,8 +32884,8 @@
+@@ -32208,8 +34821,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -29719,7 +37181,7 @@
{ { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found!
Please check whether you installed KDE correctly.
-@@ -32220,21 +32896,21 @@
+@@ -32220,21 +34833,21 @@
{ (exit 1); exit 1; }; }
else
@@ -29746,7 +37208,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32277,8 +32953,8 @@
+@@ -32277,8 +34890,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -29757,7 +37219,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidlng was not found!
Please check whether you installed KDE correctly.
-@@ -32289,8 +32965,8 @@
+@@ -32289,8 +34902,8 @@
{ (exit 1); exit 1; }; }
else
@@ -29768,7 +37230,7 @@
DCOPIDLNG=$kde_cv_path
fi
-@@ -32298,14 +32974,14 @@
+@@ -32298,14 +34911,14 @@
fi
if test -n "$kde33ornewer"; then
@@ -29786,7 +37248,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32348,8 +33024,8 @@
+@@ -32348,8 +34961,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -29797,7 +37259,7 @@
{ { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found!
Please check whether you installed KDE correctly.
-@@ -32360,8 +33036,8 @@
+@@ -32360,8 +34973,8 @@
{ (exit 1); exit 1; }; }
else
@@ -29808,7 +37270,7 @@
MAKEKDEWIDGETS=$kde_cv_path
fi
-@@ -32369,14 +33045,14 @@
+@@ -32369,14 +34982,14 @@
fi
@@ -29826,7 +37288,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32419,12 +33095,12 @@
+@@ -32419,12 +35032,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -29843,116 +37305,119 @@
XMLLINT=$kde_cv_path
fi
-@@ -32439,7 +33115,7 @@
+@@ -32439,7 +35052,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
- echo "configure: 32442: $i/$j" >&5
-+ echo "configure: 33118: $i/$j" >&5
++ echo "configure: 35055: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -32595,170 +33271,42 @@
-
-
-
--#MIN_CONFIG
--
--
--
--
--
--
--ac_header_dirent=no
--for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
-- as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
+@@ -32605,9 +35218,9 @@
+ ac_header_dirent=no
+ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
+ as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
-echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <sys/types.h>
--#include <$ac_hdr>
--
--int
--main ()
--{
--if ((DIR *) 0)
--return 0;
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
++{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
++echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -32629,24 +35242,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- eval "$as_ac_Header=yes"
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -32655,12 +35280,14 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
-eval "$as_ac_Header=no"
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
++ eval "$as_ac_Header=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
--_ACEOF
--
--ac_header_dirent=$ac_hdr; break
--fi
--
--done
--# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
--if test $ac_header_dirent = dirent.h; then
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
+@@ -32672,13 +35299,12 @@
+ done
+ # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
+ if test $ac_header_dirent = dirent.h; then
- echo "$as_me:$LINENO: checking for library containing opendir" >&5
-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
--if test "${ac_cv_search_opendir+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- ac_func_search_save_LIBS=$LIBS
++ { echo "$as_me:$LINENO: checking for library containing opendir" >&5
++echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
+ if test "${ac_cv_search_opendir+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_func_search_save_LIBS=$LIBS
-ac_cv_search_opendir=no
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -32686,126 +35312,99 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
-char opendir ();
-int
-main ()
@@ -29996,43 +37461,24 @@
- for ac_lib in dir; do
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
- cat >conftest.$ac_ext <<_ACEOF
-+#MIN_CONFIG
-+
-+
-+
-+
-+
-+
-+ac_header_dirent=no
-+for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
-+ as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
-+echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+#include <sys/types.h>
-+#include <$ac_hdr>
-
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
-/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
+ #ifdef __cplusplus
+ extern "C"
+ #endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char opendir ();
+ char opendir ();
int
main ()
{
-opendir ();
-+if ((DIR *) 0)
-+return 0;
++return opendir ();
;
return 0;
}
@@ -30040,61 +37486,94 @@
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
++for ac_lib in '' dir; do
++ if test -z "$ac_lib"; then
++ ac_res="none required"
++ else
++ ac_res=-l$ac_lib
++ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
++ fi
++ rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -32772,40 +33320,42 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_search_opendir="-l$ac_lib"
-break
-+ eval "$as_ac_Header=yes"
++ ac_cv_search_opendir=$ac_res
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-+ eval "$as_ac_Header=no"
++
fi
--rm -f conftest.err conftest.$ac_objext \
++
+ rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- done
--fi
--LIBS=$ac_func_search_save_LIBS
-+
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++ conftest$ac_exeext
++ if test "${ac_cv_search_opendir+set}" = set; then
++ break
++fi
++done
++if test "${ac_cv_search_opendir+set}" = set; then
++ :
++else
++ ac_cv_search_opendir=no
fi
++rm conftest.$ac_ext
+ LIBS=$ac_func_search_save_LIBS
+ fi
-echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-echo "${ECHO_T}$ac_cv_search_opendir" >&6
-if test "$ac_cv_search_opendir" != no; then
- test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-+_ACEOF
++{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
++echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
++ac_res=$ac_cv_search_opendir
++if test "$ac_res" != no; then
++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+ac_header_dirent=$ac_hdr; break
fi
--else
+ else
- echo "$as_me:$LINENO: checking for library containing opendir" >&5
-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
-+done
-+# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
-+if test $ac_header_dirent = dirent.h; then
+ { echo "$as_me:$LINENO: checking for library containing opendir" >&5
+echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
if test "${ac_cv_search_opendir+set}" = set; then
@@ -30105,99 +37584,68 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -32813,22 +33363,29 @@
+@@ -32813,122 +35412,96 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char opendir ();
- int
- main ()
- {
+ builtin and then its argument prototype would still apply. */
+-char opendir ();
+-int
+-main ()
+-{
-opendir ();
-+return opendir ();
- ;
- return 0;
- }
- _ACEOF
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-+for ac_lib in '' dir; do
-+ if test -z "$ac_lib"; then
-+ ac_res="none required"
-+ else
-+ ac_res=-l$ac_lib
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ fi
-+ rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
-@@ -32850,40 +33407,73 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
- ac_cv_search_opendir="none required"
-+ ac_cv_search_opendir=$ac_res
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-if test "$ac_cv_search_opendir" = no; then
- for ac_lib in x; do
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
- cat >conftest.$ac_ext <<_ACEOF
-+ conftest$ac_exeext
-+ if test "${ac_cv_search_opendir+set}" = set; then
-+ break
-+fi
-+done
-+if test "${ac_cv_search_opendir+set}" = set; then
-+ :
-+else
-+ ac_cv_search_opendir=no
-+fi
-+rm conftest.$ac_ext
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-+echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
-+ac_res=$ac_cv_search_opendir
-+if test "$ac_res" != no; then
-+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+
-+fi
-+
-+else
-+ { echo "$as_me:$LINENO: checking for library containing opendir" >&5
-+echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
-+if test "${ac_cv_search_opendir+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_func_search_save_LIBS=$LIBS
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
-/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
@@ -30214,6 +37662,8 @@
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+for ac_lib in '' x; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
@@ -30222,12 +37672,44 @@
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
ac_status=$?
-@@ -32905,30 +33495,40 @@
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_search_opendir="-l$ac_lib"
-break
@@ -30276,7 +37758,52 @@
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32978,8 +33578,9 @@
+@@ -32952,24 +35525,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -32978,8 +35563,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30287,7 +37814,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
if test $ac_cv_header_stdc = yes; then
-@@ -33036,6 +33637,7 @@
+@@ -33036,6 +35622,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
@@ -30295,7 +37822,7 @@
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -33055,8 +33657,8 @@
+@@ -33055,18 +35642,27 @@
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
@@ -30306,7 +37833,30 @@
}
_ACEOF
rm -f conftest$ac_exeext
-@@ -33079,12 +33681,14 @@
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -33079,12 +35675,14 @@
( exit $ac_status )
ac_cv_header_stdc=no
fi
@@ -30324,7 +37874,7 @@
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -33115,18 +33719,19 @@
+@@ -33115,18 +35713,19 @@
for ac_header in fcntl.h sys/time.h unistd.h features.h alloca.h linux/awe_voice.h awe_voice.h /usr/src/sys/i386/isa/sound/awe_voice.h /usr/src/sys/gnu/i386/isa/sound/awe_voice.h linux/ucdrom.h sys/stdtypes.h sys/filio.h sys/audioio.h Alib.h sys/sem.h string.h getopt.h machine/endian.h sys/awe_voice.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -30352,7 +37902,52 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33163,15 +33768,16 @@
+@@ -33137,24 +35736,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -33163,15 +35774,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30374,7 +37969,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33205,9 +33811,10 @@
+@@ -33180,8 +35792,13 @@
+ /* end confdefs.h. */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -33205,9 +35822,10 @@
ac_header_preproc=no
fi
@@ -30387,7 +37998,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -33231,25 +33838,19 @@
+@@ -33231,25 +35849,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -30420,7 +38031,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -33266,18 +33867,19 @@
+@@ -33266,18 +35878,19 @@
for ac_header in linux/cdrom.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -30448,7 +38059,52 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33314,15 +33916,16 @@
+@@ -33288,24 +35901,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -33314,15 +35939,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30470,7 +38126,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33356,9 +33959,10 @@
+@@ -33331,8 +35957,13 @@
+ /* end confdefs.h. */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -33356,9 +35987,10 @@
ac_header_preproc=no
fi
@@ -30483,7 +38155,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -33382,25 +33986,19 @@
+@@ -33382,25 +36014,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -30516,7 +38188,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -33418,9 +34016,9 @@
+@@ -33418,9 +36044,9 @@
for ac_func in usleep snprintf
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -30529,7 +38201,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -33446,30 +34044,24 @@
+@@ -33446,53 +36072,59 @@
#undef $ac_func
@@ -30565,7 +38237,50 @@
;
return 0;
}
-@@ -33501,13 +34093,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -33501,13 +36133,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30584,7 +38299,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -33517,8 +34111,8 @@
+@@ -33517,8 +36151,8 @@
done
@@ -30595,7 +38310,7 @@
ARCH_TYPE=`uname -m`
if test `uname -s` = "FreeBSD"
-@@ -33531,13 +34125,13 @@
+@@ -33531,13 +36165,13 @@
;;
esac
fi;
@@ -30613,7 +38328,7 @@
as_ver=`echo|as -v 2>&1|grep ".*version.*"`
if test -z "$as_ver"
then
-@@ -33563,16 +34157,16 @@
+@@ -33563,16 +36197,16 @@
fi
fi
fi
@@ -30634,7 +38349,52 @@
if test "${ac_cv_header_time+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33622,12 +34216,13 @@
+@@ -33596,24 +36230,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -33622,12 +36268,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30651,7 +38411,7 @@
if test $ac_cv_header_time = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -33638,8 +34233,8 @@
+@@ -33638,8 +36285,8 @@
CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
@@ -30662,7 +38422,52 @@
if test "${ac_cv_x86_sse+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33692,14 +34287,15 @@
+@@ -33666,24 +36313,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -33692,14 +36351,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30681,7 +38486,7 @@
if test "x$ac_cv_x86_sse" = "xyes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -33724,8 +34320,8 @@
+@@ -33724,8 +36384,8 @@
@@ -30692,7 +38497,7 @@
if test "${ac_cv_type_signal+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33737,19 +34333,11 @@
+@@ -33737,56 +36397,61 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <signal.h>
@@ -30713,9 +38518,48 @@
;
return 0;
}
-@@ -33776,17 +34364,18 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_type_signal=void
+ ac_cv_type_signal=int
@@ -30736,7 +38580,7 @@
cat >>confdefs.h <<_ACEOF
#define RETSIGTYPE $ac_cv_type_signal
-@@ -33795,13 +34384,13 @@
+@@ -33795,13 +36460,13 @@
@@ -30754,7 +38598,7 @@
have_oggvorbis=no
if test "x$with_vorbis" != xno; then
-@@ -33818,8 +34407,8 @@
+@@ -33818,8 +36483,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -30765,7 +38609,7 @@
if test "${ac_cv_lib_ogg_ogg_page_version+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33832,17 +34421,17 @@
+@@ -33832,40 +36497,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -30787,7 +38631,50 @@
;
return 0;
}
-@@ -33874,14 +34463,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -33874,14 +36551,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30806,7 +38693,7 @@
if test $ac_cv_lib_ogg_ogg_page_version = yes; then
:
else
-@@ -33896,8 +34486,7 @@
+@@ -33896,8 +36574,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -30816,7 +38703,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -33907,17 +34496,17 @@
+@@ -33907,17 +36584,17 @@
if test "${ac_cv_header_vorbis_vorbisfile_h+set}" = set; then
@@ -30840,7 +38727,52 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33954,15 +34543,16 @@
+@@ -33928,24 +36605,36 @@
+ #include <vorbis/vorbisfile.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -33954,15 +36643,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30862,7 +38794,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33996,9 +34586,10 @@
+@@ -33971,8 +36661,13 @@
+ /* end confdefs.h. */
+ #include <vorbis/vorbisfile.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -33996,9 +36691,10 @@
ac_header_preproc=no
fi
@@ -30875,7 +38823,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -34022,25 +34613,18 @@
+@@ -34022,25 +36718,18 @@
echo "$as_me: WARNING: vorbis/vorbisfile.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: vorbis/vorbisfile.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: vorbis/vorbisfile.h: in the future, the compiler will take precedence" >&2;}
@@ -30906,7 +38854,7 @@
fi
if test $ac_cv_header_vorbis_vorbisfile_h = yes; then
-@@ -34068,8 +34652,8 @@
+@@ -34068,8 +36757,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -30917,7 +38865,7 @@
if test "${ac_cv_lib_vorbis_vorbis_info_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34082,17 +34666,17 @@
+@@ -34082,40 +36771,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -30939,7 +38887,50 @@
;
return 0;
}
-@@ -34124,14 +34708,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -34124,14 +36825,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30958,7 +38949,7 @@
if test $ac_cv_lib_vorbis_vorbis_info_init = yes; then
:
else
-@@ -34151,8 +34736,8 @@
+@@ -34151,8 +36853,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -30969,7 +38960,7 @@
if test "${ac_cv_lib_vorbisfile_ov_open+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34165,17 +34750,17 @@
+@@ -34165,40 +36867,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -30991,7 +38982,50 @@
;
return 0;
}
-@@ -34207,14 +34792,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -34207,14 +36921,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31010,7 +39044,7 @@
if test $ac_cv_lib_vorbisfile_ov_open = yes; then
:
else
-@@ -34234,8 +34820,8 @@
+@@ -34234,8 +36949,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -31021,7 +39055,7 @@
if test "${ac_cv_lib_vorbisenc_vorbis_encode_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34248,17 +34834,17 @@
+@@ -34248,40 +36963,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -31043,7 +39077,50 @@
;
return 0;
}
-@@ -34290,14 +34876,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -34290,14 +37017,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31062,7 +39139,7 @@
if test $ac_cv_lib_vorbisenc_vorbis_encode_init = yes; then
:
else
-@@ -34317,8 +34904,8 @@
+@@ -34317,8 +37045,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -31073,7 +39150,7 @@
if test "${ac_cv_lib_vorbis_vorbis_bitrate_addblock+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34331,17 +34918,17 @@
+@@ -34331,40 +37059,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -31095,7 +39172,50 @@
;
return 0;
}
-@@ -34373,14 +34960,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -34373,14 +37113,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31114,7 +39234,7 @@
if test $ac_cv_lib_vorbis_vorbis_bitrate_addblock = yes; then
have_vorbis_value=2
else
-@@ -34449,13 +35037,13 @@
+@@ -34449,13 +37190,13 @@
fi
@@ -31132,7 +39252,7 @@
if test "x$with_ossaudio" != xno; then
-@@ -34466,18 +35054,19 @@
+@@ -34466,18 +37207,19 @@
for ac_header in soundcard.h sys/soundcard.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -31160,7 +39280,52 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34514,15 +35103,16 @@
+@@ -34488,24 +37230,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -34514,15 +37268,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31182,7 +39347,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34556,9 +35146,10 @@
+@@ -34531,8 +37286,13 @@
+ /* end confdefs.h. */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -34556,9 +37316,10 @@
ac_header_preproc=no
fi
@@ -31195,7 +39376,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -34582,25 +35173,19 @@
+@@ -34582,25 +37343,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -31228,7 +39409,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -34613,8 +35198,8 @@
+@@ -34613,8 +37368,8 @@
done
@@ -31239,7 +39420,7 @@
if test "${ac_cv_lib_ossaudio__oss_ioctl+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34627,17 +35212,17 @@
+@@ -34627,40 +37382,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -31261,7 +39442,50 @@
;
return 0;
}
-@@ -34669,14 +35254,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -34669,14 +37436,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31280,7 +39504,7 @@
if test $ac_cv_lib_ossaudio__oss_ioctl = yes; then
:
else
-@@ -34700,13 +35286,13 @@
+@@ -34700,13 +37468,13 @@
fi
@@ -31298,7 +39522,7 @@
have_alsa=no
if test "x$with_alsa" != xno; then
-@@ -34718,18 +35304,19 @@
+@@ -34718,18 +37486,19 @@
for ac_header in sys/asoundlib.h alsa/asoundlib.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -31326,7 +39550,52 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34766,15 +35353,16 @@
+@@ -34740,24 +37509,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -34766,15 +37547,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31348,7 +39617,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34808,9 +35396,10 @@
+@@ -34783,8 +37565,13 @@
+ /* end confdefs.h. */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -34808,9 +37595,10 @@
ac_header_preproc=no
fi
@@ -31361,7 +39646,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -34834,25 +35423,19 @@
+@@ -34834,25 +37622,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -31394,7 +39679,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -34865,8 +35448,8 @@
+@@ -34865,8 +37647,8 @@
done
@@ -31405,7 +39690,7 @@
if test "${ac_cv_lib_asound_snd_seq_create_simple_port+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34879,17 +35462,17 @@
+@@ -34879,40 +37661,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -31427,7 +39712,50 @@
;
return 0;
}
-@@ -34921,14 +35504,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -34921,14 +37715,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31446,7 +39774,7 @@
if test $ac_cv_lib_asound_snd_seq_create_simple_port = yes; then
:
else
-@@ -34937,7 +35521,6 @@
+@@ -34937,7 +37732,6 @@
@@ -31454,7 +39782,52 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -35001,7 +35584,9 @@
+@@ -34975,24 +37769,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -35001,7 +37807,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31464,7 +39837,52 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
-@@ -35060,7 +35645,9 @@
+@@ -35034,24 +37842,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -35060,7 +37880,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31474,7 +39892,52 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
-@@ -35119,7 +35706,9 @@
+@@ -35093,24 +37915,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -35119,7 +37953,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31484,7 +39947,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
ac_ext=c
-@@ -35169,13 +35758,13 @@
+@@ -35169,13 +38005,13 @@
fi
@@ -31502,7 +39965,7 @@
have_cdparanoia=no
if test "x$with_cdparanoia" != xno; then
-@@ -35184,14 +35773,14 @@
+@@ -35184,14 +38020,14 @@
if test -z "$CDPARANOIA"; then
@@ -31520,7 +39983,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35234,12 +35823,12 @@
+@@ -35234,12 +38070,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -31537,7 +40000,7 @@
CDPARANOIA=$kde_cv_path
fi
-@@ -35254,8 +35843,7 @@
+@@ -35254,8 +38090,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -31547,7 +40010,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -35265,17 +35853,17 @@
+@@ -35265,17 +38100,17 @@
if test "${ac_cv_header_cdda_interface_h+set}" = set; then
@@ -31571,7 +40034,52 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35312,15 +35900,16 @@
+@@ -35286,24 +38121,36 @@
+ #include <cdda_interface.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -35312,15 +38159,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31593,7 +40101,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35354,9 +35943,10 @@
+@@ -35329,8 +38177,13 @@
+ /* end confdefs.h. */
+ #include <cdda_interface.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -35354,9 +38207,10 @@
ac_header_preproc=no
fi
@@ -31606,7 +40130,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -35380,25 +35970,18 @@
+@@ -35380,25 +38234,18 @@
echo "$as_me: WARNING: cdda_interface.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: cdda_interface.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: cdda_interface.h: in the future, the compiler will take precedence" >&2;}
@@ -31637,7 +40161,7 @@
fi
if test $ac_cv_header_cdda_interface_h = yes; then
-@@ -35418,12 +36001,11 @@
+@@ -35418,12 +38265,11 @@
# Older versions of FreeBSD's cdparanoia lack cdrom_drive.cdda_device_name
@@ -31652,8 +40176,50 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -35473,19 +36055,20 @@
+@@ -35451,41 +38297,54 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:$LINENO: result: yes" >&5
@@ -31677,7 +40243,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -35504,8 +36087,8 @@
+@@ -35504,8 +38363,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -31688,7 +40254,7 @@
if test "${ac_cv_lib_cdda_paranoia_paranoia_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35518,17 +36101,17 @@
+@@ -35518,40 +38377,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -31710,7 +40276,50 @@
;
return 0;
}
-@@ -35560,14 +36143,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -35560,14 +38431,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31729,16 +40338,16 @@
if test $ac_cv_lib_cdda_paranoia_paranoia_init = yes; then
:
else
-@@ -35586,7 +36170,7 @@
+@@ -35586,7 +38458,7 @@
do
for j in libcdda_paranoia.$ext;
do
- echo "configure: 35589: $i/$j" >&5
-+ echo "configure: 36173: $i/$j" >&5
++ echo "configure: 38461: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
para_libdir=$i
-@@ -35668,13 +36252,13 @@
+@@ -35668,13 +38540,13 @@
fi
@@ -31756,7 +40365,7 @@
have_lame=no
if test "x$with_lame" != xno; then
-@@ -35685,8 +36269,7 @@
+@@ -35685,8 +38557,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -31766,7 +40375,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -35696,17 +36279,17 @@
+@@ -35696,17 +38567,17 @@
if test "${ac_cv_header_lame_lame_h+set}" = set; then
@@ -31790,7 +40399,52 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35743,15 +36326,16 @@
+@@ -35717,24 +38588,36 @@
+ #include <lame/lame.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -35743,15 +38626,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31812,7 +40466,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35785,9 +36369,10 @@
+@@ -35760,8 +38644,13 @@
+ /* end confdefs.h. */
+ #include <lame/lame.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -35785,9 +38674,10 @@
ac_header_preproc=no
fi
@@ -31825,7 +40495,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -35811,25 +36396,18 @@
+@@ -35811,25 +38701,18 @@
echo "$as_me: WARNING: lame/lame.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: lame/lame.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: lame/lame.h: in the future, the compiler will take precedence" >&2;}
@@ -31856,7 +40526,7 @@
fi
if test $ac_cv_header_lame_lame_h = yes; then
-@@ -35857,8 +36435,8 @@
+@@ -35857,8 +38740,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -31867,7 +40537,7 @@
if test "${ac_cv_lib_mp3lame_lame_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35871,17 +36449,17 @@
+@@ -35871,40 +38754,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -31889,7 +40559,50 @@
;
return 0;
}
-@@ -35913,14 +36491,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -35913,14 +38808,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31908,7 +40621,7 @@
if test $ac_cv_lib_mp3lame_lame_init = yes; then
:
else
-@@ -35959,13 +36538,13 @@
+@@ -35959,13 +38855,13 @@
@@ -31926,7 +40639,7 @@
have_taglib=no
have_taglib_mpc=no
-@@ -35973,8 +36552,8 @@
+@@ -35973,8 +38869,8 @@
# Extract the first word of "taglib-config", so it can be a program name with args.
set dummy taglib-config; ac_word=$2
@@ -31937,7 +40650,7 @@
if test "${ac_cv_path_TAGLIB_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35990,29 +36569,30 @@
+@@ -35990,29 +38886,30 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -31974,7 +40687,7 @@
if test "x$TAGLIB_CONFIG" != xno; then
cat >>confdefs.h <<\_ACEOF
-@@ -36032,8 +36612,7 @@
+@@ -36032,8 +38929,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -31984,7 +40697,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -36043,17 +36622,17 @@
+@@ -36043,17 +38939,17 @@
if test "${ac_cv_header_taglib_mpcfile_h+set}" = set; then
@@ -32008,7 +40721,52 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36090,15 +36669,16 @@
+@@ -36064,24 +38960,36 @@
+ #include <taglib/mpcfile.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -36090,15 +38998,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32030,7 +40788,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36132,9 +36712,10 @@
+@@ -36107,8 +39016,13 @@
+ /* end confdefs.h. */
+ #include <taglib/mpcfile.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -36132,9 +39046,10 @@
ac_header_preproc=no
fi
@@ -32043,7 +40817,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -36158,25 +36739,18 @@
+@@ -36158,25 +39073,18 @@
echo "$as_me: WARNING: taglib/mpcfile.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: taglib/mpcfile.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: taglib/mpcfile.h: in the future, the compiler will take precedence" >&2;}
@@ -32074,7 +40848,7 @@
fi
if test $ac_cv_header_taglib_mpcfile_h = yes; then
-@@ -36207,21 +36781,21 @@
+@@ -36207,21 +39115,21 @@
fi
@@ -32102,7 +40876,7 @@
if test "${ac_cv_path_AKODE_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36237,29 +36811,30 @@
+@@ -36237,29 +39145,30 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -32139,7 +40913,7 @@
if test "x$AKODE_CONFIG" != xno; then
cat >>confdefs.h <<\_ACEOF
-@@ -36287,8 +36862,8 @@
+@@ -36287,8 +39196,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -32150,7 +40924,7 @@
if test "${ac_cv_lib_akode_mpeg_decoder_mpeg_decoder+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36301,17 +36876,17 @@
+@@ -36301,40 +39210,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -32172,7 +40946,50 @@
;
return 0;
}
-@@ -36343,14 +36918,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -36343,14 +39264,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32191,7 +41008,7 @@
if test $ac_cv_lib_akode_mpeg_decoder_mpeg_decoder = yes; then
have_akode_mpeg=yes
else
-@@ -36369,8 +36945,8 @@
+@@ -36369,8 +39291,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -32202,7 +41019,7 @@
if test "${ac_cv_lib_akode_mpc_decoder_mpc_decoder+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36383,17 +36959,17 @@
+@@ -36383,40 +39305,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -32224,7 +41041,50 @@
;
return 0;
}
-@@ -36425,14 +37001,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -36425,14 +39359,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32243,7 +41103,7 @@
if test $ac_cv_lib_akode_mpc_decoder_mpc_decoder = yes; then
have_akode_mpc=yes
else
-@@ -36451,8 +37028,8 @@
+@@ -36451,8 +39386,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -32254,7 +41114,7 @@
if test "${ac_cv_lib_akode_xiph_decoder_xiph_decoder+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36465,17 +37042,17 @@
+@@ -36465,40 +39400,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -32276,7 +41136,50 @@
;
return 0;
}
-@@ -36507,14 +37084,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -36507,14 +39454,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32295,7 +41198,7 @@
if test $ac_cv_lib_akode_xiph_decoder_xiph_decoder = yes; then
have_akode_xiph=yes
else
-@@ -36533,8 +37111,8 @@
+@@ -36533,8 +39481,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -32306,7 +41209,7 @@
if test "${ac_cv_lib_akode_ffmpeg_decoder_ffmpeg_decoder+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36547,17 +37125,17 @@
+@@ -36547,40 +39495,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -32328,7 +41231,50 @@
;
return 0;
}
-@@ -36589,14 +37167,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -36589,14 +39549,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32347,7 +41293,7 @@
if test $ac_cv_lib_akode_ffmpeg_decoder_ffmpeg_decoder = yes; then
have_akode_ffmpeg=yes
else
-@@ -36660,8 +37239,8 @@
+@@ -36660,8 +39621,8 @@
artsc_config_test_path=$prefix/bin:$exec_prefix/bin:$KDEDIR/bin:$PATH
# Extract the first word of "artsc-config", so it can be a program name with args.
set dummy artsc-config; ac_word=$2
@@ -32358,7 +41304,7 @@
if test "${ac_cv_path_ARTSCCONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36676,29 +37255,30 @@
+@@ -36676,29 +39637,30 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -32395,7 +41341,7 @@
if test "x$build_arts" = "xyes" && test "x$ARTSCCONFIG" != "xno" ; then
LIB_ARTS="-lartskde"
ARTS_PREFIX=`$ARTSCCONFIG --arts-prefix`
-@@ -36737,8 +37317,8 @@
+@@ -36737,8 +39699,8 @@
artsc_config_test_path=$prefix/bin:$exec_prefix/bin:$KDEDIR/bin:$PATH
# Extract the first word of "artsc-config", so it can be a program name with args.
set dummy artsc-config; ac_word=$2
@@ -32406,7 +41352,7 @@
if test "${ac_cv_path_kde_artsplug_compiles+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36753,29 +37333,30 @@
+@@ -36753,29 +39715,30 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -32443,7 +41389,7 @@
if test x$kde_artsplug_compiles != xno; then
ARTSCCONFIG=$kde_artsplug_compiles;
kde_artsplug_compiles=yes
-@@ -36784,25 +37365,25 @@
+@@ -36784,25 +39747,25 @@
if test x$kde_artsplug_compiles = xyes; then
ARTSC_INCLUDE=`${ARTSCCONFIG} --cflags`
@@ -32477,7 +41423,7 @@
DO_NOT_COMPILE="$DO_NOT_COMPILE mpeglib_artsplug"
fi
-@@ -36831,13 +37412,13 @@
+@@ -36831,13 +39794,13 @@
else
kde_check_threading_default=yes
fi
@@ -32495,7 +41441,7 @@
if test "x$kde_use_threading" = "xyes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -36848,17 +37429,17 @@
+@@ -36848,17 +39811,17 @@
@@ -32519,7 +41465,7 @@
if test "${ac_cv_path_ARTSCCONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36873,28 +37454,29 @@
+@@ -36873,28 +39836,29 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -32555,7 +41501,7 @@
if test "x$ARTSCCONFIG" = "xno" ; then
{ { echo "$as_me:$LINENO: error: Cannot find artsc-config - missing from path?" >&5
echo "$as_me: error: Cannot find artsc-config - missing from path?" >&2;}
-@@ -36919,8 +37501,8 @@
+@@ -36919,8 +39883,8 @@
ARTS_BUILD_KDE=""
ARTS_BUILD_KDE_GUI=""
else
@@ -32566,7 +41512,7 @@
arts_datadir="$kde_datadir"
arts_includes="$kde_includes/arts"
-@@ -36951,13 +37533,13 @@
+@@ -36951,13 +39915,13 @@
@@ -32584,7 +41530,7 @@
arts_audiolib_found=no
if test "x$with_audiofile" != xno; then
-@@ -36968,7 +37550,6 @@
+@@ -36968,7 +39932,6 @@
CPPFLAGS="$CPPFLAGS $all_includes"
arts_audiolib_found=no
@@ -32592,7 +41538,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -36977,17 +37558,17 @@
+@@ -36977,17 +39940,17 @@
kde_has_audio_lib=no
if test "${ac_cv_header_audiofile_h+set}" = set; then
@@ -32616,7 +41562,52 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37024,15 +37605,16 @@
+@@ -36998,24 +39961,36 @@
+ #include <audiofile.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -37024,15 +39999,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32638,7 +41629,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37066,9 +37648,10 @@
+@@ -37041,8 +40017,13 @@
+ /* end confdefs.h. */
+ #include <audiofile.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -37066,9 +40047,10 @@
ac_header_preproc=no
fi
@@ -32651,7 +41658,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -37092,25 +37675,18 @@
+@@ -37092,25 +40074,18 @@
echo "$as_me: WARNING: audiofile.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: audiofile.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: audiofile.h: in the future, the compiler will take precedence" >&2;}
@@ -32682,7 +41689,7 @@
fi
if test $ac_cv_header_audiofile_h = yes; then
-@@ -37130,8 +37706,8 @@
+@@ -37130,8 +40105,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -32693,7 +41700,7 @@
if test "${ac_cv_lib_audiofile_afOpenFile+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37144,17 +37720,17 @@
+@@ -37144,40 +40119,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -32715,7 +41722,50 @@
;
return 0;
}
-@@ -37186,14 +37762,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -37186,14 +40173,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32734,7 +41784,7 @@
if test $ac_cv_lib_audiofile_afOpenFile = yes; then
LIBAUDIOFILE="$LDFLAGS -laudiofile"
-@@ -37235,13 +37812,13 @@
+@@ -37235,13 +40223,13 @@
@@ -32752,7 +41802,7 @@
have_musicbrainz=no
-@@ -37250,8 +37827,7 @@
+@@ -37250,8 +40238,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -32762,7 +41812,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -37261,17 +37837,17 @@
+@@ -37261,17 +40248,17 @@
if test "${ac_cv_header_tunepimp_tp_c_h+set}" = set; then
@@ -32786,7 +41836,52 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37308,15 +37884,16 @@
+@@ -37282,24 +40269,36 @@
+ #include <tunepimp/tp_c.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -37308,15 +40307,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32808,7 +41903,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37350,9 +37927,10 @@
+@@ -37325,8 +40325,13 @@
+ /* end confdefs.h. */
+ #include <tunepimp/tp_c.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -37350,9 +40355,10 @@
ac_header_preproc=no
fi
@@ -32821,7 +41932,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -37376,25 +37954,18 @@
+@@ -37376,25 +40382,18 @@
echo "$as_me: WARNING: tunepimp/tp_c.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: tunepimp/tp_c.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: tunepimp/tp_c.h: in the future, the compiler will take precedence" >&2;}
@@ -32852,7 +41963,7 @@
fi
if test $ac_cv_header_tunepimp_tp_c_h = yes; then
-@@ -37419,8 +37990,8 @@
+@@ -37419,8 +40418,8 @@
fi
if test "x$have_musicbrainz" = xyes; then
@@ -32863,7 +41974,7 @@
if test "${ac_cv_lib_tunepimp_tp_SetFileNameEncoding+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37433,17 +38004,17 @@
+@@ -37433,40 +40432,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -32885,7 +41996,50 @@
;
return 0;
}
-@@ -37475,14 +38046,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -37475,14 +40486,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32904,7 +42058,7 @@
if test $ac_cv_lib_tunepimp_tp_SetFileNameEncoding = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -37517,13 +38089,13 @@
+@@ -37517,13 +40529,13 @@
@@ -32922,7 +42076,7 @@
have_gst=no
-@@ -37544,8 +38116,8 @@
+@@ -37544,8 +40556,8 @@
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
@@ -32933,7 +42087,7 @@
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37560,28 +38132,29 @@
+@@ -37560,28 +40572,29 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -32969,7 +42123,7 @@
fi
if test "$PKG_CONFIG" = "no" ; then
-@@ -37592,30 +38165,30 @@
+@@ -37592,30 +40605,30 @@
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
@@ -33012,7 +42166,7 @@
else
GST_CFLAGS=""
GST_LIBS=""
-@@ -37654,8 +38227,8 @@
+@@ -37654,8 +40667,8 @@
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
@@ -33023,7 +42177,7 @@
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37670,28 +38243,29 @@
+@@ -37670,28 +40683,29 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -33059,7 +42213,7 @@
fi
if test "$PKG_CONFIG" = "no" ; then
-@@ -37702,30 +38276,30 @@
+@@ -37702,30 +40716,30 @@
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
@@ -33102,7 +42256,7 @@
else
GST_CFLAGS=""
GST_LIBS=""
-@@ -37853,13 +38427,13 @@
+@@ -37853,13 +40867,13 @@
@@ -33120,7 +42274,7 @@
have_theora=no
if test "x$with_theora" != xno; then
-@@ -37870,8 +38444,7 @@
+@@ -37870,8 +40884,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -33130,7 +42284,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -37881,17 +38454,17 @@
+@@ -37881,17 +40894,17 @@
if test "${ac_cv_header_theora_theora_h+set}" = set; then
@@ -33154,7 +42308,52 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37928,15 +38501,16 @@
+@@ -37902,24 +40915,36 @@
+ #include <theora/theora.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -37928,15 +40953,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33176,7 +42375,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37970,9 +38544,10 @@
+@@ -37945,8 +40971,13 @@
+ /* end confdefs.h. */
+ #include <theora/theora.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -37970,9 +41001,10 @@
ac_header_preproc=no
fi
@@ -33189,7 +42404,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -37996,25 +38571,18 @@
+@@ -37996,25 +41028,18 @@
echo "$as_me: WARNING: theora/theora.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: theora/theora.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: theora/theora.h: in the future, the compiler will take precedence" >&2;}
@@ -33220,7 +42435,7 @@
fi
if test $ac_cv_header_theora_theora_h = yes; then
-@@ -38043,8 +38611,8 @@
+@@ -38043,8 +41068,8 @@
;;
esac
@@ -33231,7 +42446,7 @@
if test "${ac_cv_lib_theora_theora_info_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -38057,17 +38625,17 @@
+@@ -38057,40 +41082,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -33253,7 +42468,50 @@
;
return 0;
}
-@@ -38099,14 +38667,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -38099,14 +41136,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33272,7 +42530,7 @@
if test $ac_cv_lib_theora_theora_info_init = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBTHEORA 1
-@@ -38146,16 +38715,15 @@
+@@ -38146,16 +41184,15 @@
@@ -33293,7 +42551,7 @@
ac_ext=c
-@@ -38169,8 +38737,7 @@
+@@ -38169,8 +41206,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -33303,7 +42561,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -38180,17 +38747,17 @@
+@@ -38180,17 +41216,17 @@
if test "${ac_cv_header_FLAC_metadata_h+set}" = set; then
@@ -33327,7 +42585,52 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38227,15 +38794,16 @@
+@@ -38201,24 +41237,36 @@
+ #include <FLAC/metadata.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -38227,15 +41275,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33349,7 +42652,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38269,9 +38837,10 @@
+@@ -38244,8 +41293,13 @@
+ /* end confdefs.h. */
+ #include <FLAC/metadata.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -38269,9 +41323,10 @@
ac_header_preproc=no
fi
@@ -33362,7 +42681,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -38295,25 +38864,18 @@
+@@ -38295,25 +41350,18 @@
echo "$as_me: WARNING: FLAC/metadata.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: FLAC/metadata.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: FLAC/metadata.h: in the future, the compiler will take precedence" >&2;}
@@ -33393,7 +42712,7 @@
fi
if test $ac_cv_header_FLAC_metadata_h = yes; then
-@@ -38327,8 +38889,8 @@
+@@ -38327,8 +41375,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -33404,7 +42723,7 @@
if test "${ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_process_single+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -38341,17 +38903,17 @@
+@@ -38341,40 +41389,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -33426,7 +42745,50 @@
;
return 0;
}
-@@ -38383,14 +38945,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -38383,14 +41443,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33445,7 +42807,7 @@
if test $ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_process_single = yes; then
have_libFLAC=yes
fi
-@@ -38429,7 +38992,6 @@
+@@ -38429,7 +41490,6 @@
@@ -33453,7 +42815,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -38441,8 +39003,7 @@
+@@ -38441,8 +41501,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -33463,7 +42825,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -38452,17 +39013,17 @@
+@@ -38452,17 +41511,17 @@
if test "${ac_cv_header_OggFLAC_seekable_stream_decoder_h+set}" = set; then
@@ -33487,7 +42849,52 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38499,15 +39060,16 @@
+@@ -38473,24 +41532,36 @@
+ #include <OggFLAC/seekable_stream_decoder.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -38499,15 +41570,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33509,7 +42916,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38541,9 +39103,10 @@
+@@ -38516,8 +41588,13 @@
+ /* end confdefs.h. */
+ #include <OggFLAC/seekable_stream_decoder.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -38541,9 +41618,10 @@
ac_header_preproc=no
fi
@@ -33522,7 +42945,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -38567,25 +39130,18 @@
+@@ -38567,25 +41645,18 @@
echo "$as_me: WARNING: OggFLAC/seekable_stream_decoder.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: OggFLAC/seekable_stream_decoder.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: OggFLAC/seekable_stream_decoder.h: in the future, the compiler will take precedence" >&2;}
@@ -33553,7 +42976,7 @@
fi
if test $ac_cv_header_OggFLAC_seekable_stream_decoder_h = yes; then
-@@ -38599,8 +39155,8 @@
+@@ -38599,8 +41670,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -33564,7 +42987,7 @@
if test "${ac_cv_lib_OggFLAC_OggFLAC__seekable_stream_decoder_process_single+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -38613,17 +39169,17 @@
+@@ -38613,40 +41684,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -33586,7 +43009,50 @@
;
return 0;
}
-@@ -38655,14 +39211,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -38655,14 +41738,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33605,7 +43071,7 @@
if test $ac_cv_lib_OggFLAC_OggFLAC__seekable_stream_decoder_process_single = yes; then
have_libOggFLAC=yes
fi
-@@ -38705,8 +39262,7 @@
+@@ -38705,8 +41789,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -33615,7 +43081,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -38716,17 +39272,17 @@
+@@ -38716,17 +41799,17 @@
if test "${ac_cv_header_libkmid_libkmid_h+set}" = set; then
@@ -33639,7 +43105,52 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38763,15 +39319,16 @@
+@@ -38737,24 +41820,36 @@
+ #include <libkmid/libkmid.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -38763,15 +41858,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33661,7 +43172,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38805,9 +39362,10 @@
+@@ -38780,8 +41876,13 @@
+ /* end confdefs.h. */
+ #include <libkmid/libkmid.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -38805,9 +41906,10 @@
ac_header_preproc=no
fi
@@ -33674,7 +43201,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -38831,25 +39389,18 @@
+@@ -38831,25 +41933,18 @@
echo "$as_me: WARNING: libkmid/libkmid.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: libkmid/libkmid.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: libkmid/libkmid.h: in the future, the compiler will take precedence" >&2;}
@@ -33705,7 +43232,7 @@
fi
if test $ac_cv_header_libkmid_libkmid_h = yes; then
-@@ -38877,8 +39428,8 @@
+@@ -38877,8 +41972,8 @@
DO_NOT_COMPILE="$DO_NOT_COMPILE krec"
fi
@@ -33716,7 +43243,7 @@
if test "${ac_cv_lib_cdaudio_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -38895,7 +39446,7 @@
+@@ -38895,30 +41990,42 @@
int
main ()
{
@@ -33725,7 +43252,50 @@
;
return 0;
}
-@@ -38927,20 +39478,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -38927,20 +42034,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33752,7 +43322,7 @@
if test "${ac_cv_lib_fpe_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -38957,7 +39509,7 @@
+@@ -38957,30 +42065,42 @@
int
main ()
{
@@ -33761,7 +43331,50 @@
;
return 0;
}
-@@ -38989,19 +39541,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -38989,19 +42109,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33787,7 +43400,7 @@
if test "${ac_cv_lib_cdrom_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39018,7 +39571,7 @@
+@@ -39018,30 +42139,42 @@
int
main ()
{
@@ -33796,7 +43409,50 @@
;
return 0;
}
-@@ -39050,21 +39603,22 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -39050,21 +42183,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33824,7 +43480,7 @@
if test "${ac_cv_lib_Alib_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39081,7 +39635,7 @@
+@@ -39081,30 +42215,42 @@
int
main ()
{
@@ -33833,7 +43489,50 @@
;
return 0;
}
-@@ -39113,20 +39667,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -39113,20 +42259,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33860,7 +43559,7 @@
if test "${ac_cv_lib_audio_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39143,7 +39698,7 @@
+@@ -39143,30 +42290,42 @@
int
main ()
{
@@ -33869,7 +43568,50 @@
;
return 0;
}
-@@ -39175,20 +39730,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -39175,20 +42334,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33896,7 +43638,7 @@
if test "${ac_cv_lib_mme_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39205,7 +39761,7 @@
+@@ -39205,30 +42365,42 @@
int
main ()
{
@@ -33905,7 +43647,50 @@
;
return 0;
}
-@@ -39237,14 +39793,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -39237,14 +42409,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33924,7 +43709,7 @@
if test $ac_cv_lib_mme_main = yes; then
LIBMME="-lmme";EXTRAINCS="-I/usr/include/mme"
fi
-@@ -39253,10 +39810,9 @@
+@@ -39253,10 +42426,9 @@
@@ -33937,29 +43722,29 @@
if test $enableval = "no"; then use_kscd_defaults="no"
else use_kscd_defaults="yes"
fi
-@@ -39264,16 +39820,17 @@
+@@ -39264,16 +42436,17 @@
else
use_kscd_defaults="yes"
-fi;
+fi
++
- ac_config_commands="$ac_config_commands default-1"
-
+ac_config_commands="$ac_config_commands default-1"
+
-echo "$as_me:$LINENO: checking if kscd can be compiled" >&5
-echo $ECHO_N "checking if kscd can be compiled... $ECHO_C" >&6
-+
+{ echo "$as_me:$LINENO: checking if kscd can be compiled" >&5
+echo $ECHO_N "checking if kscd can be compiled... $ECHO_C" >&6; }
case "$host" in
*-*-linux*) kscd_compile=yes;;
*-*-*bsdi*) kscd_compile=yes;;
-@@ -39282,8 +39839,8 @@
+@@ -39282,8 +42455,8 @@
*-*-*openbsd*) kscd_compile=yes;;
*) kscd_compile=yes;;
esac
@@ -33970,7 +43755,7 @@
if test "$kscd_compile" = "no"; then
DO_NOT_COMPILE="$DO_NOT_COMPILE kscd"
fi
-@@ -39297,14 +39854,13 @@
+@@ -39297,14 +42470,13 @@
fi
@@ -33989,7 +43774,7 @@
if test $withval = yes; then
libwm_with_cdda=yes
else
-@@ -39313,7 +39869,8 @@
+@@ -39313,7 +42485,8 @@
else
libwm_with_cdda=yes
@@ -33999,7 +43784,7 @@
if test "$libwm_with_cdda" = "yes"; then
case $host in
-@@ -39322,18 +39879,19 @@
+@@ -39322,18 +42495,19 @@
for ac_header in pthread.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -34027,7 +43812,52 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39370,15 +39928,16 @@
+@@ -39344,24 +42518,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -39370,15 +42556,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34049,7 +43879,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39412,9 +39971,10 @@
+@@ -39387,8 +42574,13 @@
+ /* end confdefs.h. */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -39412,9 +42604,10 @@
ac_header_preproc=no
fi
@@ -34062,7 +43908,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -39438,25 +39998,19 @@
+@@ -39438,25 +42631,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -34095,7 +43941,52 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -39530,8 +40084,9 @@
+@@ -39504,24 +42691,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -39530,8 +42729,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34106,7 +43997,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
;;
*-*-sunos*)
-@@ -39539,18 +40094,19 @@
+@@ -39539,18 +42739,19 @@
for ac_header in pthread.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -34134,7 +44025,52 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39587,15 +40143,16 @@
+@@ -39561,24 +42762,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -39587,15 +42800,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34156,7 +44092,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39629,9 +40186,10 @@
+@@ -39604,8 +42818,13 @@
+ /* end confdefs.h. */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -39629,9 +42848,10 @@
ac_header_preproc=no
fi
@@ -34169,7 +44121,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -39655,25 +40213,19 @@
+@@ -39655,25 +42875,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -34202,7 +44154,52 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -39736,8 +40288,9 @@
+@@ -39710,24 +42924,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -39736,8 +42962,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34213,7 +44210,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
;;
*)
-@@ -39764,8 +40317,8 @@
+@@ -39764,8 +42991,8 @@
fi
@@ -34224,7 +44221,7 @@
-@@ -39790,18 +40343,19 @@
+@@ -39790,18 +43017,19 @@
for ac_header in pthread.h pthread/mit/pthread.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -34252,7 +44249,52 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39838,15 +40392,16 @@
+@@ -39812,24 +43040,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -39838,15 +43078,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34274,7 +44316,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39880,9 +40435,10 @@
+@@ -39855,8 +43096,13 @@
+ /* end confdefs.h. */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -39880,9 +43126,10 @@
ac_header_preproc=no
fi
@@ -34287,7 +44345,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -39906,25 +40462,19 @@
+@@ -39906,25 +43153,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -34320,7 +44378,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -39941,18 +40491,19 @@
+@@ -39941,18 +43182,19 @@
for ac_header in sys/soundcard.h soundcard.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -34348,7 +44406,52 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39989,15 +40540,16 @@
+@@ -39963,24 +43205,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -39989,15 +43243,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34370,7 +44473,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40031,9 +40583,10 @@
+@@ -40006,8 +43261,13 @@
+ /* end confdefs.h. */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -40031,9 +43291,10 @@
ac_header_preproc=no
fi
@@ -34383,7 +44502,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -40057,25 +40610,19 @@
+@@ -40057,25 +43318,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -34416,7 +44535,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -40089,8 +40636,8 @@
+@@ -40089,8 +43344,8 @@
@@ -34427,7 +44546,97 @@
if test "${ac_cv_c_bigendian+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -40185,14 +40732,15 @@
+@@ -40116,24 +43371,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -40159,24 +43426,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -40185,14 +43464,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34445,7 +44654,7 @@
if test "$cross_compiling" = yes; then
# try to guess the endianness by grepping values into an object file
ac_cv_c_bigendian=unknown
-@@ -40202,11 +40750,11 @@
+@@ -40202,11 +43482,11 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -34461,7 +44670,52 @@
void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
int
main ()
-@@ -40253,7 +40801,9 @@
+@@ -40217,24 +43497,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -40253,7 +43545,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34471,7 +44725,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -40262,17 +40812,22 @@
+@@ -40262,27 +43556,41 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -34497,7 +44751,30 @@
}
_ACEOF
rm -f conftest$ac_exeext
-@@ -40295,13 +40850,16 @@
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -40295,13 +43603,16 @@
( exit $ac_status )
ac_cv_c_bigendian=yes
fi
@@ -34517,7 +44794,7 @@
case $ac_cv_c_bigendian in
yes)
-@@ -40325,8 +40883,8 @@
+@@ -40325,8 +43636,8 @@
@@ -34528,7 +44805,52 @@
if test "${ac_cv_c_attribute_aligned+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -40374,12 +40932,14 @@
+@@ -40348,24 +43659,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -40374,12 +43697,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34545,7 +44867,7 @@
if test x"$ac_cv_c_attribute_aligned" != x"0"; then
cat >>confdefs.h <<_ACEOF
-@@ -40402,8 +40962,8 @@
+@@ -40402,8 +43727,8 @@
LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS"
LIBS="$LIBS $LIB_XEXT -lX11 $X_EXTRA_LIBS"
@@ -34556,7 +44878,52 @@
x11_shared_mem=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -40455,10 +41015,12 @@
+@@ -40427,24 +43752,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -40455,10 +43792,12 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34571,7 +44938,7 @@
if test x$x11_shared_mem = xyes; then
cat >>confdefs.h <<\_ACEOF
-@@ -40468,8 +41030,8 @@
+@@ -40468,8 +43807,8 @@
fi
@@ -34582,7 +44949,52 @@
x11_dga2=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -40519,10 +41081,12 @@
+@@ -40491,24 +43830,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -40519,10 +43870,12 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34597,7 +45009,7 @@
if test x$x11_dga2 = xyes; then
cat >>confdefs.h <<\_ACEOF
-@@ -40532,8 +41096,8 @@
+@@ -40532,8 +43885,8 @@
DGALIBS="-lXxf86dga"
fi
@@ -34608,7 +45020,52 @@
x11_xv=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -40583,10 +41147,12 @@
+@@ -40555,24 +43908,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -40583,10 +43948,12 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34623,7 +45080,7 @@
if test x$x11_xv = xyes; then
cat >>confdefs.h <<\_ACEOF
-@@ -40596,8 +41162,8 @@
+@@ -40596,8 +43963,8 @@
XVLIBS="-lXv"
fi
@@ -34634,7 +45091,52 @@
x11_xvidmode=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -40647,10 +41213,12 @@
+@@ -40619,24 +43986,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -40647,10 +44026,12 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34649,7 +45151,7 @@
if test x$x11_xvidmode = xyes; then
cat >>confdefs.h <<\_ACEOF
-@@ -40674,22 +41242,14 @@
+@@ -40674,22 +44055,14 @@
LDFLAGS="$mpg_save_LDFLAGS"
CPPFLAGS="$mpg_save_CPPFLAGS"
@@ -34676,7 +45178,7 @@
-@@ -40714,8 +41274,8 @@
+@@ -40714,8 +44087,8 @@
kde_mpeglib_compiles=yes
;;
*)
@@ -34687,7 +45189,7 @@
DO_NOT_COMPILE="$DO_NOT_COMPILE mpeglib mpeglib_artsplug"
;;
esac
-@@ -40730,8 +41290,8 @@
+@@ -40730,8 +44103,8 @@
else
PTHREAD_LIBS_save="$PTHREAD_LIBS"
PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
@@ -34698,7 +45200,7 @@
kde_save_LDFLAGS="$LDFLAGS"
kde_save_LIBS="$LIBS"
-@@ -40742,9 +41302,9 @@
+@@ -40742,9 +44115,9 @@
;;
esac
as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
@@ -34711,7 +45213,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -40756,17 +41316,17 @@
+@@ -40756,40 +44129,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -34733,7 +45235,50 @@
;
return 0;
}
-@@ -40798,14 +41358,16 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -40798,14 +44183,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34753,7 +45298,7 @@
if test `eval echo '${'$as_ac_Lib'}'` = yes; then
LIBPTHREAD="$PTHREAD_LIBS_save"
fi
-@@ -40818,8 +41380,8 @@
+@@ -40818,8 +44205,8 @@
fi
if test -z "$LIBPTHREAD"; then
@@ -34764,7 +45309,7 @@
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -40832,17 +41394,17 @@
+@@ -40832,40 +44219,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -34786,7 +45331,50 @@
;
return 0;
}
-@@ -40874,14 +41436,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -40874,14 +44273,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34805,7 +45393,7 @@
if test $ac_cv_lib_pthread_pthread_create = yes; then
LIBPTHREAD="-lpthread"
fi
-@@ -40889,8 +41452,8 @@
+@@ -40889,8 +44289,8 @@
fi
if test -z "$LIBPTHREAD" ; then
@@ -34816,8 +45404,50 @@
kde_safe_libs=$LIBS
LIBS="$LIBS -lpthread"
cat >conftest.$ac_ext <<_ACEOF
-@@ -40931,17 +41494,18 @@
+@@ -40909,39 +44309,52 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:$LINENO: result: yes" >&5
@@ -34839,7 +45469,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -40955,8 +41519,8 @@
+@@ -40955,8 +44368,8 @@
case "$OS_TYPE" in
AIX)
@@ -34850,7 +45480,7 @@
cat >>confdefs.h <<\_ACEOF
#define OS_AIX 1
-@@ -40991,8 +41555,8 @@
+@@ -40991,8 +44404,8 @@
;;
NetBSD)
@@ -34861,7 +45491,7 @@
OS_TYPE="BSD"
cat >>confdefs.h <<\_ACEOF
-@@ -41011,8 +41575,8 @@
+@@ -41011,8 +44424,8 @@
;;
IRIX)
@@ -34872,7 +45502,7 @@
cat >>confdefs.h <<\_ACEOF
#define OS_IRIX 1
-@@ -41021,8 +41585,8 @@
+@@ -41021,8 +44434,8 @@
;;
HPUX)
@@ -34883,7 +45513,7 @@
cat >>confdefs.h <<\_ACEOF
#define OS_HPUX 1
-@@ -41031,8 +41595,8 @@
+@@ -41031,8 +44444,8 @@
;;
*)
@@ -34894,7 +45524,7 @@
;;
esac
-@@ -41183,9 +41747,9 @@
+@@ -41183,9 +44596,9 @@
ac_header_dirent=no
for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
@@ -34907,7 +45537,52 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -41233,12 +41797,14 @@
+@@ -41207,24 +44620,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -41233,12 +44658,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34925,7 +45600,7 @@
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-@@ -41250,13 +41816,12 @@
+@@ -41250,13 +44677,12 @@
done
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
@@ -34941,7 +45616,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -41264,149 +41829,29 @@
+@@ -41264,126 +44690,99 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -34950,7 +45625,9 @@
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
-char opendir ();
-int
-main ()
@@ -35001,80 +45678,6 @@
-/* end confdefs.h. */
-
-/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
--char opendir ();
--int
--main ()
--{
--opendir ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_search_opendir="-l$ac_lib"
--break
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
-- done
--fi
--LIBS=$ac_func_search_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
--echo "${ECHO_T}$ac_cv_search_opendir" >&6
--if test "$ac_cv_search_opendir" != no; then
-- test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
--
--fi
--
--else
-- echo "$as_me:$LINENO: checking for library containing opendir" >&5
--echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
--if test "${ac_cv_search_opendir+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- ac_func_search_save_LIBS=$LIBS
--ac_cv_search_opendir=no
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
#endif
@@ -35091,6 +45694,8 @@
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+for ac_lib in '' dir; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
@@ -35099,14 +45704,47 @@
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
ac_status=$?
-@@ -41428,40 +41873,73 @@
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-- ac_cv_search_opendir="none required"
+- ac_cv_search_opendir="-l$ac_lib"
+-break
+ ac_cv_search_opendir=$ac_res
else
echo "$as_me: failed program was:" >&5
@@ -35117,10 +45755,7 @@
+
rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
--if test "$ac_cv_search_opendir" = no; then
-- for ac_lib in x; do
-- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-- cat >conftest.$ac_ext <<_ACEOF
+- done
+ conftest$ac_exeext
+ if test "${ac_cv_search_opendir+set}" = set; then
+ break
@@ -35130,36 +45765,97 @@
+ :
+else
+ ac_cv_search_opendir=no
-+fi
+ fi
+rm conftest.$ac_ext
-+LIBS=$ac_func_search_save_LIBS
-+fi
+ LIBS=$ac_func_search_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
+-echo "${ECHO_T}$ac_cv_search_opendir" >&6
+-if test "$ac_cv_search_opendir" != no; then
+- test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
+{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
+echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
+ac_res=$ac_cv_search_opendir
+if test "$ac_res" != no; then
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+
-+fi
-+
-+else
+
+ fi
+
+ else
+- echo "$as_me:$LINENO: checking for library containing opendir" >&5
+-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for library containing opendir" >&5
+echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
-+if test "${ac_cv_search_opendir+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_func_search_save_LIBS=$LIBS
-+cat >conftest.$ac_ext <<_ACEOF
+ if test "${ac_cv_search_opendir+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_func_search_save_LIBS=$LIBS
+-ac_cv_search_opendir=no
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
- cat confdefs.h >>conftest.$ac_ext
+@@ -41391,122 +44790,96 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
+ builtin and then its argument prototype would still apply. */
+-char opendir ();
+-int
+-main ()
+-{
+-opendir ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_search_opendir="none required"
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-if test "$ac_cv_search_opendir" = no; then
+- for ac_lib in x; do
+- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
#endif
@@ -35176,6 +45872,8 @@
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+for ac_lib in '' x; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
@@ -35184,12 +45882,44 @@
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
ac_status=$?
-@@ -41483,30 +41961,40 @@
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_search_opendir="-l$ac_lib"
-break
@@ -35238,7 +45968,52 @@
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41556,8 +42044,9 @@
+@@ -41530,24 +44903,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -41556,8 +44941,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35249,7 +46024,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
if test $ac_cv_header_stdc = yes; then
-@@ -41614,6 +42103,7 @@
+@@ -41614,6 +45000,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
@@ -35257,7 +46032,7 @@
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -41633,8 +42123,8 @@
+@@ -41633,18 +45020,27 @@
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
@@ -35268,7 +46043,30 @@
}
_ACEOF
rm -f conftest$ac_exeext
-@@ -41657,12 +42147,14 @@
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -41657,12 +45053,14 @@
( exit $ac_status )
ac_cv_header_stdc=no
fi
@@ -35286,7 +46084,7 @@
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -41671,8 +42163,8 @@
+@@ -41671,8 +45069,8 @@
fi
@@ -35297,7 +46095,52 @@
if test "${ac_cv_header_time+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41722,12 +42214,13 @@
+@@ -41696,24 +45094,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -41722,12 +45132,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35314,7 +46157,7 @@
if test $ac_cv_header_time = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -41744,18 +42237,19 @@
+@@ -41744,18 +45155,19 @@
for ac_header in fcntl.h sys/time.h unistd.h stdlib.h paths.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -35342,7 +46185,52 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -41792,15 +42286,16 @@
+@@ -41766,24 +45178,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -41792,15 +45216,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35364,7 +46252,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -41834,9 +42329,10 @@
+@@ -41809,8 +45234,13 @@
+ /* end confdefs.h. */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -41834,9 +45264,10 @@
ac_header_preproc=no
fi
@@ -35377,7 +46281,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -41860,25 +42356,19 @@
+@@ -41860,25 +45291,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -35410,7 +46314,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -41894,9 +42384,9 @@
+@@ -41894,9 +45319,9 @@
for ac_func in usleep
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -35423,7 +46327,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -41922,30 +42412,24 @@
+@@ -41922,53 +45347,59 @@
#undef $ac_func
@@ -35459,7 +46363,50 @@
;
return 0;
}
-@@ -41977,13 +42461,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -41977,13 +45408,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35478,7 +46425,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -42011,11 +42497,10 @@
+@@ -42011,11 +45444,10 @@
@@ -35493,8 +46440,50 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -42068,8 +42553,8 @@
+@@ -42046,30 +45478,42 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:$LINENO: result: yes" >&5
@@ -35504,7 +46493,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_XSHMGETEVENTBASE 1
-@@ -42081,11 +42566,12 @@
+@@ -42081,11 +45525,12 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35519,7 +46508,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -42103,8 +42589,8 @@
+@@ -42103,8 +45548,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -35530,7 +46519,7 @@
if test "${ac_cv_lib_xine__x_ao_new_port+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -42117,17 +42603,17 @@
+@@ -42117,40 +45562,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -35552,7 +46541,50 @@
;
return 0;
}
-@@ -42159,14 +42645,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -42159,14 +45616,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35571,7 +46603,7 @@
if test $ac_cv_lib_xine__x_ao_new_port = yes; then
:
else
-@@ -42181,8 +42668,8 @@
+@@ -42181,8 +45639,8 @@
LDFLAGS="$kde_save_LDFLAGS"
LIBS="$kde_save_LIBS"
@@ -35582,7 +46614,7 @@
if test "${ac_cv_func_ao_new_port+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -42209,30 +42696,24 @@
+@@ -42209,53 +45667,59 @@
#undef ao_new_port
@@ -35618,7 +46650,50 @@
;
return 0;
}
-@@ -42264,49 +42745,50 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -42264,49 +45728,50 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35688,7 +46763,7 @@
if test x$xine_config_exec_prefix != x ; then
xine_config_args="$xine_config_args --exec-prefix=$xine_config_exec_prefix"
-@@ -42323,13 +42805,13 @@
+@@ -42323,13 +45788,13 @@
min_xine_version=1.0.0
if test "x$enable_xinetest" != "xyes" ; then
@@ -35706,7 +46781,7 @@
if test "${ac_cv_path_XINE_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -42344,30 +42826,31 @@
+@@ -42344,30 +45809,31 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -35746,7 +46821,7 @@
no_xine=""
if test "$XINE_CONFIG" = "no" ; then
no_xine=yes
-@@ -42388,7 +42871,6 @@
+@@ -42388,7 +45854,6 @@
CFLAGS="$CFLAGS $XINE_CFLAGS $all_includes"
LIBS="$XINE_LIBS $LIBS $all_libraries"
@@ -35754,7 +46829,34 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -42492,19 +42974,21 @@
+@@ -42473,13 +45938,22 @@
+
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -42492,19 +45966,21 @@
( exit $ac_status )
no_xine=yes
fi
@@ -35781,7 +46883,52 @@
if test "$XINE_CONFIG" = "no" ; then
echo "*** The xine-config script installed by XINE could not be found"
echo "*** If XINE was installed in PREFIX, make sure PREFIX/bin is in"
-@@ -42571,11 +43055,12 @@
+@@ -42536,24 +46012,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -42571,11 +46059,12 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35795,7 +46942,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$ac_save_CFLAGS"
-@@ -42602,9 +43087,9 @@
+@@ -42602,9 +46091,9 @@
for ac_func in strsep strpbrk setenv
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -35808,7 +46955,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -42630,30 +43115,24 @@
+@@ -42630,53 +46119,59 @@
#undef $ac_func
@@ -35844,7 +46991,50 @@
;
return 0;
}
-@@ -42685,13 +43164,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -42685,13 +46180,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35863,7 +47053,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -42733,8 +43214,8 @@
+@@ -42733,8 +46230,8 @@
fi
for i in $ac_topsubdirs; do
@@ -35874,7 +47064,7 @@
if test -d $srcdir/$i; then
install_it="yes"
for j in $DO_NOT_COMPILE; do
-@@ -42745,8 +43226,8 @@
+@@ -42745,8 +46242,8 @@
else
install_it="no"
fi
@@ -35885,7 +47075,7 @@
vari=`echo $i | sed -e 's,[-+.@],_,g'`
if test $install_it = "yes"; then
TOPSUBDIRS="$TOPSUBDIRS $i"
-@@ -42968,331 +43449,331 @@
+@@ -42968,331 +46465,331 @@
mpeglib_artsplug_SUBDIR_included_FALSE=
fi
@@ -36380,7 +47570,7 @@
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
-@@ -43312,39 +43793,58 @@
+@@ -43312,39 +46809,58 @@
# The following way of writing the cache mishandles newlines in values,
# but we know of no workaround that is simple, portable, and efficient.
@@ -36455,7 +47645,7 @@
fi
fi
rm -f confcache
-@@ -43353,38 +43853,31 @@
+@@ -43353,38 +46869,31 @@
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -36507,7 +47697,7 @@
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -43717,11 +44210,35 @@
+@@ -43717,11 +47226,35 @@
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
@@ -36545,7 +47735,7 @@
# Support unset when possible.
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
as_unset=unset
-@@ -43730,8 +44247,43 @@
+@@ -43730,8 +47263,43 @@
fi
@@ -36590,7 +47780,7 @@
PS1='$ '
PS2='> '
PS4='+ '
-@@ -43745,18 +44297,19 @@
+@@ -43745,18 +47313,19 @@
if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
@@ -36613,7 +47803,7 @@
as_basename=basename
else
as_basename=false
-@@ -43764,159 +44317,120 @@
+@@ -43764,159 +47333,120 @@
# Name of the executable.
@@ -36785,7 +47975,7 @@
-' ECHO_T=' ' ;;
- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
-+if (dirname -- /) >/dev/null 2>&1; then
++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
+else
+ as_dirname=false
@@ -36844,7 +48034,7 @@
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
-@@ -43925,7 +44439,19 @@
+@@ -43925,7 +47455,19 @@
as_mkdir_p=false
fi
@@ -36865,7 +48055,7 @@
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -43934,31 +44460,14 @@
+@@ -43934,31 +47476,14 @@
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
@@ -36897,11 +48087,11 @@
+ac_log="
This file was extended by $as_me, which was
-generated by GNU Autoconf 2.59. Invocation command line was
-+generated by GNU Autoconf 2.59d. Invocation command line was
++generated by GNU Autoconf 2.59e. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -43966,30 +44475,20 @@
+@@ -43966,30 +47491,20 @@
CONFIG_COMMANDS = $CONFIG_COMMANDS
$ $0 $@
@@ -36940,7 +48130,7 @@
ac_cs_usage="\
\`$as_me' instantiates files from templates according to the
current configuration.
-@@ -44016,19 +44515,21 @@
+@@ -44016,19 +47531,21 @@
$config_commands
Report bugs to <bug-autoconf at gnu.org>."
@@ -36951,8 +48141,9 @@
ac_cs_version="\\
config.status
-configured by $0, generated by GNU Autoconf 2.59,
-+configured by $0, generated by GNU Autoconf 2.59d,
- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
++configured by $0, generated by GNU Autoconf 2.59e,
++ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (C) 2006 Free Software Foundation, Inc.
@@ -36967,7 +48158,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -44039,39 +44540,24 @@
+@@ -44039,39 +47556,24 @@
do
case $1 in
--*=*)
@@ -37013,7 +48204,7 @@
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
-@@ -44081,18 +44567,24 @@
+@@ -44081,18 +47583,24 @@
$ac_shift
CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
ac_need_defaults=false;;
@@ -37043,16 +48234,16 @@
esac
shift
-@@ -44108,201 +44600,213 @@
+@@ -44108,201 +47616,213 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
if \$ac_cs_recheck; then
- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+ echo "running CONFIG_SHELL=$SHELL $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
++ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
+ CONFIG_SHELL=$SHELL
+ export CONFIG_SHELL
-+ exec $SHELL "$0" $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
++ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
fi
_ACEOF
@@ -37431,7 +48622,7 @@
# If the user did not use the arguments to specify the items to instantiate,
# then the envvar interface is used. Set only those that are not.
# We use the long form for the default assignment because of an extremely
-@@ -44314,625 +44818,817 @@
+@@ -44314,625 +47834,817 @@
fi
# Have a temporary directory for convenience. Make it in the build tree
@@ -38004,7 +49195,7 @@
+ac_ct_CXX!$ac_ct_CXX$ac_delim
+_ACEOF
+
-+ if test `grep -c "$ac_delim\$" conf$$subs.sed` = 97; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -38016,10 +49207,10 @@
-fi # test -n "$CONFIG_FILES"
+done
+
-+ac_eof=
-+if grep '^CEOF$' conf$$subs.sed >/dev/null; then
-+ ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF//p' conf$$subs.sed | sort -nru | sed 1q`
-+ ac_eof=`expr 0$ac_eof + 1`
++ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
++if test -n "$ac_eof"; then
++ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
++ ac_eof=`expr $ac_eof + 1`
+fi
+
+cat >>$CONFIG_STATUS <<_ACEOF
@@ -38143,7 +49334,7 @@
+KCFG_DEPENDENCIES!$KCFG_DEPENDENCIES$ac_delim
+_ACEOF
+
-+ if test `grep -c "$ac_delim\$" conf$$subs.sed` = 97; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -38154,10 +49345,10 @@
+ fi
+done
+
-+ac_eof=
-+if grep '^CEOF$' conf$$subs.sed >/dev/null; then
-+ ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF//p' conf$$subs.sed | sort -nru | sed 1q`
-+ ac_eof=`expr 0$ac_eof + 1`
++ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
++if test -n "$ac_eof"; then
++ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
++ ac_eof=`expr $ac_eof + 1`
+fi
+
+cat >>$CONFIG_STATUS <<_ACEOF
@@ -38281,7 +49472,7 @@
+LIBAUDIOFILE!$LIBAUDIOFILE$ac_delim
+_ACEOF
+
-+ if test `grep -c "$ac_delim\$" conf$$subs.sed` = 97; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -38292,10 +49483,10 @@
+ fi
+done
+
-+ac_eof=
-+if grep '^CEOF$' conf$$subs.sed >/dev/null; then
-+ ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF//p' conf$$subs.sed | sort -nru | sed 1q`
-+ ac_eof=`expr 0$ac_eof + 1`
++ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
++if test -n "$ac_eof"; then
++ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
++ ac_eof=`expr $ac_eof + 1`
+fi
+
+cat >>$CONFIG_STATUS <<_ACEOF
@@ -38411,7 +49602,7 @@
+LTLIBOBJS!$LTLIBOBJS$ac_delim
+_ACEOF
+
-+ if test `grep -c "$ac_delim\$" conf$$subs.sed` = 89; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 89; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -38422,10 +49613,10 @@
+ fi
+done
-+ac_eof=
-+if grep '^CEOF$' conf$$subs.sed >/dev/null; then
-+ ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF//p' conf$$subs.sed | sort -nru | sed 1q`
-+ ac_eof=`expr 0$ac_eof + 1`
++ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
++if test -n "$ac_eof"; then
++ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
++ ac_eof=`expr $ac_eof + 1`
+fi
+
+cat >>$CONFIG_STATUS <<_ACEOF
@@ -38779,7 +49970,7 @@
+cat >>$CONFIG_STATUS <<\_ACEOF
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
-+ac_datarootdir_hack=
++ac_datarootdir_hack=; ac_datarootdir_seen=
+
+case `sed -n '/datarootdir/ {
+ p
@@ -38791,7 +49982,7 @@
+/@localedir@/p
+/@mandir@/p
+' $ac_file_inputs` in
-+*datarootdir*) ;;
++*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
@@ -38813,7 +50004,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
$extrasub
-@@ -44940,248 +45636,122 @@
+@@ -44940,248 +48652,129 @@
cat >>$CONFIG_STATUS <<\_ACEOF
:t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
@@ -38869,6 +50060,13 @@
+s&@INSTALL@&$ac_INSTALL&;t t
+$ac_datarootdir_hack
+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" >$tmp/out
++
++test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
++ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
++ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
++which seems to be undefined. Please make sure it is defined." >&5
++echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
++which seems to be undefined. Please make sure it is defined." >&2;}
-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
@@ -39155,7 +50353,7 @@
# Compute $ac_file's index in $config_headers.
_am_stamp_count=1
for _am_header in $config_headers :; do
-@@ -45192,135 +45762,39 @@
+@@ -45192,135 +48785,39 @@
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
@@ -39317,7 +50515,7 @@
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile or not.
-@@ -45330,18 +45804,29 @@
+@@ -45330,18 +48827,29 @@
# each Makefile.in and add a new line on top of each file to say so.
# So let's grep whole file.
if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
@@ -39355,7 +50553,7 @@
else
continue
fi
-@@ -45363,49 +45848,76 @@
+@@ -45363,49 +48871,76 @@
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
@@ -39459,7 +50657,7 @@
if echo $TOPSUBDIRS | grep "kscd" > /dev/null 2> /dev/null; then
if test "$use_kscd_defaults" = "yes"; then
test -d kscd || mkdir kscd
-@@ -45416,11 +45928,10 @@
+@@ -45416,11 +48951,10 @@
fi
fi
;;
@@ -39596,6 +50794,40 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -614,28 +623,28 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=Interface_MIDI_NOTE.png Gui_PANEL.png Synth_RC.png Synth_SHELVE_CUTOFF.png Synth_MUL.png Synth_ENVELOPE_ADSR.png Synth_PLAY.png Synth_PLAY_AKAI.png Synth_ADD.png Synth_SEQUENCE_FREQ.png Synth_PSCALE.png Gui_SLIDER.png Synth_BUS_DOWNLINK.png Synth_STD_EQUALIZER.png Synth_PLAY_WAV.png Synth_SEQUENCE.png Synth_STRUCT_KILL.png Gui_POTI.png schema4.png Synth_DEBUG.png Synth_DELAY.png Gui_WINDOW.png Synth_WAVE_TRI.png Gui_AUDIO_MANAGER.png Gui_LABEL.png schema3.png Synth_PLAY_AKAIS.png Synth_FREQUENCY.png Synth_MIDI_ROUTER.png Synth_CDELAY.png Synth_NIL.png Gui_INSTRUMENT_MAPPER.png Synth_FILEPLAY.png Synth_FM_SOURCE.png Synth_XFADE.png Synth_COMPRESSOR.png Makefile.in Synth_BUS_UPLINK.png Synth_WAVE_SQUARE.png Gui_SUBPANEL.png Synth_MIDI_DEBUG.png schema1.png Synth_WAVE_SIN.png Synth_DIV.png Gui_MIXER.png Synth_ATAN_SATURATE.png Doc_MODUL.png Makefile.am schema2.png
++KDE_DIST=Gui_AUDIO_MANAGER.png Gui_LABEL.png Interface_MIDI_NOTE.png schema3.png Synth_PLAY_AKAIS.png Gui_PANEL.png Synth_FREQUENCY.png Synth_MIDI_ROUTER.png Synth_RC.png Synth_SHELVE_CUTOFF.png Synth_CDELAY.png Synth_MUL.png Synth_NIL.png Synth_ENVELOPE_ADSR.png Gui_INSTRUMENT_MAPPER.png Synth_PLAY.png Synth_FILEPLAY.png Synth_SEQUENCE_FREQ.png Synth_PLAY_AKAI.png Synth_ADD.png Synth_XFADE.png Synth_FM_SOURCE.png Synth_PSCALE.png Synth_COMPRESSOR.png Synth_BUS_UPLINK.png Makefile.in Gui_SLIDER.png Synth_WAVE_SQUARE.png Gui_SUBPANEL.png Synth_MIDI_DEBUG.png schema1.png Synth_WAVE_SIN.png Synth_BUS_DOWNLINK.png Synth_STD_EQUALIZER.png Synth_SEQUENCE.png Synth_PLAY_WAV.png Synth_DIV.png Gui_MIXER.png Synth_STRUCT_KILL.png Gui_POTI.png schema4.png Synth_ATAN_SATURATE.png Synth_DEBUG.png Synth_DELAY.png Doc_MODUL.png Makefile.am Gui_WINDOW.png Synth_WAVE_TRI.png schema2.png
+
+ #>+ 2
+-docs-am: Gui_INSTRUMENT_MAPPER.png Gui_AUDIO_MANAGER.png Synth_STD_EQUALIZER.png Synth_PLAY_AKAIS.png Synth_WAVE_TRI.png Synth_MIDI_ROUTER.png Synth_WAVE_SQUARE.png Synth_SEQUENCE_FREQ.png Synth_DEBUG.png Gui_WINDOW.png Synth_XFADE.png Synth_COMPRESSOR.png Synth_SHELVE_CUTOFF.png Synth_DELAY.png Gui_LABEL.png Synth_STRUCT_KILL.png Synth_CDELAY.png Gui_SLIDER.png Synth_RC.png Synth_PLAY.png Synth_PSCALE.png Synth_SEQUENCE.png Synth_BUS_UPLINK.png Synth_WAVE_SIN.png Gui_PANEL.png Doc_MODUL.png Synth_NIL.png Synth_FM_SOURCE.png Synth_DIV.png Synth_PLAY_WAV.png Synth_ENVELOPE_ADSR.png Synth_MIDI_DEBUG.png Gui_SUBPANEL.png Synth_ADD.png Synth_PLAY_AKAI.png Gui_POTI.png Synth_ATAN_SATURATE.png schema1.png Synth_MUL.png schema2.png Synth_BUS_DOWNLINK.png schema3.png schema4.png Synth_FREQUENCY.png Interface_MIDI_NOTE.png Gui_MIXER.png Synth_FILEPLAY.png
++docs-am: Synth_NIL.png Synth_WAVE_SQUARE.png Synth_MUL.png Synth_RC.png Synth_ADD.png Interface_MIDI_NOTE.png Synth_STD_EQUALIZER.png Synth_CDELAY.png Synth_WAVE_TRI.png Gui_WINDOW.png Synth_PLAY_AKAIS.png Synth_FREQUENCY.png Gui_POTI.png Synth_STRUCT_KILL.png Gui_MIXER.png Synth_PLAY_AKAI.png Synth_PSCALE.png Synth_FM_SOURCE.png Synth_SHELVE_CUTOFF.png Synth_XFADE.png Synth_MIDI_DEBUG.png Synth_DIV.png Synth_BUS_DOWNLINK.png Gui_LABEL.png Gui_SLIDER.png Synth_ATAN_SATURATE.png schema1.png schema2.png schema3.png schema4.png Gui_SUBPANEL.png Synth_FILEPLAY.png Synth_DEBUG.png Synth_PLAY.png Synth_COMPRESSOR.png Synth_MIDI_ROUTER.png Gui_PANEL.png Gui_INSTRUMENT_MAPPER.png Doc_MODUL.png Synth_PLAY_WAV.png Synth_SEQUENCE_FREQ.png Synth_SEQUENCE.png Synth_WAVE_SIN.png Gui_AUDIO_MANAGER.png Synth_BUS_UPLINK.png Synth_ENVELOPE_ADSR.png Synth_DELAY.png
+
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/artsbuilder/images
+- @for base in Gui_INSTRUMENT_MAPPER.png Gui_AUDIO_MANAGER.png Synth_STD_EQUALIZER.png Synth_PLAY_AKAIS.png Synth_WAVE_TRI.png Synth_MIDI_ROUTER.png Synth_WAVE_SQUARE.png Synth_SEQUENCE_FREQ.png Synth_DEBUG.png Gui_WINDOW.png Synth_XFADE.png Synth_COMPRESSOR.png Synth_SHELVE_CUTOFF.png Synth_DELAY.png Gui_LABEL.png Synth_STRUCT_KILL.png Synth_CDELAY.png Gui_SLIDER.png Synth_RC.png Synth_PLAY.png Synth_PSCALE.png Synth_SEQUENCE.png Synth_BUS_UPLINK.png Synth_WAVE_SIN.png Gui_PANEL.png Doc_MODUL.png Synth_NIL.png Synth_FM_SOURCE.png Synth_DIV.png Synth_PLAY_WAV.png Synth_ENVELOPE_ADSR.png Synth_MIDI_DEBUG.png Gui_SUBPANEL.png Synth_ADD.png Synth_PLAY_AKAI.png Gui_POTI.png Synth_ATAN_SATURATE.png schema1.png Synth_MUL.png schema2.png Synth_BUS_DOWNLINK.png schema3.png schema4.png Synth_FREQUENCY.png Interface_MIDI_NOTE.png Gui_MIXER.png Synth_FILEPLAY.png ; do \
++ @for base in Synth_NIL.png Synth_WAVE_SQUARE.png Synth_MUL.png Synth_RC.png Synth_ADD.png Interface_MIDI_NOTE.png Synth_STD_EQUALIZER.png Synth_CDELAY.png Synth_WAVE_TRI.png Gui_WINDOW.png Synth_PLAY_AKAIS.png Synth_FREQUENCY.png Gui_POTI.png Synth_STRUCT_KILL.png Gui_MIXER.png Synth_PLAY_AKAI.png Synth_PSCALE.png Synth_FM_SOURCE.png Synth_SHELVE_CUTOFF.png Synth_XFADE.png Synth_MIDI_DEBUG.png Synth_DIV.png Synth_BUS_DOWNLINK.png Gui_LABEL.png Gui_SLIDER.png Synth_ATAN_SATURATE.png schema1.png schema2.png schema3.png schema4.png Gui_SUBPANEL.png Synth_FILEPLAY.png Synth_DEBUG.png Synth_PLAY.png Synth_COMPRESSOR.png Synth_MIDI_ROUTER.png Gui_PANEL.png Gui_INSTRUMENT_MAPPER.png Doc_MODUL.png Synth_PLAY_WAV.png Synth_SEQUENCE_FREQ.png Synth_SEQUENCE.png Synth_WAVE_SIN.png Gui_AUDIO_MANAGER.png Synth_BUS_UPLINK.png Synth_ENVELOPE_ADSR.png Synth_DELAY.png ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/artsbuilder/images/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/artsbuilder/images/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in Gui_INSTRUMENT_MAPPER.png Gui_AUDIO_MANAGER.png Synth_STD_EQUALIZER.png Synth_PLAY_AKAIS.png Synth_WAVE_TRI.png Synth_MIDI_ROUTER.png Synth_WAVE_SQUARE.png Synth_SEQUENCE_FREQ.png Synth_DEBUG.png Gui_WINDOW.png Synth_XFADE.png Synth_COMPRESSOR.png Synth_SHELVE_CUTOFF.png Synth_DELAY.png Gui_LABEL.png Synth_STRUCT_KILL.png Synth_CDELAY.png Gui_SLIDER.png Synth_RC.png Synth_PLAY.png Synth_PSCALE.png Synth_SEQUENCE.png Synth_BUS_UPLINK.png Synth_WAVE_SIN.png Gui_PANEL.png Doc_MODUL.png Synth_NIL.png Synth_FM_SOURCE.png Synth_DIV.png Synth_PLAY_WAV.png Synth_ENVELOPE_ADSR.png Synth_MIDI_DEBUG.png Gui_SUBPANEL.png Synth_ADD.png Synth_PLAY_AKAI.png Gui_POTI.png Synth_ATAN_SATURATE.png schema1.png Synth_MUL.png schema2.png Synth_BUS_DOWNLINK.png schema3.png schema4.png Synth_FREQUENCY.png Interface_MIDI_NOTE.png Gui_MIXER.png Synth_FILEPLAY.png ; do \
++ for base in Synth_NIL.png Synth_WAVE_SQUARE.png Synth_MUL.png Synth_RC.png Synth_ADD.png Interface_MIDI_NOTE.png Synth_STD_EQUALIZER.png Synth_CDELAY.png Synth_WAVE_TRI.png Gui_WINDOW.png Synth_PLAY_AKAIS.png Synth_FREQUENCY.png Gui_POTI.png Synth_STRUCT_KILL.png Gui_MIXER.png Synth_PLAY_AKAI.png Synth_PSCALE.png Synth_FM_SOURCE.png Synth_SHELVE_CUTOFF.png Synth_XFADE.png Synth_MIDI_DEBUG.png Synth_DIV.png Synth_BUS_DOWNLINK.png Gui_LABEL.png Gui_SLIDER.png Synth_ATAN_SATURATE.png schema1.png schema2.png schema3.png schema4.png Gui_SUBPANEL.png Synth_FILEPLAY.png Synth_DEBUG.png Synth_PLAY.png Synth_COMPRESSOR.png Synth_MIDI_ROUTER.png Gui_PANEL.png Gui_INSTRUMENT_MAPPER.png Doc_MODUL.png Synth_PLAY_WAV.png Synth_SEQUENCE_FREQ.png Synth_SEQUENCE.png Synth_WAVE_SIN.png Gui_AUDIO_MANAGER.png Synth_BUS_UPLINK.png Synth_ENVELOPE_ADSR.png Synth_DELAY.png ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/artsbuilder/images/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in Gui_INSTRUMENT_MAPPER.png Gui_AUDIO_MANAGER.png Synth_STD_EQUALIZER.png Synth_PLAY_AKAIS.png Synth_WAVE_TRI.png Synth_MIDI_ROUTER.png Synth_WAVE_SQUARE.png Synth_SEQUENCE_FREQ.png Synth_DEBUG.png Gui_WINDOW.png Synth_XFADE.png Synth_COMPRESSOR.png Synth_SHELVE_CUTOFF.png Synth_DELAY.png Gui_LABEL.png Synth_STRUCT_KILL.png Synth_CDELAY.png Gui_SLIDER.png Synth_RC.png Synth_PLAY.png Synth_PSCALE.png Synth_SEQUENCE.png Synth_BUS_UPLINK.png Synth_WAVE_SIN.png Gui_PANEL.png Doc_MODUL.png Synth_NIL.png Synth_FM_SOURCE.png Synth_DIV.png Synth_PLAY_WAV.png Synth_ENVELOPE_ADSR.png Synth_MIDI_DEBUG.png Gui_SUBPANEL.png Synth_ADD.png Synth_PLAY_AKAI.png Gui_POTI.png Synth_ATAN_SATURATE.png schema1.png Synth_MUL.png schema2.png Synth_BUS_DOWNLINK.png schema3.png schema4.png Synth_FREQUENCY.png Interface_MIDI_NOTE.png Gui_MIXER.png Synth_FILEPLAY.png ; do \
++ for file in Synth_NIL.png Synth_WAVE_SQUARE.png Synth_MUL.png Synth_RC.png Synth_ADD.png Interface_MIDI_NOTE.png Synth_STD_EQUALIZER.png Synth_CDELAY.png Synth_WAVE_TRI.png Gui_WINDOW.png Synth_PLAY_AKAIS.png Synth_FREQUENCY.png Gui_POTI.png Synth_STRUCT_KILL.png Gui_MIXER.png Synth_PLAY_AKAI.png Synth_PSCALE.png Synth_FM_SOURCE.png Synth_SHELVE_CUTOFF.png Synth_XFADE.png Synth_MIDI_DEBUG.png Synth_DIV.png Synth_BUS_DOWNLINK.png Gui_LABEL.png Gui_SLIDER.png Synth_ATAN_SATURATE.png schema1.png schema2.png schema3.png schema4.png Gui_SUBPANEL.png Synth_FILEPLAY.png Synth_DEBUG.png Synth_PLAY.png Synth_COMPRESSOR.png Synth_MIDI_ROUTER.png Gui_PANEL.png Gui_INSTRUMENT_MAPPER.png Doc_MODUL.png Synth_PLAY_WAV.png Synth_SEQUENCE_FREQ.png Synth_SEQUENCE.png Synth_WAVE_SIN.png Gui_AUDIO_MANAGER.png Synth_BUS_UPLINK.png Synth_ENVELOPE_ADSR.png Synth_DELAY.png ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
--- doc/artsbuilder/Makefile.in
+++ doc/artsbuilder/Makefile.in
@@ -119,6 +119,7 @@
@@ -39695,6 +50927,43 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -781,10 +790,10 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=future.docbook index.docbook arts-structure.png porting.docbook glossary.docbook helping.docbook artsbuilder.docbook detail.docbook midiintro.docbook mcop.docbook modules.docbook gui.docbook faq.docbook index.cache.bz2 midi.docbook tools.docbook Makefile.in digitalaudio.docbook references.docbook apis.docbook Makefile.am
++KDE_DIST=future.docbook midi.docbook tools.docbook index.docbook arts-structure.png porting.docbook glossary.docbook helping.docbook detail.docbook artsbuilder.docbook midiintro.docbook Makefile.in digitalaudio.docbook mcop.docbook modules.docbook gui.docbook references.docbook apis.docbook faq.docbook Makefile.am index.cache.bz2
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) arts-structure.png tools.docbook detail.docbook glossary.docbook index.docbook faq.docbook modules.docbook future.docbook artsbuilder.docbook references.docbook midi.docbook porting.docbook gui.docbook helping.docbook apis.docbook midiintro.docbook mcop.docbook digitalaudio.docbook
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) modules.docbook midi.docbook future.docbook references.docbook helping.docbook mcop.docbook porting.docbook tools.docbook faq.docbook artsbuilder.docbook arts-structure.png apis.docbook midiintro.docbook glossary.docbook detail.docbook gui.docbook digitalaudio.docbook index.docbook
+ @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+
+ docs-am: index.cache.bz2
+@@ -811,20 +820,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/artsbuilder
+- @for base in arts-structure.png tools.docbook detail.docbook glossary.docbook index.docbook faq.docbook modules.docbook future.docbook artsbuilder.docbook references.docbook midi.docbook porting.docbook gui.docbook helping.docbook apis.docbook midiintro.docbook mcop.docbook digitalaudio.docbook ; do \
++ @for base in modules.docbook midi.docbook future.docbook references.docbook helping.docbook mcop.docbook porting.docbook tools.docbook faq.docbook artsbuilder.docbook arts-structure.png apis.docbook midiintro.docbook glossary.docbook detail.docbook gui.docbook digitalaudio.docbook index.docbook ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/artsbuilder/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/artsbuilder/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in arts-structure.png tools.docbook detail.docbook glossary.docbook index.docbook faq.docbook modules.docbook future.docbook artsbuilder.docbook references.docbook midi.docbook porting.docbook gui.docbook helping.docbook apis.docbook midiintro.docbook mcop.docbook digitalaudio.docbook ; do \
++ for base in modules.docbook midi.docbook future.docbook references.docbook helping.docbook mcop.docbook porting.docbook tools.docbook faq.docbook artsbuilder.docbook arts-structure.png apis.docbook midiintro.docbook glossary.docbook detail.docbook gui.docbook digitalaudio.docbook index.docbook ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/artsbuilder/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in arts-structure.png tools.docbook detail.docbook glossary.docbook index.docbook faq.docbook modules.docbook future.docbook artsbuilder.docbook references.docbook midi.docbook porting.docbook gui.docbook helping.docbook apis.docbook midiintro.docbook mcop.docbook digitalaudio.docbook ; do \
++ for file in modules.docbook midi.docbook future.docbook references.docbook helping.docbook mcop.docbook porting.docbook tools.docbook faq.docbook artsbuilder.docbook arts-structure.png apis.docbook midiintro.docbook glossary.docbook detail.docbook gui.docbook digitalaudio.docbook index.docbook ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
--- doc/juk/Makefile.in
+++ doc/juk/Makefile.in
@@ -103,6 +103,7 @@
@@ -39794,6 +51063,43 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -614,10 +623,10 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=juk-adv-search.png search-playlist.png index.docbook juk-main.png juk-file-renamer.png juk-tag-guesser.png index.cache.bz2 history-playlist.png normal-playlist.png Makefile.in toolbar.png Makefile.am
++KDE_DIST=juk-adv-search.png history-playlist.png index.docbook search-playlist.png normal-playlist.png juk-file-renamer.png juk-main.png Makefile.in toolbar.png Makefile.am juk-tag-guesser.png index.cache.bz2
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) juk-file-renamer.png juk-tag-guesser.png history-playlist.png toolbar.png index.docbook juk-adv-search.png search-playlist.png normal-playlist.png juk-main.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) toolbar.png juk-main.png normal-playlist.png search-playlist.png history-playlist.png juk-tag-guesser.png juk-file-renamer.png index.docbook juk-adv-search.png
+ @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+
+ docs-am: index.cache.bz2
+@@ -644,20 +653,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/juk
+- @for base in juk-file-renamer.png juk-tag-guesser.png history-playlist.png toolbar.png index.docbook juk-adv-search.png search-playlist.png normal-playlist.png juk-main.png ; do \
++ @for base in toolbar.png juk-main.png normal-playlist.png search-playlist.png history-playlist.png juk-tag-guesser.png juk-file-renamer.png index.docbook juk-adv-search.png ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/juk/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/juk/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in juk-file-renamer.png juk-tag-guesser.png history-playlist.png toolbar.png index.docbook juk-adv-search.png search-playlist.png normal-playlist.png juk-main.png ; do \
++ for base in toolbar.png juk-main.png normal-playlist.png search-playlist.png history-playlist.png juk-tag-guesser.png juk-file-renamer.png index.docbook juk-adv-search.png ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/juk/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in juk-file-renamer.png juk-tag-guesser.png history-playlist.png toolbar.png index.docbook juk-adv-search.png search-playlist.png normal-playlist.png juk-main.png ; do \
++ for file in toolbar.png juk-main.png normal-playlist.png search-playlist.png history-playlist.png juk-tag-guesser.png juk-file-renamer.png index.docbook juk-adv-search.png ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
--- doc/kaboodle/Makefile.in
+++ doc/kaboodle/Makefile.in
@@ -103,6 +103,7 @@
@@ -39893,6 +51199,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -614,7 +623,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=index.docbook index.cache.bz2 Makefile.in Makefile.am
++KDE_DIST=index.docbook Makefile.in Makefile.am index.cache.bz2
+
+ #>+ 24
+ index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
--- doc/kaudiocreator/Makefile.in
+++ doc/kaudiocreator/Makefile.in
@@ -103,6 +103,7 @@
@@ -39992,6 +51307,43 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -614,10 +623,10 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=cddbconfigurationlookup.png cdinserted.png cddbconfigurationsubmit.png kaudiocreatormainwindow800.png index.docbook encodernotfound.png encoderconfiguration.png index.cache.bz2 readytorip.png rippingandencoding.png jobcontrol.png confirmartistcarryover.png cdconfiguration.png generalconfiguration.png setalbumcategory.png ripperconfiguration.png Makefile.in rippingandencoding2.png entersong1.png startalbumeditor.png jobshavestarted.png Makefile.am lameconfiguration.png
++KDE_DIST=cddbconfigurationlookup.png cdinserted.png readytorip.png rippingandencoding.png cddbconfigurationsubmit.png jobcontrol.png index.docbook kaudiocreatormainwindow800.png confirmartistcarryover.png cdconfiguration.png setalbumcategory.png generalconfiguration.png ripperconfiguration.png Makefile.in rippingandencoding2.png entersong1.png startalbumeditor.png encodernotfound.png jobshavestarted.png Makefile.am encoderconfiguration.png index.cache.bz2 lameconfiguration.png
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) rippingandencoding.png encodernotfound.png setalbumcategory.png index.docbook cddbconfigurationsubmit.png generalconfiguration.png lameconfiguration.png encoderconfiguration.png cdconfiguration.png jobcontrol.png kaudiocreatormainwindow800.png cddbconfigurationlookup.png confirmartistcarryover.png readytorip.png cdinserted.png rippingandencoding2.png entersong1.png startalbumeditor.png jobshavestarted.png ripperconfiguration.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) rippingandencoding2.png cddbconfigurationlookup.png cdconfiguration.png startalbumeditor.png lameconfiguration.png rippingandencoding.png readytorip.png confirmartistcarryover.png encodernotfound.png generalconfiguration.png jobshavestarted.png cdinserted.png encoderconfiguration.png entersong1.png setalbumcategory.png jobcontrol.png kaudiocreatormainwindow800.png ripperconfiguration.png index.docbook cddbconfigurationsubmit.png
+ @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+
+ docs-am: index.cache.bz2
+@@ -644,20 +653,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kaudiocreator
+- @for base in rippingandencoding.png encodernotfound.png setalbumcategory.png index.docbook cddbconfigurationsubmit.png generalconfiguration.png lameconfiguration.png encoderconfiguration.png cdconfiguration.png jobcontrol.png kaudiocreatormainwindow800.png cddbconfigurationlookup.png confirmartistcarryover.png readytorip.png cdinserted.png rippingandencoding2.png entersong1.png startalbumeditor.png jobshavestarted.png ripperconfiguration.png ; do \
++ @for base in rippingandencoding2.png cddbconfigurationlookup.png cdconfiguration.png startalbumeditor.png lameconfiguration.png rippingandencoding.png readytorip.png confirmartistcarryover.png encodernotfound.png generalconfiguration.png jobshavestarted.png cdinserted.png encoderconfiguration.png entersong1.png setalbumcategory.png jobcontrol.png kaudiocreatormainwindow800.png ripperconfiguration.png index.docbook cddbconfigurationsubmit.png ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kaudiocreator/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kaudiocreator/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in rippingandencoding.png encodernotfound.png setalbumcategory.png index.docbook cddbconfigurationsubmit.png generalconfiguration.png lameconfiguration.png encoderconfiguration.png cdconfiguration.png jobcontrol.png kaudiocreatormainwindow800.png cddbconfigurationlookup.png confirmartistcarryover.png readytorip.png cdinserted.png rippingandencoding2.png entersong1.png startalbumeditor.png jobshavestarted.png ripperconfiguration.png ; do \
++ for base in rippingandencoding2.png cddbconfigurationlookup.png cdconfiguration.png startalbumeditor.png lameconfiguration.png rippingandencoding.png readytorip.png confirmartistcarryover.png encodernotfound.png generalconfiguration.png jobshavestarted.png cdinserted.png encoderconfiguration.png entersong1.png setalbumcategory.png jobcontrol.png kaudiocreatormainwindow800.png ripperconfiguration.png index.docbook cddbconfigurationsubmit.png ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kaudiocreator/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in rippingandencoding.png encodernotfound.png setalbumcategory.png index.docbook cddbconfigurationsubmit.png generalconfiguration.png lameconfiguration.png encoderconfiguration.png cdconfiguration.png jobcontrol.png kaudiocreatormainwindow800.png cddbconfigurationlookup.png confirmartistcarryover.png readytorip.png cdinserted.png rippingandencoding2.png entersong1.png startalbumeditor.png jobshavestarted.png ripperconfiguration.png ; do \
++ for file in rippingandencoding2.png cddbconfigurationlookup.png cdconfiguration.png startalbumeditor.png lameconfiguration.png rippingandencoding.png readytorip.png confirmartistcarryover.png encodernotfound.png generalconfiguration.png jobshavestarted.png cdinserted.png encoderconfiguration.png entersong1.png setalbumcategory.png jobcontrol.png kaudiocreatormainwindow800.png ripperconfiguration.png index.docbook cddbconfigurationsubmit.png ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
--- doc/kioslave/Makefile.in
+++ doc/kioslave/Makefile.in
@@ -103,6 +103,7 @@
@@ -40190,6 +51542,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -614,7 +623,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=index.docbook index.cache.bz2 Makefile.in Makefile.am
++KDE_DIST=index.docbook Makefile.in Makefile.am index.cache.bz2
+
+ #>+ 24
+ index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
--- doc/kmix/Makefile.in
+++ doc/kmix/Makefile.in
@@ -103,6 +103,7 @@
@@ -40289,6 +51650,43 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -614,10 +623,10 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=index.docbook kmix-window.png index.cache.bz2 kmix-channel-record.png Makefile.in kmix-channel-playback.png Makefile.am
++KDE_DIST=index.docbook Makefile.in kmix-window.png kmix-channel-playback.png Makefile.am index.cache.bz2 kmix-channel-record.png
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kmix-window.png index.docbook kmix-channel-playback.png kmix-channel-record.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kmix-window.png kmix-channel-record.png kmix-channel-playback.png index.docbook
+ @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+
+ docs-am: index.cache.bz2
+@@ -644,20 +653,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmix
+- @for base in kmix-window.png index.docbook kmix-channel-playback.png kmix-channel-record.png ; do \
++ @for base in kmix-window.png kmix-channel-record.png kmix-channel-playback.png index.docbook ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmix/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmix/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in kmix-window.png index.docbook kmix-channel-playback.png kmix-channel-record.png ; do \
++ for base in kmix-window.png kmix-channel-record.png kmix-channel-playback.png index.docbook ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmix/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in kmix-window.png index.docbook kmix-channel-playback.png kmix-channel-record.png ; do \
++ for file in kmix-window.png kmix-channel-record.png kmix-channel-playback.png index.docbook ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
--- doc/krec/Makefile.in
+++ doc/krec/Makefile.in
@@ -103,6 +103,7 @@
@@ -40388,6 +51786,43 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -614,10 +623,10 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=krec-keramik.png index.docbook krec-configuration.png krec-hicolor.png index.cache.bz2 Makefile.in krec-new_file_properties.png Makefile.am
++KDE_DIST=krec-keramik.png index.docbook krec-configuration.png krec-hicolor.png Makefile.in krec-new_file_properties.png Makefile.am index.cache.bz2
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) krec-hicolor.png index.docbook krec-keramik.png krec-new_file_properties.png krec-configuration.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) krec-keramik.png krec-new_file_properties.png krec-hicolor.png krec-configuration.png index.docbook
+ @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+
+ docs-am: index.cache.bz2
+@@ -644,20 +653,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krec
+- @for base in krec-hicolor.png index.docbook krec-keramik.png krec-new_file_properties.png krec-configuration.png ; do \
++ @for base in krec-keramik.png krec-new_file_properties.png krec-hicolor.png krec-configuration.png index.docbook ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krec/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krec/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in krec-hicolor.png index.docbook krec-keramik.png krec-new_file_properties.png krec-configuration.png ; do \
++ for base in krec-keramik.png krec-new_file_properties.png krec-hicolor.png krec-configuration.png index.docbook ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krec/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in krec-hicolor.png index.docbook krec-keramik.png krec-new_file_properties.png krec-configuration.png ; do \
++ for file in krec-keramik.png krec-new_file_properties.png krec-hicolor.png krec-configuration.png index.docbook ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
--- doc/kscd/Makefile.in
+++ doc/kscd/Makefile.in
@@ -103,6 +103,7 @@
@@ -40487,6 +51922,43 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -614,10 +623,10 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=kscd18.png index.docbook kscd6.png kscd13.png kscd2.png kscd14.png kscdannounc.png index.cache.bz2 kscd5.png kscd12.png kscd16.png kscd11.png kscd19.png kscd9.png kscd3.png kscd.png Makefile.in Makefile.am
++KDE_DIST=kscd18.png kscd5.png kscd12.png index.docbook kscd16.png kscd11.png kscd9.png kscd19.png kscd6.png kscd3.png kscd.png kscd13.png Makefile.in kscd2.png kscd14.png Makefile.am kscdannounc.png index.cache.bz2
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook kscd18.png kscd9.png kscd19.png kscd.png kscdannounc.png kscd11.png kscd2.png kscd12.png kscd3.png kscd13.png kscd14.png kscd5.png kscd6.png kscd16.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kscd11.png kscd12.png kscd13.png kscd14.png kscd16.png kscd18.png kscd19.png kscd2.png kscd3.png kscd5.png kscd6.png kscd9.png kscd.png kscdannounc.png index.docbook
+ @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+
+ docs-am: index.cache.bz2
+@@ -644,20 +653,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kscd
+- @for base in index.docbook kscd18.png kscd9.png kscd19.png kscd.png kscdannounc.png kscd11.png kscd2.png kscd12.png kscd3.png kscd13.png kscd14.png kscd5.png kscd6.png kscd16.png ; do \
++ @for base in kscd11.png kscd12.png kscd13.png kscd14.png kscd16.png kscd18.png kscd19.png kscd2.png kscd3.png kscd5.png kscd6.png kscd9.png kscd.png kscdannounc.png index.docbook ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kscd/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kscd/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in index.docbook kscd18.png kscd9.png kscd19.png kscd.png kscdannounc.png kscd11.png kscd2.png kscd12.png kscd3.png kscd13.png kscd14.png kscd5.png kscd6.png kscd16.png ; do \
++ for base in kscd11.png kscd12.png kscd13.png kscd14.png kscd16.png kscd18.png kscd19.png kscd2.png kscd3.png kscd5.png kscd6.png kscd9.png kscd.png kscdannounc.png index.docbook ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kscd/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in index.docbook kscd18.png kscd9.png kscd19.png kscd.png kscdannounc.png kscd11.png kscd2.png kscd12.png kscd3.png kscd13.png kscd14.png kscd5.png kscd6.png kscd16.png ; do \
++ for file in kscd11.png kscd12.png kscd13.png kscd14.png kscd16.png kscd18.png kscd19.png kscd2.png kscd3.png kscd5.png kscd6.png kscd9.png kscd.png kscdannounc.png index.docbook ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
--- doc/Makefile.in
+++ doc/Makefile.in
@@ -119,6 +119,7 @@
@@ -40565,7 +52037,14 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -448,7 +457,7 @@
+@@ -442,13 +451,13 @@
+ KDE_DOCS = AUTO
+ #>- SUBDIRS = $(AUTODIRS)
+ #>+ 1
+-SUBDIRS =. artsbuilder kaboodle kmid krec kscd noatun kmix juk kioslave kaudiocreator
++SUBDIRS =. juk kmid kmix krec kscd kaboodle kioslave artsbuilder kaudiocreator noatun
+ #>- all: all-recursive
+ #>+ 1
all: docs-am all-recursive
.SUFFIXES:
@@ -40685,6 +52164,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -614,7 +623,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=index.docbook index.cache.bz2 Makefile.in Makefile.am
++KDE_DIST=index.docbook Makefile.in Makefile.am index.cache.bz2
+
+ #>+ 24
+ index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
--- juk/Makefile.in
+++ juk/Makefile.in
@@ -230,6 +230,7 @@
@@ -40784,6 +52272,121 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
+@@ -1267,18 +1276,18 @@
+ mocs: collectionlist.moc
+
+ #>+ 3
+-googlefetcherdialog.moc: $(srcdir)/googlefetcherdialog.h
+- $(MOC) $(srcdir)/googlefetcherdialog.h -o googlefetcherdialog.moc
++deletedialog.moc: $(srcdir)/deletedialog.h
++ $(MOC) $(srcdir)/deletedialog.h -o deletedialog.moc
+
+ #>+ 2
+-mocs: googlefetcherdialog.moc
++mocs: deletedialog.moc
+
+ #>+ 3
+-deletedialog.moc: $(srcdir)/deletedialog.h
+- $(MOC) $(srcdir)/deletedialog.h -o deletedialog.moc
++googlefetcherdialog.moc: $(srcdir)/googlefetcherdialog.h
++ $(MOC) $(srcdir)/googlefetcherdialog.h -o googlefetcherdialog.moc
+
+ #>+ 2
+-mocs: deletedialog.moc
++mocs: googlefetcherdialog.moc
+
+ #>+ 3
+ artsplayer.moc: $(srcdir)/artsplayer.h
+@@ -1288,18 +1297,18 @@
+ mocs: artsplayer.moc
+
+ #>+ 3
+-googlefetcher.moc: $(srcdir)/googlefetcher.h
+- $(MOC) $(srcdir)/googlefetcher.h -o googlefetcher.moc
++viewmode.moc: $(srcdir)/viewmode.h
++ $(MOC) $(srcdir)/viewmode.h -o viewmode.moc
+
+ #>+ 2
+-mocs: googlefetcher.moc
++mocs: viewmode.moc
+
+ #>+ 3
+-viewmode.moc: $(srcdir)/viewmode.h
+- $(MOC) $(srcdir)/viewmode.h -o viewmode.moc
++googlefetcher.moc: $(srcdir)/googlefetcher.h
++ $(MOC) $(srcdir)/googlefetcher.h -o googlefetcher.moc
+
+ #>+ 2
+-mocs: viewmode.moc
++mocs: googlefetcher.moc
+
+ #>+ 3
+ directorylist.moc: $(srcdir)/directorylist.h
+@@ -1435,18 +1444,18 @@
+ mocs: searchwidget.moc
+
+ #>+ 3
+-tagtransactionmanager.moc: $(srcdir)/tagtransactionmanager.h
+- $(MOC) $(srcdir)/tagtransactionmanager.h -o tagtransactionmanager.moc
++keydialog.moc: $(srcdir)/keydialog.h
++ $(MOC) $(srcdir)/keydialog.h -o keydialog.moc
+
+ #>+ 2
+-mocs: tagtransactionmanager.moc
++mocs: keydialog.moc
+
+ #>+ 3
+-keydialog.moc: $(srcdir)/keydialog.h
+- $(MOC) $(srcdir)/keydialog.h -o keydialog.moc
++tagtransactionmanager.moc: $(srcdir)/tagtransactionmanager.h
++ $(MOC) $(srcdir)/tagtransactionmanager.h -o tagtransactionmanager.moc
+
+ #>+ 2
+-mocs: keydialog.moc
++mocs: tagtransactionmanager.moc
+
+ #>+ 3
+ playlistbox.moc: $(srcdir)/playlistbox.h
+@@ -1527,10 +1536,10 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f collectionlist.moc googlefetcherdialog.moc deletedialog.moc artsplayer.moc googlefetcher.moc viewmode.moc directorylist.moc dynamicplaylist.moc treeviewitemplaylist.moc exampleoptions.moc filerenameroptions.moc statuslabel.moc tracksequencemanager.moc tagguesserconfigdlg.moc systemtray.moc filerenamerconfigdlg.moc coverdialog.moc playlistcollection.moc akodeplayer.moc historyplaylist.moc playlistsplitter.moc searchplaylist.moc nowplaying.moc tageditor.moc searchwidget.moc tagtransactionmanager.moc keydialog.moc playlistbox.moc folderplaylist.moc filerenamer.moc gstreamerplayer.moc playlist.moc juk.moc trackpickerdialog.moc advancedsearchdialog.moc slideraction.moc k3bexporter.moc playermanager.moc
++ -rm -f collectionlist.moc deletedialog.moc googlefetcherdialog.moc artsplayer.moc viewmode.moc googlefetcher.moc directorylist.moc dynamicplaylist.moc treeviewitemplaylist.moc exampleoptions.moc filerenameroptions.moc statuslabel.moc tracksequencemanager.moc tagguesserconfigdlg.moc systemtray.moc filerenamerconfigdlg.moc coverdialog.moc playlistcollection.moc akodeplayer.moc historyplaylist.moc playlistsplitter.moc searchplaylist.moc nowplaying.moc tageditor.moc searchwidget.moc keydialog.moc tagtransactionmanager.moc playlistbox.moc folderplaylist.moc filerenamer.moc gstreamerplayer.moc playlist.moc juk.moc trackpickerdialog.moc advancedsearchdialog.moc slideraction.moc k3bexporter.moc playermanager.moc
+
+ #>+ 2
+-KDE_DIST=jukui.rc trackpickerdialogbase.ui actioncollection.h filehandle.h filehandleproperties.h hi48-app-juk.png ktrm.h jukui-rtl.rc categoryreaderinterface.h directorylistbase.ui tagrenameroptions.h playlistbox.h artsplayer.h deletedialogbase.ui musicbrainzquery.h jukservicemenu.desktop tagguesser.h treeviewitemplaylist.h playlistitem.h stringhash.h filerenameroptions.h tagguesserconfigdlg.h mediafiles.h filerenamerconfigdlg.h tageditor.h player.h viewmode.h directorylist.h googlefetcherdialog.h hi16-app-juk.png Makefile.in tracksequenceiterator.h juk.h advancedsearchdialog.h gstreamerplayer.h googlefetcher.h tracksequencemanager.h coverinfo.h playlistinterface.h hi128-app-juk.png tagguesserconfigdlgwidget.ui coverdialogbase.ui configure.in.bot playlistexporter.h upcomingplaylist.h filerenamer.h filerenamerbase.ui nowplaying.h HACKING playlistcollection.h searchwidget.h coverdialog.h playlistsearch.h hi64-app-juk.png stringshare.h cr22-action-juk_dock.png statuslabel.h filerenameroptionsbase.ui exampleoptionsbase.ui slideraction.h k3bexporter.h tag.h playlist.h systemtray.h jukIface.h keydialog.h juk.desktop tagtransactionmanager.h sortedstringlist.h akodeplayer.h configure.in.in dynamicplaylist.h splashscreen.h exampleoptions.h cache.h deletedialog.h covermanager.h folderplaylist.h covericonview.h playlistsplitter.h playermanager.h collectionlist.h trackpickerdialog.h hi32-app-juk.png searchplaylist.h Makefile.am historyplaylist.h
++KDE_DIST=jukui.rc trackpickerdialogbase.ui actioncollection.h filehandle.h filehandleproperties.h hi48-app-juk.png ktrm.h jukui-rtl.rc categoryreaderinterface.h directorylistbase.ui tagrenameroptions.h playlistbox.h artsplayer.h deletedialogbase.ui musicbrainzquery.h jukservicemenu.desktop tagguesser.h treeviewitemplaylist.h stringhash.h playlistitem.h filerenameroptions.h tagguesserconfigdlg.h mediafiles.h filerenamerconfigdlg.h player.h tageditor.h viewmode.h directorylist.h googlefetcherdialog.h hi16-app-juk.png Makefile.in tracksequenceiterator.h juk.h advancedsearchdialog.h gstreamerplayer.h googlefetcher.h tracksequencemanager.h coverinfo.h playlistinterface.h hi128-app-juk.png tagguesserconfigdlgwidget.ui coverdialogbase.ui configure.in.bot playlistexporter.h upcomingplaylist.h filerenamer.h nowplaying.h filerenamerbase.ui HACKING playlistcollection.h searchwidget.h playlistsearch.h coverdialog.h hi64-app-juk.png stringshare.h cr22-action-juk_dock.png statuslabel.h filerenameroptionsbase.ui exampleoptionsbase.ui slideraction.h k3bexporter.h tag.h playlist.h systemtray.h jukIface.h keydialog.h juk.desktop tagtransactionmanager.h sortedstringlist.h akodeplayer.h configure.in.in splashscreen.h dynamicplaylist.h exampleoptions.h cache.h deletedialog.h covermanager.h folderplaylist.h playlistsplitter.h covericonview.h playermanager.h collectionlist.h trackpickerdialog.h hi32-app-juk.png searchplaylist.h Makefile.am historyplaylist.h
+
+ #>+ 4
+ clean-idl:
+@@ -1554,6 +1563,8 @@
+
+ #>+ 22
+ install-kde-icons:
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/hi32-app-juk.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/juk.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+ $(INSTALL_DATA) $(srcdir)/hi128-app-juk.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/juk.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+@@ -1564,16 +1575,14 @@
+ $(INSTALL_DATA) $(srcdir)/hi16-app-juk.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/juk.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/hi64-app-juk.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/juk.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/hi32-app-juk.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/juk.png
+
+ uninstall-kde-icons:
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/juk.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/juk.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/juk.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/juk_dock.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/juk.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/juk.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/juk.png
+
+ #>+ 15
+ force-reedit:
--- juk/pics/Makefile.in
+++ juk/pics/Makefile.in
@@ -113,6 +113,7 @@
@@ -40982,6 +52585,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -619,14 +628,14 @@
+
+ #>+ 10
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/16x16/actions
+- $(INSTALL_DATA) $(srcdir)/cr16-action-kaboodleloop.png $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/16x16/actions/kaboodleloop.png
+ $(mkinstalldirs) $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/22x22/actions
+ $(INSTALL_DATA) $(srcdir)/cr22-action-kaboodleloop.png $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/22x22/actions/kaboodleloop.png
++ $(mkinstalldirs) $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/16x16/actions
++ $(INSTALL_DATA) $(srcdir)/cr16-action-kaboodleloop.png $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/16x16/actions/kaboodleloop.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/16x16/actions/kaboodleloop.png
+ -rm -f $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/22x22/actions/kaboodleloop.png
++ -rm -f $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/16x16/actions/kaboodleloop.png
+
+ #>+ 15
+ force-reedit:
--- kaboodle/Makefile.in
+++ kaboodle/Makefile.in
@@ -191,6 +191,7 @@
@@ -41081,6 +52702,101 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -1063,20 +1072,6 @@
+ .NOEXPORT:
+
+ #>+ 3
+-engine.moc: $(srcdir)/engine.h
+- $(MOC) $(srcdir)/engine.h -o engine.moc
+-
+-#>+ 2
+-mocs: engine.moc
+-
+-#>+ 3
+-view.moc: $(srcdir)/view.h
+- $(MOC) $(srcdir)/view.h -o view.moc
+-
+-#>+ 2
+-mocs: view.moc
+-
+-#>+ 3
+ userinterface.moc: $(srcdir)/userinterface.h
+ $(MOC) $(srcdir)/userinterface.h -o userinterface.moc
+
+@@ -1098,13 +1093,6 @@
+ mocs: kaboodle_factory.moc
+
+ #>+ 3
+-controls.moc: $(srcdir)/controls.h
+- $(MOC) $(srcdir)/controls.h -o controls.moc
+-
+-#>+ 2
+-mocs: controls.moc
+-
+-#>+ 3
+ player.moc: $(srcdir)/player.h
+ $(MOC) $(srcdir)/player.h -o player.moc
+
+@@ -1118,6 +1106,27 @@
+ #>+ 2
+ mocs: conf.moc
+
++#>+ 3
++engine.moc: $(srcdir)/engine.h
++ $(MOC) $(srcdir)/engine.h -o engine.moc
++
++#>+ 2
++mocs: engine.moc
++
++#>+ 3
++view.moc: $(srcdir)/view.h
++ $(MOC) $(srcdir)/view.h -o view.moc
++
++#>+ 2
++mocs: view.moc
++
++#>+ 3
++controls.moc: $(srcdir)/controls.h
++ $(MOC) $(srcdir)/controls.h -o controls.moc
++
++#>+ 2
++mocs: controls.moc
++
+ #>+ 8
+ libkaboodlepart.la.closure: $(libkaboodlepart_la_OBJECTS) $(libkaboodlepart_la_DEPENDENCIES)
+ @echo "int main() {return 0;}" > libkaboodlepart_la_closure.cpp
+@@ -1129,10 +1138,10 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f engine.moc view.moc userinterface.moc kaboodleapp.moc kaboodle_factory.moc controls.moc player.moc conf.moc
++ -rm -f userinterface.moc kaboodleapp.moc kaboodle_factory.moc player.moc conf.moc engine.moc view.moc controls.moc
+
+ #>+ 2
+-KDE_DIST=engine.h kaboodle_factory.h conf.h controls.h player.h kaboodleui.rc kaboodle.desktop view.h Makefile.in kaboodlepartui.rc kaboodleengine.desktop kaboodleapp.h userinterface.h configure.in.in Makefile.am kaboodle_component.desktop
++KDE_DIST=engine.h kaboodle_factory.h controls.h conf.h player.h kaboodleui.rc kaboodle.desktop view.h Makefile.in kaboodlepartui.rc kaboodleengine.desktop kaboodleapp.h userinterface.h configure.in.in Makefile.am kaboodle_component.desktop
+
+ #>+ 3
+ clean-closures:
+@@ -1180,7 +1189,7 @@
+
+
+ #>+ 11
+-libkaboodle_noinst_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/conf.cpp $(srcdir)/controls.cpp $(srcdir)/engine.cpp $(srcdir)/player.cpp $(srcdir)/view.cpp $(srcdir)/kaboodle_factory.cpp engine.moc view.moc kaboodle_factory.moc player.moc controls.moc conf.moc
++libkaboodle_noinst_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/conf.cpp $(srcdir)/controls.cpp $(srcdir)/engine.cpp $(srcdir)/player.cpp $(srcdir)/view.cpp $(srcdir)/kaboodle_factory.cpp kaboodle_factory.moc player.moc conf.moc engine.moc view.moc controls.moc
+ @echo 'creating libkaboodle_noinst_la.all_cpp.cpp ...'; \
+ rm -f libkaboodle_noinst_la.all_cpp.files libkaboodle_noinst_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkaboodle_noinst_la.all_cpp.final; \
+@@ -1238,8 +1247,8 @@
+ kaboodle_factory.lo: kaboodle_factory.moc
+ nmcheck:
+ conf.o: conf.moc
+-view.lo: view.moc
+ player.o: player.moc
++view.lo: view.moc
+ nmcheck-am: nmcheck
+ player.lo: player.moc
+ userinterface.o: userinterface.moc
--- kaboodle/pics/Makefile.in
+++ kaboodle/pics/Makefile.in
@@ -103,6 +103,7 @@
@@ -41180,6 +52896,42 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -618,26 +627,26 @@
+
+ #>+ 22
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/hi22-app-kaboodle.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kaboodle.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-kaboodle.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kaboodle.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-kaboodle.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kaboodle.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-kaboodle.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kaboodle.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/hi64-app-kaboodle.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kaboodle.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+ $(INSTALL_DATA) $(srcdir)/hi128-app-kaboodle.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kaboodle.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/hi48-app-kaboodle.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kaboodle.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/hi22-app-kaboodle.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kaboodle.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-kaboodle.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kaboodle.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kaboodle.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kaboodle.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kaboodle.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kaboodle.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kaboodle.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kaboodle.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kaboodle.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kaboodle.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kaboodle.png
+
+ #>+ 15
+ force-reedit:
--- kappfinder-data/Makefile.in
+++ kappfinder-data/Makefile.in
@@ -118,6 +118,7 @@
@@ -41484,6 +53236,128 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
+@@ -1078,13 +1087,6 @@
+ .NOEXPORT:
+
+ #>+ 3
+-encoder.moc: $(srcdir)/encoder.h
+- $(MOC) $(srcdir)/encoder.h -o encoder.moc
+-
+-#>+ 2
+-mocs: encoder.moc
+-
+-#>+ 3
+ encodefileimp.moc: $(srcdir)/encodefileimp.h
+ $(MOC) $(srcdir)/encodefileimp.h -o encodefileimp.moc
+
+@@ -1092,18 +1094,18 @@
+ mocs: encodefileimp.moc
+
+ #>+ 3
+-encoderconfigimp.moc: $(srcdir)/encoderconfigimp.h
+- $(MOC) $(srcdir)/encoderconfigimp.h -o encoderconfigimp.moc
++encoder.moc: $(srcdir)/encoder.h
++ $(MOC) $(srcdir)/encoder.h -o encoder.moc
+
+ #>+ 2
+-mocs: encoderconfigimp.moc
++mocs: encoder.moc
+
+ #>+ 3
+-tracksimp.moc: $(srcdir)/tracksimp.h
+- $(MOC) $(srcdir)/tracksimp.h -o tracksimp.moc
++encoderconfigimp.moc: $(srcdir)/encoderconfigimp.h
++ $(MOC) $(srcdir)/encoderconfigimp.h -o encoderconfigimp.moc
+
+ #>+ 2
+-mocs: tracksimp.moc
++mocs: encoderconfigimp.moc
+
+ #>+ 3
+ kaudiocreator.moc: $(srcdir)/kaudiocreator.h
+@@ -1113,11 +1115,11 @@
+ mocs: kaudiocreator.moc
+
+ #>+ 3
+-jobqueimp.moc: $(srcdir)/jobqueimp.h
+- $(MOC) $(srcdir)/jobqueimp.h -o jobqueimp.moc
++tracksimp.moc: $(srcdir)/tracksimp.h
++ $(MOC) $(srcdir)/tracksimp.h -o tracksimp.moc
+
+ #>+ 2
+-mocs: jobqueimp.moc
++mocs: tracksimp.moc
+
+ #>+ 3
+ ripper.moc: $(srcdir)/ripper.h
+@@ -1127,8 +1129,15 @@
+ mocs: ripper.moc
+
+ #>+ 3
++jobqueimp.moc: $(srcdir)/jobqueimp.h
++ $(MOC) $(srcdir)/jobqueimp.h -o jobqueimp.moc
++
++#>+ 2
++mocs: jobqueimp.moc
++
++#>+ 3
+ clean-metasources:
+- -rm -f encoder.moc encodefileimp.moc encoderconfigimp.moc tracksimp.moc kaudiocreator.moc jobqueimp.moc ripper.moc
++ -rm -f encodefileimp.moc encoder.moc encoderconfigimp.moc kaudiocreator.moc tracksimp.moc ripper.moc jobqueimp.moc
+
+ #>+ 2
+ KDE_DIST=hi32-app-kaudiocreator.png encoderedit.ui prefs.kcfgc lo16-app-kaudiocreator.png eventsrc encoderconfig.ui.h encoder_prefs.kcfgc encoderoutput.ui jobqueimp.h encoderconfig.ui kaudiocreator_encoders.kcfg wizard.ui.h ripconfig.ui audiocd_extract.desktop Makefile.in job.h encoder_prefs_addons.h kaudiocreator-meta.upd general.ui.h kaudiocreator.kcfg upgrade-kaudiocreator-metadata.sh hi16-app-kaudiocreator.png cdconfig.ui tracks.ui jobque.ui kaudiocreatorui.rc encodefile.ui kaudiocreator_workman.h wizard.ui kaudiocreator-libkcddb.upd configure.in.in general.ui infodialog.ui lo32-app-kaudiocreator.png Makefile.am
+@@ -1161,18 +1170,18 @@
+ install-kde-icons:
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-kaudiocreator.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kaudiocreator.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/lo16-app-kaudiocreator.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kaudiocreator.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-kaudiocreator.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kaudiocreator.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/lo32-app-kaudiocreator.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kaudiocreator.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/lo16-app-kaudiocreator.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kaudiocreator.png
+
+ uninstall-kde-icons:
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kaudiocreator.png
++ -rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kaudiocreator.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kaudiocreator.png
+ -rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kaudiocreator.png
+- -rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kaudiocreator.png
+
+ #>+ 15
+ force-reedit:
+@@ -1213,7 +1222,7 @@
+
+
+ #>+ 11
+-kaudiocreator.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kaudiocreator.cpp ../libkcddb/configbase.h $(srcdir)/encoder.cpp $(srcdir)/encoderconfigimp.cpp $(srcdir)/job.cpp $(srcdir)/jobqueimp.cpp $(srcdir)/ripper.cpp $(srcdir)/tracksimp.cpp ../libkcddb/configbase.h ../libkcddb/cdinfodialogbase.h $(srcdir)/encodefileimp.cpp encoderedit.cpp jobque.cpp tracks.cpp infodialog.cpp wizard.cpp general.cpp cdconfig.cpp ripconfig.cpp encoderoutput.cpp encoderconfig.cpp wizard.h encodefile.cpp prefs.cpp encoder_prefs.cpp general.moc encodefileimp.moc tracks.moc encoderoutput.moc kaudiocreator.moc infodialog.moc encoder.moc ripconfig.moc tracksimp.moc encoderconfigimp.moc encodefile.moc encoderconfig.moc wizard.moc ripper.moc jobqueimp.moc jobque.moc cdconfig.moc encoderedit.moc
++kaudiocreator.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kaudiocreator.cpp ../libkcddb/configbase.h $(srcdir)/encoder.cpp $(srcdir)/encoderconfigimp.cpp $(srcdir)/job.cpp $(srcdir)/jobqueimp.cpp $(srcdir)/ripper.cpp $(srcdir)/tracksimp.cpp ../libkcddb/configbase.h ../libkcddb/cdinfodialogbase.h $(srcdir)/encodefileimp.cpp encoderedit.cpp jobque.cpp tracks.cpp infodialog.cpp wizard.cpp general.cpp cdconfig.cpp ripconfig.cpp encoderoutput.cpp encoderconfig.cpp wizard.h encodefile.cpp prefs.cpp encoder_prefs.cpp general.moc encodefileimp.moc tracks.moc encoderoutput.moc kaudiocreator.moc infodialog.moc encoder.moc ripconfig.moc tracksimp.moc encoderconfigimp.moc encodefile.moc encoderconfig.moc wizard.moc jobqueimp.moc ripper.moc jobque.moc cdconfig.moc encoderedit.moc
+ @echo 'creating kaudiocreator.all_cpp.cpp ...'; \
+ rm -f kaudiocreator.all_cpp.files kaudiocreator.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kaudiocreator.all_cpp.final; \
+@@ -1260,8 +1269,8 @@
+ encodefileimp.lo: encodefileimp.moc
+ kaudiocreator.lo: kaudiocreator.moc
+ $(srcdir)/tracksimp.cpp: encoderedit.h jobque.h tracks.h infodialog.h wizard.h general.h cdconfig.h ripconfig.h encoderoutput.h encoderconfig.h encodefile.h prefs.h encoder_prefs.h
+-ripper.o: ripper.moc
+ jobqueimp.o: jobqueimp.moc
++ripper.o: ripper.moc
+ encoder.o: encoder.moc
+ nmcheck:
+ $(srcdir)/ripper.cpp: encoderedit.h jobque.h tracks.h infodialog.h wizard.h general.h cdconfig.h ripconfig.h encoderoutput.h encoderconfig.h encodefile.h prefs.h encoder_prefs.h
+@@ -1269,8 +1278,8 @@
+ nmcheck-am: nmcheck
+ $(srcdir)/encoder.cpp: encoderedit.h jobque.h tracks.h infodialog.h wizard.h general.h cdconfig.h ripconfig.h encoderoutput.h encoderconfig.h encodefile.h prefs.h encoder_prefs.h
+ ripper.lo: ripper.moc
+-tracksimp.lo: tracksimp.moc
+ encoderconfigimp.o: encoderconfigimp.moc
++tracksimp.lo: tracksimp.moc
+ $(srcdir)/job.cpp: encoderedit.h jobque.h tracks.h infodialog.h wizard.h general.h cdconfig.h ripconfig.h encoderoutput.h encoderconfig.h encodefile.h prefs.h encoder_prefs.h
+
+ #>+ 177
--- kfile-plugins/au/Makefile.in
+++ kfile-plugins/au/Makefile.in
@@ -149,6 +149,7 @@
@@ -43662,6 +55536,91 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -1266,13 +1275,6 @@
+ mocs: channelcfgdlg.moc
+
+ #>+ 3
+-kdisptext.moc: $(srcdir)/kdisptext.h
+- $(MOC) $(srcdir)/kdisptext.h -o kdisptext.moc
+-
+-#>+ 2
+-mocs: kdisptext.moc
+-
+-#>+ 3
+ kmid_part.moc: $(srcdir)/kmid_part.h
+ $(MOC) $(srcdir)/kmid_part.h -o kmid_part.moc
+
+@@ -1280,11 +1282,11 @@
+ mocs: kmid_part.moc
+
+ #>+ 3
+-ktrianglebutton.moc: $(srcdir)/ktrianglebutton.h
+- $(MOC) $(srcdir)/ktrianglebutton.h -o ktrianglebutton.moc
++kdisptext.moc: $(srcdir)/kdisptext.h
++ $(MOC) $(srcdir)/kdisptext.h -o kdisptext.moc
+
+ #>+ 2
+-mocs: ktrianglebutton.moc
++mocs: kdisptext.moc
+
+ #>+ 3
+ qslidertime.moc: $(srcdir)/qslidertime.h
+@@ -1294,6 +1296,13 @@
+ mocs: qslidertime.moc
+
+ #>+ 3
++ktrianglebutton.moc: $(srcdir)/ktrianglebutton.h
++ $(MOC) $(srcdir)/ktrianglebutton.h -o ktrianglebutton.moc
++
++#>+ 2
++mocs: ktrianglebutton.moc
++
++#>+ 3
+ kmidframe.moc: $(srcdir)/kmidframe.h
+ $(MOC) $(srcdir)/kmidframe.h -o kmidframe.moc
+
+@@ -1318,7 +1327,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f klcdnumber.moc midicfgdlg.moc channel.moc channelview.moc collectdlg.moc channelcfgdlg.moc kdisptext.moc kmid_part.moc ktrianglebutton.moc qslidertime.moc kmidframe.moc kmidclient.moc
++ -rm -f klcdnumber.moc midicfgdlg.moc channel.moc channelview.moc collectdlg.moc channelcfgdlg.moc kmid_part.moc kdisptext.moc qslidertime.moc ktrianglebutton.moc kmidframe.moc kmidclient.moc
+
+ #>+ 2
+ KDE_DIST=kmidbutton.h audiomidi.desktop PEOPLE std.sb kmidIface.h drums.sb hi48-app-kmid.png instrname.i18n button1.xpm Makefile.in hi32-app-kmid.png kmid.lsm kmid.desktop kmid_partui.rc hi16-app-kmid.png x-karaoke.desktop instrfilter.awk kmid.spec kmidui.rc history.txt configure.in.in button2.xpm version.h keyboard.xpm Makefile.am
+@@ -1337,17 +1346,17 @@
+
+ #>+ 13
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/hi32-app-kmid.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmid.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-kmid.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kmid.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/hi48-app-kmid.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kmid.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-kmid.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kmid.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/hi32-app-kmid.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmid.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmid.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kmid.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kmid.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kmid.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmid.png
+
+ #>+ 15
+ force-reedit:
+@@ -1388,7 +1397,7 @@
+
+
+ #>+ 11
+-libkmidlib_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmidframe.cpp $(srcdir)/kmidclient.cpp $(srcdir)/kdisptext.cpp $(srcdir)/qslidertime.cpp $(srcdir)/klcdnumber.cpp $(srcdir)/ktrianglebutton.cpp $(srcdir)/midicfgdlg.cpp $(srcdir)/collectdlg.cpp $(srcdir)/randomlist.cpp $(srcdir)/channelview.cpp $(srcdir)/channel.cpp $(srcdir)/channel3d.cpp $(srcdir)/channel4d.cpp $(srcdir)/channelcfgdlg.cpp $(srcdir)/instrname.cpp $(srcdir)/rhythmview.cpp $(srcdir)/songlist.cpp $(srcdir)/slman.cpp $(srcdir)/kmid_part.cpp kmidIface_skel.cpp klcdnumber.moc midicfgdlg.moc channel.moc channelview.moc collectdlg.moc channelcfgdlg.moc kdisptext.moc kmid_part.moc qslidertime.moc ktrianglebutton.moc kmidframe.moc kmidclient.moc
++libkmidlib_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmidframe.cpp $(srcdir)/kmidclient.cpp $(srcdir)/kdisptext.cpp $(srcdir)/qslidertime.cpp $(srcdir)/klcdnumber.cpp $(srcdir)/ktrianglebutton.cpp $(srcdir)/midicfgdlg.cpp $(srcdir)/collectdlg.cpp $(srcdir)/randomlist.cpp $(srcdir)/channelview.cpp $(srcdir)/channel.cpp $(srcdir)/channel3d.cpp $(srcdir)/channel4d.cpp $(srcdir)/channelcfgdlg.cpp $(srcdir)/instrname.cpp $(srcdir)/rhythmview.cpp $(srcdir)/songlist.cpp $(srcdir)/slman.cpp $(srcdir)/kmid_part.cpp kmidIface_skel.cpp klcdnumber.moc midicfgdlg.moc channel.moc channelview.moc collectdlg.moc channelcfgdlg.moc kmid_part.moc kdisptext.moc ktrianglebutton.moc qslidertime.moc kmidframe.moc kmidclient.moc
+ @echo 'creating libkmidlib_la.all_cpp.cpp ...'; \
+ rm -f libkmidlib_la.all_cpp.files libkmidlib_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkmidlib_la.all_cpp.final; \
--- kmid/maps/Makefile.in
+++ kmid/maps/Makefile.in
@@ -113,6 +113,7 @@
@@ -43860,6 +55819,32 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -621,21 +630,21 @@
+ install-kde-icons:
+ $(mkinstalldirs) $(DESTDIR)$(kmidicondir)/crystalsvg/22x22/actions
+ $(INSTALL_DATA) $(srcdir)/cr22-action-piano.png $(DESTDIR)$(kmidicondir)/crystalsvg/22x22/actions/piano.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-volume.png $(DESTDIR)$(kmidicondir)/crystalsvg/22x22/actions/volume.png
+ $(mkinstalldirs) $(DESTDIR)$(kmidicondir)/crystalsvg/32x32/actions
+- $(INSTALL_DATA) $(srcdir)/cr32-action-piano.png $(DESTDIR)$(kmidicondir)/crystalsvg/32x32/actions/piano.png
+ $(INSTALL_DATA) $(srcdir)/cr32-action-volume.png $(DESTDIR)$(kmidicondir)/crystalsvg/32x32/actions/volume.png
+ $(mkinstalldirs) $(DESTDIR)$(kmidicondir)/crystalsvg/16x16/actions
+ $(INSTALL_DATA) $(srcdir)/cr16-action-piano.png $(DESTDIR)$(kmidicondir)/crystalsvg/16x16/actions/piano.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-piano.png $(DESTDIR)$(kmidicondir)/crystalsvg/32x32/actions/piano.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-volume.png $(DESTDIR)$(kmidicondir)/crystalsvg/16x16/actions/volume.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-volume.png $(DESTDIR)$(kmidicondir)/crystalsvg/22x22/actions/volume.png
+
+ uninstall-kde-icons:
+ -rm -f $(DESTDIR)$(kmidicondir)/crystalsvg/22x22/actions/piano.png
+- -rm -f $(DESTDIR)$(kmidicondir)/crystalsvg/22x22/actions/volume.png
+- -rm -f $(DESTDIR)$(kmidicondir)/crystalsvg/32x32/actions/piano.png
+ -rm -f $(DESTDIR)$(kmidicondir)/crystalsvg/32x32/actions/volume.png
+ -rm -f $(DESTDIR)$(kmidicondir)/crystalsvg/16x16/actions/piano.png
++ -rm -f $(DESTDIR)$(kmidicondir)/crystalsvg/32x32/actions/piano.png
+ -rm -f $(DESTDIR)$(kmidicondir)/crystalsvg/16x16/actions/volume.png
++ -rm -f $(DESTDIR)$(kmidicondir)/crystalsvg/22x22/actions/volume.png
+
+ #>+ 15
+ force-reedit:
--- kmix/Makefile.in
+++ kmix/Makefile.in
@@ -233,6 +233,7 @@
@@ -43959,6 +55944,142 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -1336,18 +1345,18 @@
+ mocs: viewswitches.moc
+
+ #>+ 3
+-viewdockareapopup.moc: $(srcdir)/viewdockareapopup.h
+- $(MOC) $(srcdir)/viewdockareapopup.h -o viewdockareapopup.moc
++kmixdockwidget.moc: $(srcdir)/kmixdockwidget.h
++ $(MOC) $(srcdir)/kmixdockwidget.h -o kmixdockwidget.moc
+
+ #>+ 2
+-mocs: viewdockareapopup.moc
++mocs: kmixdockwidget.moc
+
+ #>+ 3
+-kmixdockwidget.moc: $(srcdir)/kmixdockwidget.h
+- $(MOC) $(srcdir)/kmixdockwidget.h -o kmixdockwidget.moc
++viewdockareapopup.moc: $(srcdir)/viewdockareapopup.h
++ $(MOC) $(srcdir)/viewdockareapopup.h -o viewdockareapopup.moc
+
+ #>+ 2
+-mocs: kmixdockwidget.moc
++mocs: viewdockareapopup.moc
+
+ #>+ 3
+ ksmallslider.moc: $(srcdir)/ksmallslider.h
+@@ -1385,13 +1394,6 @@
+ mocs: viewapplet.moc
+
+ #>+ 3
+-kmixprefdlg.moc: $(srcdir)/kmixprefdlg.h
+- $(MOC) $(srcdir)/kmixprefdlg.h -o kmixprefdlg.moc
+-
+-#>+ 2
+-mocs: kmixprefdlg.moc
+-
+-#>+ 3
+ mixdevicewidget.moc: $(srcdir)/mixdevicewidget.h
+ $(MOC) $(srcdir)/mixdevicewidget.h -o mixdevicewidget.moc
+
+@@ -1399,11 +1401,11 @@
+ mocs: mixdevicewidget.moc
+
+ #>+ 3
+-KMixApp.moc: $(srcdir)/KMixApp.h
+- $(MOC) $(srcdir)/KMixApp.h -o KMixApp.moc
++kmixprefdlg.moc: $(srcdir)/kmixprefdlg.h
++ $(MOC) $(srcdir)/kmixprefdlg.h -o kmixprefdlg.moc
+
+ #>+ 2
+-mocs: KMixApp.moc
++mocs: kmixprefdlg.moc
+
+ #>+ 3
+ dialogviewconfiguration.moc: $(srcdir)/dialogviewconfiguration.h
+@@ -1413,6 +1415,13 @@
+ mocs: dialogviewconfiguration.moc
+
+ #>+ 3
++KMixApp.moc: $(srcdir)/KMixApp.h
++ $(MOC) $(srcdir)/KMixApp.h -o KMixApp.moc
++
++#>+ 2
++mocs: KMixApp.moc
++
++#>+ 3
+ kmixapplet.moc: $(srcdir)/kmixapplet.h
+ $(MOC) $(srcdir)/kmixapplet.h -o kmixapplet.moc
+
+@@ -1434,18 +1443,18 @@
+ mocs: kmix.moc
+
+ #>+ 3
+-mdwswitch.moc: $(srcdir)/mdwswitch.h
+- $(MOC) $(srcdir)/mdwswitch.h -o mdwswitch.moc
++viewsliders.moc: $(srcdir)/viewsliders.h
++ $(MOC) $(srcdir)/viewsliders.h -o viewsliders.moc
+
+ #>+ 2
+-mocs: mdwswitch.moc
++mocs: viewsliders.moc
+
+ #>+ 3
+-viewsliders.moc: $(srcdir)/viewsliders.h
+- $(MOC) $(srcdir)/viewsliders.h -o viewsliders.moc
++mdwswitch.moc: $(srcdir)/mdwswitch.h
++ $(MOC) $(srcdir)/mdwswitch.h -o mdwswitch.moc
+
+ #>+ 2
+-mocs: viewsliders.moc
++mocs: mdwswitch.moc
+
+ #>+ 3
+ mixdevice.moc: $(srcdir)/mixdevice.h
+@@ -1476,18 +1485,18 @@
+ mocs: viewsurround.moc
+
+ #>+ 3
+-kmixerwidget.moc: $(srcdir)/kmixerwidget.h
+- $(MOC) $(srcdir)/kmixerwidget.h -o kmixerwidget.moc
++mixer.moc: $(srcdir)/mixer.h
++ $(MOC) $(srcdir)/mixer.h -o mixer.moc
+
+ #>+ 2
+-mocs: kmixerwidget.moc
++mocs: mixer.moc
+
+ #>+ 3
+-mixer.moc: $(srcdir)/mixer.h
+- $(MOC) $(srcdir)/mixer.h -o mixer.moc
++kmixerwidget.moc: $(srcdir)/kmixerwidget.h
++ $(MOC) $(srcdir)/kmixerwidget.h -o kmixerwidget.moc
+
+ #>+ 2
+-mocs: mixer.moc
++mocs: kmixerwidget.moc
+
+ #>+ 3
+ kledbutton.moc: $(srcdir)/kledbutton.h
+@@ -1523,7 +1532,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f viewswitches.moc viewdockareapopup.moc kmixdockwidget.moc ksmallslider.moc viewinput.moc viewgrid.moc mdwenum.moc viewapplet.moc kmixprefdlg.moc mixdevicewidget.moc KMixApp.moc dialogviewconfiguration.moc kmixapplet.moc mdwslider.moc kmix.moc mdwswitch.moc viewsliders.moc mixdevice.moc viewbase.moc dialogselectmaster.moc viewsurround.moc kmixerwidget.moc mixer.moc kledbutton.moc viewoutput.moc
++ -rm -f viewswitches.moc kmixdockwidget.moc viewdockareapopup.moc ksmallslider.moc viewinput.moc viewgrid.moc mdwenum.moc viewapplet.moc mixdevicewidget.moc kmixprefdlg.moc dialogviewconfiguration.moc KMixApp.moc kmixapplet.moc mdwslider.moc kmix.moc viewsliders.moc mdwswitch.moc mixdevice.moc viewbase.moc dialogselectmaster.moc viewsurround.moc mixer.moc kmixerwidget.moc kledbutton.moc viewoutput.moc
+
+ #>+ 2
+ KDE_DIST=kmix.desktop resource.h kmixui.rc kmix-platforms.cpp colorwidget.ui mixer_sun.h mixer_alsa.h mixer_hpux.cpp kmixapplet.desktop viewapplet.h mixer_irix.cpp mixer_sun.cpp kmixctrl_restore.desktop Makefile.in restore_kmix_volumes.desktop TestCases mixer_hpux.h mixer_irix.h mixer_none.cpp configure.in.in mixer_oss.cpp mixer_none.h mixer_alsa9.cpp Makefile.am mixer_oss.h
+@@ -1586,7 +1595,7 @@
+
+
+ #>+ 11
+-libkdeinit_kmix_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kmix.cpp $(srcdir)/kmixdockwidget.cpp $(srcdir)/kmixprefdlg.cpp $(srcdir)/viewbase.cpp $(srcdir)/viewoutput.cpp $(srcdir)/viewinput.cpp $(srcdir)/viewswitches.cpp $(srcdir)/viewsurround.cpp $(srcdir)/viewdockareapopup.cpp $(srcdir)/viewsliders.cpp $(srcdir)/viewgrid.cpp $(srcdir)/mixdevicewidget.cpp $(srcdir)/mdwslider.cpp $(srcdir)/mdwswitch.cpp $(srcdir)/mdwenum.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/mixer.cpp $(srcdir)/mixset.cpp $(srcdir)/mixdevice.cpp $(srcdir)/mixer_backend.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/verticaltext.cpp $(srcdir)/kmixtoolbox.cpp $(srcdir)/mixertoolbox.cpp $(srcdir)/dialogviewconfiguration.cpp $(srcdir)/KMixApp.cpp $(srcdir)/dialogselectmaster.cpp mixerIface_skel.cpp viewswitches.moc kmixdockwidget.moc viewdockareapopup.moc ksmallslider.moc viewinput.moc viewgrid.moc mdwenum.moc mixdevicewidget.moc kmixprefdlg.moc KMixApp.moc dialogviewconfiguration.moc mdwslider.moc kmix.moc mdwswitch.moc viewsliders.moc mixdevice.moc viewbase.moc dialogselectmaster.moc viewsurround.moc mixer.moc kmixerwidget.moc kledbutton.moc viewoutput.moc
++libkdeinit_kmix_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kmix.cpp $(srcdir)/kmixdockwidget.cpp $(srcdir)/kmixprefdlg.cpp $(srcdir)/viewbase.cpp $(srcdir)/viewoutput.cpp $(srcdir)/viewinput.cpp $(srcdir)/viewswitches.cpp $(srcdir)/viewsurround.cpp $(srcdir)/viewdockareapopup.cpp $(srcdir)/viewsliders.cpp $(srcdir)/viewgrid.cpp $(srcdir)/mixdevicewidget.cpp $(srcdir)/mdwslider.cpp $(srcdir)/mdwswitch.cpp $(srcdir)/mdwenum.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/mixer.cpp $(srcdir)/mixset.cpp $(srcdir)/mixdevice.cpp $(srcdir)/mixer_backend.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/verticaltext.cpp $(srcdir)/kmixtoolbox.cpp $(srcdir)/mixertoolbox.cpp $(srcdir)/dialogviewconfiguration.cpp $(srcdir)/KMixApp.cpp $(srcdir)/dialogselectmaster.cpp mixerIface_skel.cpp viewswitches.moc viewdockareapopup.moc kmixdockwidget.moc ksmallslider.moc viewinput.moc viewgrid.moc mdwenum.moc kmixprefdlg.moc mixdevicewidget.moc dialogviewconfiguration.moc KMixApp.moc mdwslider.moc kmix.moc viewsliders.moc mdwswitch.moc mixdevice.moc viewbase.moc dialogselectmaster.moc viewsurround.moc kmixerwidget.moc mixer.moc kledbutton.moc viewoutput.moc
+ @echo 'creating libkdeinit_kmix_la.all_cpp.cpp ...'; \
+ rm -f libkdeinit_kmix_la.all_cpp.files libkdeinit_kmix_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkdeinit_kmix_la.all_cpp.final; \
--- kmix/pics/Makefile.in
+++ kmix/pics/Makefile.in
@@ -113,6 +113,7 @@
@@ -44058,6 +56179,39 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -658,23 +667,23 @@
+
+ #>+ 19
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+- $(INSTALL_DATA) $(srcdir)/hi64-app-kmix.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kmix.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/hi48-app-kmix.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kmix.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+ $(INSTALL_DATA) $(srcdir)/hi128-app-kmix.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kmix.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/hi32-app-kmix.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmix.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-kmix.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kmix.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-kmix.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kmix.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
++ $(INSTALL_DATA) $(srcdir)/hi64-app-kmix.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kmix.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/hi32-app-kmix.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmix.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kmix.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kmix.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kmix.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmix.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kmix.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kmix.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kmix.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmix.png
+
+ #>+ 15
+ force-reedit:
--- krec/Makefile.in
+++ krec/Makefile.in
@@ -228,6 +228,7 @@
@@ -44157,6 +56311,158 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -1290,7 +1299,7 @@
+
+ #>- krecord.lo: ../arts/gui/common/artsgui.h ../arts/modules/effects/artsmoduleseffects.h ../arts/modules/common/artsmodulescommon.h ../arts/midi/artsmidi.h ../arts/modules/synth/artsmodulessynth.h
+ #>+ 1
+-krecord.lo: krecord.moc krecord_private.moc ../arts/gui/common/artsgui.h ../arts/modules/effects/artsmoduleseffects.h ../arts/modules/common/artsmodulescommon.h ../arts/midi/artsmidi.h ../arts/modules/synth/artsmodulessynth.h
++krecord.lo: krecord_private.moc krecord.moc ../arts/gui/common/artsgui.h ../arts/modules/effects/artsmoduleseffects.h ../arts/modules/common/artsmodulescommon.h ../arts/midi/artsmidi.h ../arts/modules/synth/artsmodulessynth.h
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+@@ -1345,18 +1354,18 @@
+ mocs: krecglobal.moc
+
+ #>+ 3
+-krecord.moc: $(srcdir)/krecord.h
+- $(MOC) $(srcdir)/krecord.h -o krecord.moc
++krecord_private.moc: $(srcdir)/krecord_private.h
++ $(MOC) $(srcdir)/krecord_private.h -o krecord_private.moc
+
+ #>+ 2
+-mocs: krecord.moc
++mocs: krecord_private.moc
+
+ #>+ 3
+-krecord_private.moc: $(srcdir)/krecord_private.h
+- $(MOC) $(srcdir)/krecord_private.h -o krecord_private.moc
++krecord.moc: $(srcdir)/krecord.h
++ $(MOC) $(srcdir)/krecord.h -o krecord.moc
+
+ #>+ 2
+-mocs: krecord_private.moc
++mocs: krecord.moc
+
+ #>+ 3
+ krecconfig_files.moc: $(srcdir)/krecconfig_files.h
+@@ -1373,13 +1382,6 @@
+ mocs: krecfileview.moc
+
+ #>+ 3
+-krecexport_template.moc: $(srcdir)/krecexport_template.h
+- $(MOC) $(srcdir)/krecexport_template.h -o krecexport_template.moc
+-
+-#>+ 2
+-mocs: krecexport_template.moc
+-
+-#>+ 3
+ krecfilewidgets.moc: $(srcdir)/krecfilewidgets.h
+ $(MOC) $(srcdir)/krecfilewidgets.h -o krecfilewidgets.moc
+
+@@ -1387,11 +1389,11 @@
+ mocs: krecfilewidgets.moc
+
+ #>+ 3
+-krecexport_wave.moc: $(srcdir)/krecexport_wave.h
+- $(MOC) $(srcdir)/krecexport_wave.h -o krecexport_wave.moc
++krecexport_template.moc: $(srcdir)/krecexport_template.h
++ $(MOC) $(srcdir)/krecexport_template.h -o krecexport_template.moc
+
+ #>+ 2
+-mocs: krecexport_wave.moc
++mocs: krecexport_template.moc
+
+ #>+ 3
+ krecconfigure.moc: $(srcdir)/krecconfigure.h
+@@ -1401,6 +1403,13 @@
+ mocs: krecconfigure.moc
+
+ #>+ 3
++krecexport_wave.moc: $(srcdir)/krecexport_wave.h
++ $(MOC) $(srcdir)/krecexport_wave.h -o krecexport_wave.moc
++
++#>+ 2
++mocs: krecexport_wave.moc
++
++#>+ 3
+ krecconfig_fileswidget.moc: $(srcdir)/krecconfig_fileswidget.h
+ $(MOC) $(srcdir)/krecconfig_fileswidget.h -o krecconfig_fileswidget.moc
+
+@@ -1468,10 +1477,10 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f krecnewproperties.moc krecglobal.moc krecord.moc krecord_private.moc krecconfig_files.moc krecfileview.moc krecexport_template.moc krecfilewidgets.moc krecexport_wave.moc krecconfigure.moc krecconfig_fileswidget.moc krecfile.moc krecfileviewhelpers.moc
++ -rm -f krecnewproperties.moc krecglobal.moc krecord_private.moc krecord.moc krecconfig_files.moc krecfileview.moc krecfilewidgets.moc krecexport_template.moc krecconfigure.moc krecexport_wave.moc krecconfig_fileswidget.moc krecfile.moc krecfileviewhelpers.moc
+
+ #>+ 2
+-KDE_DIST=hi48-app-krec.png krec_exportwave.desktop globals.h krec.desktop hi22-app-krec.png krecconfig_files.h tips krecexport_template.h kcm_krec_files.desktop krecnewproperties.h Makefile.in krecfilewidgets.h krecconfig_fileswidget.h krecfileviewhelpers.h hi128-app-krec.png krecfileview.h krecconfigure.h krecfile.h krecord_private.h hi16-app-krec.png krecord.h krecglobal.h krecui.rc hi32-app-krec.png hi64-app-krec.png configure.in.in krec_exportitem.desktop krecexport_wave.h kcm_krec.desktop Makefile.am
++KDE_DIST=hi48-app-krec.png krec_exportwave.desktop globals.h krec.desktop hi22-app-krec.png krecconfig_files.h tips krecexport_template.h kcm_krec_files.desktop krecnewproperties.h Makefile.in krecfilewidgets.h krecconfig_fileswidget.h krecfileviewhelpers.h hi128-app-krec.png krecfileview.h krecconfigure.h krecord_private.h krecfile.h hi16-app-krec.png krecord.h krecglobal.h krecui.rc hi32-app-krec.png hi64-app-krec.png configure.in.in krec_exportitem.desktop krecexport_wave.h kcm_krec.desktop Makefile.am
+
+ #>+ 3
+ clean-closures:
+@@ -1482,25 +1491,25 @@
+
+ #>+ 22
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/hi128-app-krec.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/krec.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/hi22-app-krec.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/krec.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/hi32-app-krec.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/krec.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-krec.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/krec.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/hi22-app-krec.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/krec.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/hi64-app-krec.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/krec.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/hi32-app-krec.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/krec.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/hi128-app-krec.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/krec.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/hi48-app-krec.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/krec.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/krec.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/krec.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/krec.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/krec.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/krec.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/krec.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/krec.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/krec.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/krec.png
+
+ #>+ 15
+@@ -1542,7 +1551,7 @@
+
+
+ #>+ 11
+-libkdeinit_krec_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/krecnewproperties.cpp $(srcdir)/krecfile.cpp $(srcdir)/krecfileview.cpp $(srcdir)/krecfileviewhelpers.cpp $(srcdir)/krecfilewidgets.cpp $(srcdir)/main.cpp $(srcdir)/krecord.cpp ../arts/gui/common/artsgui.h ../arts/modules/effects/artsmoduleseffects.h ../arts/modules/common/artsmodulescommon.h ../arts/midi/artsmidi.h ../arts/modules/synth/artsmodulessynth.h krecnewproperties.moc krecord_private.moc krecord.moc krecfileview.moc krecfilewidgets.moc krecfile.moc krecfileviewhelpers.moc
++libkdeinit_krec_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/krecnewproperties.cpp $(srcdir)/krecfile.cpp $(srcdir)/krecfileview.cpp $(srcdir)/krecfileviewhelpers.cpp $(srcdir)/krecfilewidgets.cpp $(srcdir)/main.cpp $(srcdir)/krecord.cpp ../arts/gui/common/artsgui.h ../arts/modules/effects/artsmoduleseffects.h ../arts/modules/common/artsmodulescommon.h ../arts/midi/artsmidi.h ../arts/modules/synth/artsmodulessynth.h krecnewproperties.moc krecord.moc krecord_private.moc krecfileview.moc krecfilewidgets.moc krecfile.moc krecfileviewhelpers.moc
+ @echo 'creating libkdeinit_krec_la.all_cpp.cpp ...'; \
+ rm -f libkdeinit_krec_la.all_cpp.files libkdeinit_krec_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkdeinit_krec_la.all_cpp.final; \
+@@ -1554,7 +1563,7 @@
+ rm -f libkdeinit_krec_la.all_cpp.final libkdeinit_krec_la.all_cpp.files
+
+ #>+ 11
+-krec_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/krecnewproperties.cpp $(srcdir)/krecfile.cpp $(srcdir)/krecfileview.cpp $(srcdir)/krecfileviewhelpers.cpp $(srcdir)/krecfilewidgets.cpp $(srcdir)/main.cpp $(srcdir)/krecord.cpp ../arts/gui/common/artsgui.h ../arts/modules/effects/artsmoduleseffects.h ../arts/modules/common/artsmodulescommon.h ../arts/midi/artsmidi.h ../arts/modules/synth/artsmodulessynth.h krecnewproperties.moc krecord_private.moc krecord.moc krecfileview.moc krecfilewidgets.moc krecfile.moc krecfileviewhelpers.moc
++krec_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/krecnewproperties.cpp $(srcdir)/krecfile.cpp $(srcdir)/krecfileview.cpp $(srcdir)/krecfileviewhelpers.cpp $(srcdir)/krecfilewidgets.cpp $(srcdir)/main.cpp $(srcdir)/krecord.cpp ../arts/gui/common/artsgui.h ../arts/modules/effects/artsmoduleseffects.h ../arts/modules/common/artsmodulescommon.h ../arts/midi/artsmidi.h ../arts/modules/synth/artsmodulessynth.h krecnewproperties.moc krecord.moc krecord_private.moc krecfileview.moc krecfilewidgets.moc krecfile.moc krecfileviewhelpers.moc
+ @echo 'creating krec_la.all_cpp.cpp ...'; \
+ rm -f krec_la.all_cpp.files krec_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> krec_la.all_cpp.final; \
+@@ -1630,7 +1639,7 @@
+ krecnewproperties.o: krecnewproperties.moc
+ krecexport_wave.lo: krecexport_wave.moc
+ krecconfig_files.o: krecconfig_files.moc
+-krecord.o: krecord.moc krecord_private.moc
++krecord.o: krecord_private.moc krecord.moc
+ krecfileviewhelpers.o: krecfileviewhelpers.moc
+ nmcheck:
+ krecfile.o: krecfile.moc
--- krec/mp3_export/Makefile.in
+++ krec/mp3_export/Makefile.in
@@ -147,6 +147,7 @@
@@ -44454,6 +56760,39 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -619,24 +628,24 @@
+
+ #>+ 20
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/mimetypes
+- $(INSTALL_DATA) $(srcdir)/cr32-mime-krec_fileempty.png $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/mimetypes/krec_fileempty.png
+- $(mkinstalldirs) $(DESTDIR)$(kreciconsdir)/crystalsvg/22x22/actions
+- $(INSTALL_DATA) $(srcdir)/cr22-action-krec_record.png $(DESTDIR)$(kreciconsdir)/crystalsvg/22x22/actions/krec_record.png
+ $(mkinstalldirs) $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/actions
+ $(INSTALL_DATA) $(srcdir)/cr32-action-krec_record.png $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/actions/krec_record.png
++ $(mkinstalldirs) $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/mimetypes
+ $(INSTALL_DATA) $(srcdir)/cr32-mime-krec_fileplay.png $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/mimetypes/krec_fileplay.png
++ $(INSTALL_DATA) $(srcdir)/cr32-mime-krec_filerec.png $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/mimetypes/krec_filerec.png
++ $(INSTALL_DATA) $(srcdir)/cr32-mime-krec_fileempty.png $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/mimetypes/krec_fileempty.png
+ $(mkinstalldirs) $(DESTDIR)$(kreciconsdir)/crystalsvg/16x16/actions
+ $(INSTALL_DATA) $(srcdir)/cr16-action-krec_record.png $(DESTDIR)$(kreciconsdir)/crystalsvg/16x16/actions/krec_record.png
+- $(INSTALL_DATA) $(srcdir)/cr32-mime-krec_filerec.png $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/mimetypes/krec_filerec.png
++ $(mkinstalldirs) $(DESTDIR)$(kreciconsdir)/crystalsvg/22x22/actions
++ $(INSTALL_DATA) $(srcdir)/cr22-action-krec_record.png $(DESTDIR)$(kreciconsdir)/crystalsvg/22x22/actions/krec_record.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/mimetypes/krec_fileempty.png
+- -rm -f $(DESTDIR)$(kreciconsdir)/crystalsvg/22x22/actions/krec_record.png
+ -rm -f $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/actions/krec_record.png
+ -rm -f $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/mimetypes/krec_fileplay.png
+- -rm -f $(DESTDIR)$(kreciconsdir)/crystalsvg/16x16/actions/krec_record.png
+ -rm -f $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/mimetypes/krec_filerec.png
++ -rm -f $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/mimetypes/krec_fileempty.png
++ -rm -f $(DESTDIR)$(kreciconsdir)/crystalsvg/16x16/actions/krec_record.png
++ -rm -f $(DESTDIR)$(kreciconsdir)/crystalsvg/22x22/actions/krec_record.png
+
+ #>+ 15
+ force-reedit:
--- kscd/bitmaps/Makefile.in
+++ kscd/bitmaps/Makefile.in
@@ -103,6 +103,7 @@
@@ -44949,6 +57288,44 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
+@@ -1188,7 +1197,7 @@
+ -rm -f bwlednum.moc kscd.moc docking.moc kcompactdisc.moc ledlamp.moc configWidget.moc cddbdlg.moc
+
+ #>+ 2
+-KDE_DIST=hi16-app-kscd.png audiocd_play.desktop panel.ui prefs.kcfgc CDQuery.txt kscd.desktop Makefile.in xmcd.desktop hi48-app-kscd.png kcompactdisc.h hi128-app-kscd.png configWidgetUI.ui hi64-app-kscd.png hi32-app-kscd.png kscd-script kscd.lsm cddaslave.c kscd.kcfg cr22-action-cdsmall.png workman2cddb.pl kscd.profile.xml configure.in.in cddbdlg.h Makefile.am
++KDE_DIST=hi16-app-kscd.png audiocd_play.desktop prefs.kcfgc panel.ui CDQuery.txt kscd.desktop Makefile.in xmcd.desktop hi48-app-kscd.png kcompactdisc.h configWidgetUI.ui hi128-app-kscd.png hi64-app-kscd.png hi32-app-kscd.png kscd-script kscd.lsm cddaslave.c kscd.kcfg cr22-action-cdsmall.png workman2cddb.pl kscd.profile.xml configure.in.in cddbdlg.h Makefile.am
+
+ #>+ 4
+ clean-idl:
+@@ -1215,22 +1224,22 @@
+ $(INSTALL_DATA) $(srcdir)/cr22-action-cdsmall.png $(DESTDIR)$(kscdicondir)/crystalsvg/22x22/actions/cdsmall.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+ $(INSTALL_DATA) $(srcdir)/hi128-app-kscd.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kscd.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/hi32-app-kscd.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kscd.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-kscd.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kscd.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-kscd.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kscd.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/hi64-app-kscd.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kscd.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/hi48-app-kscd.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kscd.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/hi32-app-kscd.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kscd.png
+
+ uninstall-kde-icons:
+ -rm -f $(DESTDIR)$(kscdicondir)/crystalsvg/22x22/actions/cdsmall.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kscd.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kscd.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kscd.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kscd.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kscd.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kscd.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kscd.png
+
+ #>+ 15
+ force-reedit:
--- libkcddb/kcmcddb/Makefile.in
+++ libkcddb/kcmcddb/Makefile.in
@@ -150,6 +150,7 @@
@@ -45048,6 +57425,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -863,7 +872,7 @@
+ -rm -f cddbconfigwidget.moc kcmcddb.moc
+
+ #>+ 2
+-KDE_DIST=cddbconfigwidget.h Makefile.in kcmcddb-emailsettings.upd libkcddb.desktop kcmcddb.h cddbconfigwidgetbase.ui Makefile.am
++KDE_DIST=cddbconfigwidget.h Makefile.in kcmcddb-emailsettings.upd libkcddb.desktop cddbconfigwidgetbase.ui kcmcddb.h Makefile.am
+
+ #>+ 4
+ clean-ui:
--- libkcddb/Makefile.in
+++ libkcddb/Makefile.in
@@ -179,6 +179,7 @@
@@ -45147,6 +57533,69 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -1088,32 +1097,32 @@
+ .NOEXPORT:
+
+ #>+ 3
+-httplookup.moc: $(srcdir)/httplookup.h
+- $(MOC) $(srcdir)/httplookup.h -o httplookup.moc
++client.moc: $(srcdir)/client.h
++ $(MOC) $(srcdir)/client.h -o client.moc
+
+ #>+ 2
+-mocs: httplookup.moc
++mocs: client.moc
+
+ #>+ 3
+-asynccddbplookup.moc: $(srcdir)/asynccddbplookup.h
+- $(MOC) $(srcdir)/asynccddbplookup.h -o asynccddbplookup.moc
++httplookup.moc: $(srcdir)/httplookup.h
++ $(MOC) $(srcdir)/httplookup.h -o httplookup.moc
+
+ #>+ 2
+-mocs: asynccddbplookup.moc
++mocs: httplookup.moc
+
+ #>+ 3
+-client.moc: $(srcdir)/client.h
+- $(MOC) $(srcdir)/client.h -o client.moc
++asyncsmtpsubmit.moc: $(srcdir)/asyncsmtpsubmit.h
++ $(MOC) $(srcdir)/asyncsmtpsubmit.h -o asyncsmtpsubmit.moc
+
+ #>+ 2
+-mocs: client.moc
++mocs: asyncsmtpsubmit.moc
+
+ #>+ 3
+-asyncsmtpsubmit.moc: $(srcdir)/asyncsmtpsubmit.h
+- $(MOC) $(srcdir)/asyncsmtpsubmit.h -o asyncsmtpsubmit.moc
++asynccddbplookup.moc: $(srcdir)/asynccddbplookup.h
++ $(MOC) $(srcdir)/asynccddbplookup.h -o asynccddbplookup.moc
+
+ #>+ 2
+-mocs: asyncsmtpsubmit.moc
++mocs: asynccddbplookup.moc
+
+ #>+ 3
+ asynchttplookup.moc: $(srcdir)/asynchttplookup.h
+@@ -1138,7 +1147,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f httplookup.moc asynccddbplookup.moc client.moc asyncsmtpsubmit.moc asynchttplookup.moc asynchttpsubmit.moc cdinfoencodingwidget.moc
++ -rm -f client.moc httplookup.moc asyncsmtpsubmit.moc asynccddbplookup.moc asynchttplookup.moc asynchttpsubmit.moc cdinfoencodingwidget.moc
+
+ #>+ 2
+ KDE_DIST=categories.h httplookup.h configbase.kcfgc asynccddbplookup.h asynchttplookup.h synchttplookup.h asyncsmtpsubmit.h genres.h cdinfoencodingwidgetbase.ui Makefile.in lookup.h sites.h libkcddb.kcfg cdinfodialogbase.ui.h smtpsubmit.h asynchttpsubmit.h httpsubmit.h synchttpsubmit.h submit.h cdinfodialogbase.ui cddbplookup.h synccddbplookup.h syncsmtpsubmit.h Makefile.am cdinfoencodingwidget.h
+@@ -1196,7 +1205,7 @@
+
+
+ #>+ 11
+-libkcddb_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cache.cpp $(srcdir)/cdinfo.cpp $(srcdir)/config.cpp configbase.h $(srcdir)/client.cpp $(srcdir)/cddb.cpp $(srcdir)/lookup.cpp $(srcdir)/cddbplookup.cpp $(srcdir)/synccddbplookup.cpp $(srcdir)/asynccddbplookup.cpp $(srcdir)/httplookup.cpp $(srcdir)/synchttplookup.cpp $(srcdir)/asynchttplookup.cpp $(srcdir)/smtpsubmit.cpp $(srcdir)/asyncsmtpsubmit.cpp $(srcdir)/syncsmtpsubmit.cpp $(srcdir)/submit.cpp $(srcdir)/sites.cpp $(srcdir)/httpsubmit.cpp $(srcdir)/asynchttpsubmit.cpp $(srcdir)/synchttpsubmit.cpp $(srcdir)/categories.cpp $(srcdir)/genres.cpp $(srcdir)/cdinfoencodingwidget.cpp cdinfodialogbase.cpp cdinfoencodingwidgetbase.cpp configbase.cpp asyncsmtpsubmit.moc asynchttplookup.moc cdinfoencodingwidgetbase.moc cdinfoencodingwidget.moc cdinfodialogbase.moc httplookup.moc asynccddbplookup.moc client.moc asynchttpsubmit.moc
++libkcddb_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cache.cpp $(srcdir)/cdinfo.cpp $(srcdir)/config.cpp configbase.h $(srcdir)/client.cpp $(srcdir)/cddb.cpp $(srcdir)/lookup.cpp $(srcdir)/cddbplookup.cpp $(srcdir)/synccddbplookup.cpp $(srcdir)/asynccddbplookup.cpp $(srcdir)/httplookup.cpp $(srcdir)/synchttplookup.cpp $(srcdir)/asynchttplookup.cpp $(srcdir)/smtpsubmit.cpp $(srcdir)/asyncsmtpsubmit.cpp $(srcdir)/syncsmtpsubmit.cpp $(srcdir)/submit.cpp $(srcdir)/sites.cpp $(srcdir)/httpsubmit.cpp $(srcdir)/asynchttpsubmit.cpp $(srcdir)/synchttpsubmit.cpp $(srcdir)/categories.cpp $(srcdir)/genres.cpp $(srcdir)/cdinfoencodingwidget.cpp cdinfodialogbase.cpp cdinfoencodingwidgetbase.cpp configbase.cpp asyncsmtpsubmit.moc asynchttplookup.moc cdinfoencodingwidgetbase.moc cdinfoencodingwidget.moc cdinfodialogbase.moc client.moc httplookup.moc asynccddbplookup.moc asynchttpsubmit.moc
+ @echo 'creating libkcddb_la.all_cpp.cpp ...'; \
+ rm -f libkcddb_la.all_cpp.files libkcddb_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkcddb_la.all_cpp.final; \
--- libkcddb/test/Makefile.in
+++ libkcddb/test/Makefile.in
@@ -200,6 +200,7 @@
@@ -45246,6 +57695,36 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
+@@ -876,22 +885,22 @@
+ mocs: asynccddblookuptest.moc
+
+ #>+ 3
+-asynchttplookuptest.moc: $(srcdir)/asynchttplookuptest.h
+- $(MOC) $(srcdir)/asynchttplookuptest.h -o asynchttplookuptest.moc
++asyncsmtpsubmittest.moc: $(srcdir)/asyncsmtpsubmittest.h
++ $(MOC) $(srcdir)/asyncsmtpsubmittest.h -o asyncsmtpsubmittest.moc
+
+ #>+ 2
+-mocs: asynchttplookuptest.moc
++mocs: asyncsmtpsubmittest.moc
+
+ #>+ 3
+-asyncsmtpsubmittest.moc: $(srcdir)/asyncsmtpsubmittest.h
+- $(MOC) $(srcdir)/asyncsmtpsubmittest.h -o asyncsmtpsubmittest.moc
++asynchttplookuptest.moc: $(srcdir)/asynchttplookuptest.h
++ $(MOC) $(srcdir)/asynchttplookuptest.h -o asynchttplookuptest.moc
+
+ #>+ 2
+-mocs: asyncsmtpsubmittest.moc
++mocs: asynchttplookuptest.moc
+
+ #>+ 3
+ clean-metasources:
+- -rm -f asynchttpsubmittest.moc asynccddblookuptest.moc asynchttplookuptest.moc asyncsmtpsubmittest.moc
++ -rm -f asynchttpsubmittest.moc asynccddblookuptest.moc asyncsmtpsubmittest.moc asynchttplookuptest.moc
+
+ #>+ 2
+ KDE_DIST=asynccddblookuptest.h asynchttplookuptest.h asyncsmtpsubmittest.h Makefile.in asynchttpsubmittest.h Makefile.am
--- Makefile.in
+++ Makefile.in
@@ -136,6 +136,7 @@
@@ -45362,7 +57841,7 @@
#>+ 2
-KDE_DIST=Mainpage.dox subdirs Makefile.in configure.in.bot configure.files config.h.in kdemultimedia.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in acinclude.m4 Makefile.am Makefile.am.in
-+KDE_DIST=stamp-h.in Mainpage.dox subdirs Makefile.in configure.in.bot configure.files config.h.in kdemultimedia.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in configure acinclude.m4 Makefile.am Makefile.am.in
++KDE_DIST=stamp-h.in Mainpage.dox subdirs Makefile.in configure.in.bot configure.files config.h.in kdemultimedia.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in
#>+ 2
docs-am:
@@ -49029,6 +61508,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -1039,7 +1048,7 @@
+
+
+ #>+ 2
+-KDE_DIST=CDDAPlayObject.mcopclass OGGPlayObject.mcopclass MP3PlayObject.mcopclass Makefile.in NULLPlayObject.mcopclass SplayPlayObject.mcopclass WAVPlayObject.mcopclass MPGPlayObject.mcopclass VCDPlayObject.mcopclass Makefile.am
++KDE_DIST=CDDAPlayObject.mcopclass OGGPlayObject.mcopclass MP3PlayObject.mcopclass Makefile.in NULLPlayObject.mcopclass SplayPlayObject.mcopclass WAVPlayObject.mcopclass MPGPlayObject.mcopclass Makefile.am VCDPlayObject.mcopclass
+
+ #>+ 3
+ clean-closures:
--- mpg123_artsplugin/Makefile.in
+++ mpg123_artsplugin/Makefile.in
@@ -178,6 +178,7 @@
@@ -49425,6 +61913,74 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -1094,18 +1103,18 @@
+ mocs: mimetypetree.moc
+
+ #>+ 3
+-cmodule.moc: $(srcdir)/cmodule.h
+- $(MOC) $(srcdir)/cmodule.h -o cmodule.moc
++pluginmodule.moc: $(srcdir)/pluginmodule.h
++ $(MOC) $(srcdir)/pluginmodule.h -o pluginmodule.moc
+
+ #>+ 2
+-mocs: cmodule.moc
++mocs: pluginmodule.moc
+
+ #>+ 3
+-pluginmodule.moc: $(srcdir)/pluginmodule.h
+- $(MOC) $(srcdir)/pluginmodule.h -o pluginmodule.moc
++cmodule.moc: $(srcdir)/cmodule.h
++ $(MOC) $(srcdir)/cmodule.h -o cmodule.moc
+
+ #>+ 2
+-mocs: pluginmodule.moc
++mocs: cmodule.moc
+
+ #>+ 3
+ vequalizer.moc: $(srcdir)/noatun/vequalizer.h
+@@ -1199,18 +1208,18 @@
+ mocs: playlist.moc
+
+ #>+ 3
+-engine.moc: $(srcdir)/noatun/engine.h
+- $(MOC) $(srcdir)/noatun/engine.h -o engine.moc
++plugin_deps.moc: $(srcdir)/plugin_deps.h
++ $(MOC) $(srcdir)/plugin_deps.h -o plugin_deps.moc
+
+ #>+ 2
+-mocs: engine.moc
++mocs: plugin_deps.moc
+
+ #>+ 3
+-plugin_deps.moc: $(srcdir)/plugin_deps.h
+- $(MOC) $(srcdir)/plugin_deps.h -o plugin_deps.moc
++engine.moc: $(srcdir)/noatun/engine.h
++ $(MOC) $(srcdir)/noatun/engine.h -o engine.moc
+
+ #>+ 2
+-mocs: plugin_deps.moc
++mocs: engine.moc
+
+ #>+ 3
+ effectview.moc: $(srcdir)/effectview.h
+@@ -1244,7 +1253,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f downloader.moc stdaction.moc mimetypetree.moc cmodule.moc pluginmodule.moc vequalizer.moc titleproxy.moc controls.moc stereobuttonaction.moc plugin.moc app.moc effects.moc video.moc pref.moc player.moc globalvideo.moc equalizer.moc playlist.moc engine.moc plugin_deps.moc effectview.moc equalizerview.moc scrollinglabel.moc
++ -rm -f downloader.moc stdaction.moc mimetypetree.moc pluginmodule.moc cmodule.moc vequalizer.moc titleproxy.moc controls.moc stereobuttonaction.moc plugin.moc app.moc effects.moc video.moc pref.moc player.moc globalvideo.moc equalizer.moc playlist.moc plugin_deps.moc engine.moc effectview.moc equalizerview.moc scrollinglabel.moc
+
+ #>+ 2
+ KDE_DIST=pluginmodule.h noatunlistview.h Makefile.in titleproxy.h equalizerwidget.ui spline.h globalvideo.h Makefile.am
+@@ -1300,7 +1309,7 @@
+
+
+ #>+ 11
+-libnoatun_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pluginmodule.cpp $(srcdir)/cmodule.cpp $(srcdir)/downloader.cpp $(srcdir)/engine.cpp noatunarts/noatunarts.h $(srcdir)/playlist.cpp $(srcdir)/pref.cpp $(srcdir)/player.cpp $(srcdir)/playlistsaver.cpp $(srcdir)/app.cpp $(srcdir)/pluginloader.cpp $(srcdir)/plugin.cpp noatunarts/noatunarts.h $(srcdir)/noatunstdaction.cpp $(srcdir)/conversion.cpp $(srcdir)/noatunui.cpp $(srcdir)/effectview.cpp $(srcdir)/equalizerview.cpp $(srcdir)/equalizer.cpp noatunarts/noatunarts.h $(srcdir)/effects.cpp noatunarts/noatunarts.h ../../arts/gui/common/artsgui.h $(srcdir)/mimetypetree.cpp $(srcdir)/stereobuttonaction.cpp $(srcdir)/ksaver.cpp $(srcdir)/video.cpp $(srcdir)/vequalizer.cpp noatunarts/noatunarts.h $(srcdir)/spline.cpp $(srcdir)/titleproxy.cpp equalizerwidget.cpp downloader.moc stdaction.moc mimetypetree.moc pluginmodule.moc cmodule.moc vequalizer.moc titleproxy.moc stereobuttonaction.moc plugin.moc app.moc effects.moc video.moc pref.moc player.moc equalizer.moc globalvideo.moc playlist.moc equalizerwidget.moc plugin_deps.moc engine.moc effectview.moc equalizerview.moc
++libnoatun_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pluginmodule.cpp $(srcdir)/cmodule.cpp $(srcdir)/downloader.cpp $(srcdir)/engine.cpp noatunarts/noatunarts.h $(srcdir)/playlist.cpp $(srcdir)/pref.cpp $(srcdir)/player.cpp $(srcdir)/playlistsaver.cpp $(srcdir)/app.cpp $(srcdir)/pluginloader.cpp $(srcdir)/plugin.cpp noatunarts/noatunarts.h $(srcdir)/noatunstdaction.cpp $(srcdir)/conversion.cpp $(srcdir)/noatunui.cpp $(srcdir)/effectview.cpp $(srcdir)/equalizerview.cpp $(srcdir)/equalizer.cpp noatunarts/noatunarts.h $(srcdir)/effects.cpp noatunarts/noatunarts.h ../../arts/gui/common/artsgui.h $(srcdir)/mimetypetree.cpp $(srcdir)/stereobuttonaction.cpp $(srcdir)/ksaver.cpp $(srcdir)/video.cpp $(srcdir)/vequalizer.cpp noatunarts/noatunarts.h $(srcdir)/spline.cpp $(srcdir)/titleproxy.cpp equalizerwidget.cpp downloader.moc stdaction.moc mimetypetree.moc cmodule.moc pluginmodule.moc vequalizer.moc titleproxy.moc stereobuttonaction.moc plugin.moc app.moc effects.moc video.moc pref.moc player.moc equalizer.moc globalvideo.moc playlist.moc equalizerwidget.moc engine.moc plugin_deps.moc effectview.moc equalizerview.moc
+ @echo 'creating libnoatun_la.all_cpp.cpp ...'; \
+ rm -f libnoatun_la.all_cpp.files libnoatun_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libnoatun_la.all_cpp.final; \
--- noatun/library/noatun/Makefile.in
+++ noatun/library/noatun/Makefile.in
@@ -116,6 +116,7 @@
@@ -49972,6 +62528,32 @@
messages:
+@@ -977,12 +988,12 @@
+
+ #>+ 22
+ install-kde-icons:
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/hi22-app-noatun.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/noatun.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/hi48-app-noatun.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/noatun.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+ $(INSTALL_DATA) $(srcdir)/hi128-app-noatun.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/noatun.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/hi22-app-noatun.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/noatun.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-noatun.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/noatun.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+@@ -991,9 +1002,9 @@
+ $(INSTALL_DATA) $(srcdir)/hi64-app-noatun.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/noatun.png
+
+ uninstall-kde-icons:
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/noatun.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/noatun.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/noatun.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/noatun.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/noatun.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/noatun.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/noatun.png
--- noatun/modules/artseffects/Makefile.in
+++ noatun/modules/artseffects/Makefile.in
@@ -150,6 +150,7 @@
@@ -50566,6 +63148,55 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -960,22 +969,22 @@
+ mocs: userinterface.moc
+
+ #>+ 3
+-style.moc: $(srcdir)/style.h
+- $(MOC) $(srcdir)/style.h -o style.moc
++pref.moc: $(srcdir)/pref.h
++ $(MOC) $(srcdir)/pref.h -o pref.moc
+
+ #>+ 2
+-mocs: style.moc
++mocs: pref.moc
+
+ #>+ 3
+-pref.moc: $(srcdir)/pref.h
+- $(MOC) $(srcdir)/pref.h -o pref.moc
++style.moc: $(srcdir)/style.h
++ $(MOC) $(srcdir)/style.h -o style.moc
+
+ #>+ 2
+-mocs: pref.moc
++mocs: style.moc
+
+ #>+ 3
+ clean-metasources:
+- -rm -f userinterface.moc style.moc pref.moc
++ -rm -f userinterface.moc pref.moc style.moc
+
+ #>+ 2
+ KDE_DIST=kaimanui.rc Makefile.in kaiman.plugin SKIN-SPECS Makefile.am
+@@ -1026,7 +1035,7 @@
+
+
+ #>+ 11
+-noatun_kaiman_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/noatunui.cpp $(srcdir)/style.cpp $(srcdir)/userinterface.cpp $(srcdir)/pref.cpp userinterface.moc pref.moc style.moc
++noatun_kaiman_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/noatunui.cpp $(srcdir)/style.cpp $(srcdir)/userinterface.cpp $(srcdir)/pref.cpp userinterface.moc style.moc pref.moc
+ @echo 'creating noatun_kaiman_la.all_cpp.cpp ...'; \
+ rm -f noatun_kaiman_la.all_cpp.files noatun_kaiman_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> noatun_kaiman_la.all_cpp.final; \
+@@ -1065,8 +1074,8 @@
+ nmcheck:
+ userinterface.lo: userinterface.moc
+ nmcheck-am: nmcheck
+-pref.lo: pref.moc
+ style.lo: style.moc
++pref.lo: pref.moc
+ userinterface.o: userinterface.moc
+ style.o: style.moc
+ pref.o: pref.moc
--- noatun/modules/kaiman/skins/car-preset/Makefile.in
+++ noatun/modules/kaiman/skins/car-preset/Makefile.in
@@ -113,6 +113,7 @@
@@ -50863,6 +63494,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -646,7 +655,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=shuffle.jpg next.jpg trans-pos.png play.jpg knine-nfont2.jpg knine-nfont2.png conf.jpg shuffle.png trans-slide.png status.png icon.jpg stop.jpg eject.jpg knine-nfont.png kill.png square.jpg square.png reverse.jpg small-k.jpg skindata Makefile.in mask.png knine-vfont.jpg icon.png status.jpg pause.jpg small-k.png long2.jpg kill.jpg newtext.jpg repeat.png knine-vfont.png pos_item.jpg repeat.jpg newtext.png knine-nfont.jpg knine-normal2.png Makefile.am conf.png knine-normal2.jpg
++KDE_DIST=shuffle.jpg next.jpg trans-pos.png play.jpg knine-nfont2.jpg knine-nfont2.png conf.jpg shuffle.png trans-slide.png status.png icon.jpg stop.jpg eject.jpg knine-nfont.png kill.png square.jpg square.png reverse.jpg small-k.jpg skindata Makefile.in mask.png knine-vfont.jpg icon.png status.jpg pause.jpg small-k.png long2.jpg kill.jpg newtext.jpg repeat.png knine-vfont.png repeat.jpg pos_item.jpg newtext.png knine-normal2.png knine-nfont.jpg Makefile.am conf.png knine-normal2.jpg
+
+ #>+ 2
+ docs-am:
--- noatun/modules/kaiman/skins/Makefile.in
+++ noatun/modules/kaiman/skins/Makefile.in
@@ -119,6 +119,7 @@
@@ -51358,6 +63998,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -645,7 +654,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=sgpres1.png sgdock.png kjofol.pl sgdock2.png sgvolpos.png sgpitchp.png sgplist2.png kjofol.rc sgdocksk.png sgeq.png kjofol.wsh sgplist.png sgpres3.png sg_text.png sg_seek.bmp kjofol.dck Makefile.in sgpitch.png sgwshvp.png sgwshad2.png sgwshvol.png sgwshad.png sg.png sgvolnum.png sg_num.png sg_seek.png sgpres2.png sgdockvp.png sgvol.png sgwshdsk.png Makefile.am
++KDE_DIST=sgpres1.png sgdock.png kjofol.pl sgdock2.png sgvolpos.png kjofol.rc sgpitchp.png sgplist2.png sgdocksk.png sgeq.png kjofol.wsh sgplist.png sgpres3.png sg_text.png sg_seek.bmp kjofol.dck Makefile.in sgpitch.png sgwshvp.png sgwshad2.png sgwshvol.png sgwshad.png sg.png sgvolnum.png sg_num.png sg_seek.png sgpres2.png sgdockvp.png sgvol.png sgwshdsk.png Makefile.am
+
+ #>+ 2
+ docs-am:
--- noatun/modules/kjofol-skin/skins/Makefile.in
+++ noatun/modules/kjofol-skin/skins/Makefile.in
@@ -119,6 +119,7 @@
@@ -52546,6 +65195,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -853,7 +862,7 @@
+ -rm -f kitsystemtray.moc systray.moc cmodule.moc
+
+ #>+ 2
+-KDE_DIST=yhconfig.kcfg yhconfig.kcfgc yhconfigwidget.ui systrayui.rc Makefile.in systray.plugin Makefile.am
++KDE_DIST=yhconfig.kcfg yhconfig.kcfgc systrayui.rc yhconfigwidget.ui Makefile.in systray.plugin Makefile.am
+
+ #>+ 4
+ clean-ui:
--- noatun/modules/voiceprint/Makefile.in
+++ noatun/modules/voiceprint/Makefile.in
@@ -153,6 +153,7 @@
@@ -52744,6 +65402,78 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -1105,18 +1114,18 @@
+ mocs: waJumpSlider.moc
+
+ #>+ 3
+-waIndicator.moc: $(srcdir)/waIndicator.h
+- $(MOC) $(srcdir)/waIndicator.h -o waIndicator.moc
++guiSpectrumAnalyser.moc: $(srcdir)/guiSpectrumAnalyser.h
++ $(MOC) $(srcdir)/guiSpectrumAnalyser.h -o guiSpectrumAnalyser.moc
+
+ #>+ 2
+-mocs: waIndicator.moc
++mocs: guiSpectrumAnalyser.moc
+
+ #>+ 3
+-guiSpectrumAnalyser.moc: $(srcdir)/guiSpectrumAnalyser.h
+- $(MOC) $(srcdir)/guiSpectrumAnalyser.h -o guiSpectrumAnalyser.moc
++waIndicator.moc: $(srcdir)/waIndicator.h
++ $(MOC) $(srcdir)/waIndicator.h -o waIndicator.moc
+
+ #>+ 2
+-mocs: guiSpectrumAnalyser.moc
++mocs: waIndicator.moc
+
+ #>+ 3
+ waButton.moc: $(srcdir)/waButton.h
+@@ -1161,18 +1170,18 @@
+ mocs: waBalanceSlider.moc
+
+ #>+ 3
+-waStatus.moc: $(srcdir)/waStatus.h
+- $(MOC) $(srcdir)/waStatus.h -o waStatus.moc
++waTitleBar.moc: $(srcdir)/waTitleBar.h
++ $(MOC) $(srcdir)/waTitleBar.h -o waTitleBar.moc
+
+ #>+ 2
+-mocs: waStatus.moc
++mocs: waTitleBar.moc
+
+ #>+ 3
+-waTitleBar.moc: $(srcdir)/waTitleBar.h
+- $(MOC) $(srcdir)/waTitleBar.h -o waTitleBar.moc
++waStatus.moc: $(srcdir)/waStatus.h
++ $(MOC) $(srcdir)/waStatus.h -o waStatus.moc
+
+ #>+ 2
+-mocs: waTitleBar.moc
++mocs: waStatus.moc
+
+ #>+ 3
+ waSkinManager.moc: $(srcdir)/waSkinManager.h
+@@ -1183,10 +1192,10 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f waClutterbar.moc waVolumeSlider.moc waMain.moc winSkinConfig.moc waWidget.moc waSkin.moc waSlider.moc waLabel.moc waJumpSlider.moc waIndicator.moc guiSpectrumAnalyser.moc waButton.moc waInfo.moc waDigit.moc winSkinVis.moc waSkinModel.moc waBalanceSlider.moc waStatus.moc waTitleBar.moc waSkinManager.moc
++ -rm -f waClutterbar.moc waVolumeSlider.moc waMain.moc winSkinConfig.moc waWidget.moc waSkin.moc waSlider.moc waLabel.moc waJumpSlider.moc guiSpectrumAnalyser.moc waIndicator.moc waButton.moc waInfo.moc waDigit.moc winSkinVis.moc waSkinModel.moc waBalanceSlider.moc waTitleBar.moc waStatus.moc waSkinManager.moc
+
+ #>+ 2
+-KDE_DIST=waSkinManager.h waMain.h waInfo.h waJumpSlider.h waWidget.h waLabel.h waTitleBar.h waBalanceSlider.h waClutterbar.h waVolumeSlider.h Makefile.in waDigit.h waSkinModel.h skinMap.h waSkin.h winskin.plugin waRegion.h guiSpectrumAnalyser.h waColor.h winSkinVis.h fileInfo.h waSkinMapping.h winSkinConfig.h waStatus.h waIndicator.h waSkins.h waSlider.h waShadeMapping.h waButton.h Makefile.am
++KDE_DIST=waSkinManager.h waMain.h waInfo.h waJumpSlider.h waWidget.h waTitleBar.h waLabel.h waBalanceSlider.h waClutterbar.h waVolumeSlider.h Makefile.in waDigit.h waSkinModel.h skinMap.h waSkin.h winskin.plugin waRegion.h guiSpectrumAnalyser.h waColor.h winSkinVis.h fileInfo.h waSkinMapping.h winSkinConfig.h waStatus.h waIndicator.h waSkins.h waSlider.h waButton.h waShadeMapping.h Makefile.am
+
+ #>+ 4
+ clean-idl:
+@@ -1239,7 +1248,7 @@
+
+
+ #>+ 11
+-noatun_winskin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/fileInfo.cpp $(srcdir)/guiSpectrumAnalyser.cpp ../../library/noatunarts/noatunarts.h vis/winskinvis.h $(srcdir)/plugin.cpp $(srcdir)/waBalanceSlider.cpp $(srcdir)/waButton.cpp $(srcdir)/waClutterbar.cpp $(srcdir)/waColor.cpp $(srcdir)/waDigit.cpp $(srcdir)/waInfo.cpp $(srcdir)/waIndicator.cpp $(srcdir)/waJumpSlider.cpp $(srcdir)/waLabel.cpp $(srcdir)/waMain.cpp $(srcdir)/waRegion.cpp $(srcdir)/waSkin.cpp ../../library/noatunarts/noatunarts.h vis/winskinvis.h $(srcdir)/waSkinModel.cpp $(srcdir)/waSlider.cpp $(srcdir)/waStatus.cpp $(srcdir)/waTitleBar.cpp $(srcdir)/waVolumeSlider.cpp $(srcdir)/waWidget.cpp $(srcdir)/winSkinConfig.cpp $(srcdir)/winSkinVis.cpp ../../library/noatunarts/noatunarts.h vis/winskinvis.h $(srcdir)/waSkinManager.cpp waSkinManager_skel.cpp waClutterbar.moc waMain.moc waVolumeSlider.moc winSkinConfig.moc waWidget.moc waSkin.moc waSlider.moc waJumpSlider.moc waLabel.moc waIndicator.moc guiSpectrumAnalyser.moc waButton.moc waInfo.moc waDigit.moc winSkinVis.moc waSkinModel.moc waBalanceSlider.moc waTitleBar.moc waStatus.moc waSkinManager.moc
++noatun_winskin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/fileInfo.cpp $(srcdir)/guiSpectrumAnalyser.cpp ../../library/noatunarts/noatunarts.h vis/winskinvis.h $(srcdir)/plugin.cpp $(srcdir)/waBalanceSlider.cpp $(srcdir)/waButton.cpp $(srcdir)/waClutterbar.cpp $(srcdir)/waColor.cpp $(srcdir)/waDigit.cpp $(srcdir)/waInfo.cpp $(srcdir)/waIndicator.cpp $(srcdir)/waJumpSlider.cpp $(srcdir)/waLabel.cpp $(srcdir)/waMain.cpp $(srcdir)/waRegion.cpp $(srcdir)/waSkin.cpp ../../library/noatunarts/noatunarts.h vis/winskinvis.h $(srcdir)/waSkinModel.cpp $(srcdir)/waSlider.cpp $(srcdir)/waStatus.cpp $(srcdir)/waTitleBar.cpp $(srcdir)/waVolumeSlider.cpp $(srcdir)/waWidget.cpp $(srcdir)/winSkinConfig.cpp $(srcdir)/winSkinVis.cpp ../../library/noatunarts/noatunarts.h vis/winskinvis.h $(srcdir)/waSkinManager.cpp waSkinManager_skel.cpp waClutterbar.moc waMain.moc waVolumeSlider.moc winSkinConfig.moc waWidget.moc waSkin.moc waSlider.moc waJumpSlider.moc waLabel.moc guiSpectrumAnalyser.moc waIndicator.moc waButton.moc waInfo.moc waDigit.moc winSkinVis.moc waSkinModel.moc waBalanceSlider.moc waStatus.moc waTitleBar.moc waSkinManager.moc
+ @echo 'creating noatun_winskin_la.all_cpp.cpp ...'; \
+ rm -f noatun_winskin_la.all_cpp.files noatun_winskin_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> noatun_winskin_la.all_cpp.final; \
--- noatun/modules/winskin/mimetypes/interface/Makefile.in
+++ noatun/modules/winskin/mimetypes/interface/Makefile.in
@@ -113,6 +113,7 @@
@@ -53338,6 +66068,150 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -612,89 +621,89 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=cr16-action-noatunplaylist.png cr22-action-noatunloopsong.png cr22-action-noatunstop.png cr48-action-effect.png cr32-action-equalizer.png cr16-action-playlist.png cr48-action-playlist.png cr16-action-noatunback.png cr16-action-noatunforward.png cr16-action-effect.png Makefile.in cr64-action-equalizer.png cr22-action-noatunpause.png cr22-action-noatunloopplaylist.png cr16-action-noatunplay.png cr32-action-playlist.png cr22-action-playlist.png cr22-action-noatunplaylist.png cr128-action-equalizer.png cr22-action-noatunplay.png cr16-action-equalizer.png cr16-action-noatunstop.png cr64-action-playlist.png cr22-action-noatunlooprandom.png cr32-action-effect.png cr48-action-equalizer.png cr22-action-equalizer.png cr22-action-noatunforward.png cr22-action-noatunback.png cr22-action-noatunfforward.png cr128-action-playlist.png cr22-action-noatuntiny.png cr16-action-noatunpause.png cr22-action-noatunloopnone.png cr22-action-noatunfback.png Makefile.am
++KDE_DIST=cr16-action-noatunplaylist.png cr22-action-noatunloopsong.png cr22-action-noatunstop.png cr48-action-effect.png cr32-action-equalizer.png cr16-action-playlist.png cr48-action-playlist.png cr16-action-noatunback.png cr16-action-noatunforward.png cr16-action-effect.png Makefile.in cr64-action-equalizer.png cr22-action-noatunpause.png cr22-action-noatunloopplaylist.png cr16-action-noatunplay.png cr32-action-playlist.png cr22-action-playlist.png cr22-action-noatunplaylist.png cr128-action-equalizer.png cr22-action-noatunplay.png cr16-action-equalizer.png cr16-action-noatunstop.png cr64-action-playlist.png cr32-action-effect.png cr22-action-noatunlooprandom.png cr22-action-equalizer.png cr48-action-equalizer.png cr22-action-noatunforward.png cr22-action-noatunback.png cr22-action-noatunfforward.png cr128-action-playlist.png cr22-action-noatuntiny.png cr16-action-noatunpause.png cr22-action-noatunloopnone.png cr22-action-noatunfback.png Makefile.am
+
+ #>+ 2
+ docs-am:
+
+ #>+ 78
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions
+- $(INSTALL_DATA) $(srcdir)/cr22-action-noatunloopsong.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunloopsong.png
++ $(mkinstalldirs) $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions
++ $(INSTALL_DATA) $(srcdir)/cr32-action-playlist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/playlist.png
+ $(mkinstalldirs) $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions
+ $(INSTALL_DATA) $(srcdir)/cr16-action-noatunstop.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunstop.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-noatunplaylist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunplaylist.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-noatunback.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunback.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-noatunforward.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunforward.png
+- $(mkinstalldirs) $(DESTDIR)$(noatuniconsdir)/crystalsvg/128x128/actions
+- $(INSTALL_DATA) $(srcdir)/cr128-action-playlist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/128x128/actions/playlist.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-noatunloopplaylist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunloopplaylist.png
++ $(mkinstalldirs) $(DESTDIR)$(noatuniconsdir)/crystalsvg/64x64/actions
++ $(INSTALL_DATA) $(srcdir)/cr64-action-playlist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/64x64/actions/playlist.png
++ $(mkinstalldirs) $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions
++ $(INSTALL_DATA) $(srcdir)/cr22-action-noatunloopnone.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunloopnone.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-noatunforward.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunforward.png
+- $(mkinstalldirs) $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions
+- $(INSTALL_DATA) $(srcdir)/cr32-action-effect.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/effect.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-noatunplay.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunplay.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-noatunlooprandom.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunlooprandom.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-effect.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/effect.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-playlist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/playlist.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-noatunloopsong.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunloopsong.png
++ $(mkinstalldirs) $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions
++ $(INSTALL_DATA) $(srcdir)/cr48-action-equalizer.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/equalizer.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-playlist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/playlist.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-noatuntiny.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatuntiny.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-noatunstop.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunstop.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-noatunloopnone.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunloopnone.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-noatunplaylist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunplaylist.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-equalizer.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/equalizer.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-effect.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/effect.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-noatunforward.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunforward.png
++ $(mkinstalldirs) $(DESTDIR)$(noatuniconsdir)/crystalsvg/128x128/actions
+ $(INSTALL_DATA) $(srcdir)/cr128-action-equalizer.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/128x128/actions/equalizer.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-noatunback.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunback.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-noatunpause.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunpause.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-playlist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/playlist.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-noatunplaylist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunplaylist.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-noatunfforward.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunfforward.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-noatunplay.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunplay.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-noatunfback.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunfback.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-equalizer.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/equalizer.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-noatunback.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunback.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-noatunplaylist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunplaylist.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-noatunplay.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunplay.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-effect.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/effect.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-noatuntiny.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatuntiny.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-effect.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/effect.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-noatunstop.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunstop.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-playlist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/playlist.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-equalizer.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/equalizer.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-noatunpause.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunpause.png
+- $(mkinstalldirs) $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions
+- $(INSTALL_DATA) $(srcdir)/cr48-action-effect.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/effect.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-equalizer.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/equalizer.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-noatunpause.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunpause.png
+- $(mkinstalldirs) $(DESTDIR)$(noatuniconsdir)/crystalsvg/64x64/actions
++ $(INSTALL_DATA) $(srcdir)/cr22-action-equalizer.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/equalizer.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-noatunloopplaylist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunloopplaylist.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-noatunback.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunback.png
+ $(INSTALL_DATA) $(srcdir)/cr64-action-equalizer.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/64x64/actions/equalizer.png
+- $(INSTALL_DATA) $(srcdir)/cr64-action-playlist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/64x64/actions/playlist.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-equalizer.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/equalizer.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-playlist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/playlist.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-equalizer.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/equalizer.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-noatunplay.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunplay.png
++ $(INSTALL_DATA) $(srcdir)/cr128-action-playlist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/128x128/actions/playlist.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunloopsong.png
++ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/playlist.png
+ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunstop.png
+- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunplaylist.png
+- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunback.png
+- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunforward.png
+- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/128x128/actions/playlist.png
+- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunloopplaylist.png
++ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/64x64/actions/playlist.png
++ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunloopnone.png
+ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunforward.png
+- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/effect.png
+- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunplay.png
+ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunlooprandom.png
+- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/effect.png
+- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/playlist.png
++ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunloopsong.png
++ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/equalizer.png
+ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/playlist.png
+- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatuntiny.png
+- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunstop.png
+- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunloopnone.png
+- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunplaylist.png
++ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/equalizer.png
++ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/effect.png
++ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunforward.png
+ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/128x128/actions/equalizer.png
+- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunback.png
++ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunpause.png
++ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/playlist.png
++ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunplaylist.png
+ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunfforward.png
+- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunplay.png
+ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunfback.png
+- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/equalizer.png
++ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunback.png
++ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunplaylist.png
++ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunplay.png
++ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/effect.png
++ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatuntiny.png
++ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/effect.png
++ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunstop.png
+ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/playlist.png
+- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/equalizer.png
+ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunpause.png
+- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/effect.png
+- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/equalizer.png
+- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunpause.png
++ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/equalizer.png
++ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunloopplaylist.png
++ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunback.png
+ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/64x64/actions/equalizer.png
+- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/64x64/actions/playlist.png
+- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/equalizer.png
+- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/playlist.png
++ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/equalizer.png
++ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunplay.png
++ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/128x128/actions/playlist.png
+
+ #>+ 15
+ force-reedit:
--- oggvorbis_artsplugin/Makefile.in
+++ oggvorbis_artsplugin/Makefile.in
@@ -154,6 +154,7 @@
More information about the pkg-kde-commits
mailing list